From 341586e47b731d6586be39f6bf96c28ae530d4b4 Mon Sep 17 00:00:00 2001 From: Kyle Mestery Date: Fri, 14 Jun 2013 14:25:08 +0000 Subject: [PATCH] Modify the OVS agent to support multiple tunnel_types concurrently. This change modifies the "tunnel_type" configuration option to be a ListOpt instead of a StrOpt. This is intended to allow the agent to work in an ML2 environment where multiple, disparate "tunnel_types" are supported at the same time. For now, the agent will enforce a single "tunnel_type". Fixes bug #1191089 Change-Id: Ic025e54a8a3e92fe1fe44ebf08d71c2210c7d82b --- .../openvswitch/ovs_neutron_plugin.ini | 37 +++++++---- .../openvswitch/agent/ovs_neutron_agent.py | 61 ++++++++++++------- neutron/plugins/openvswitch/common/config.py | 10 ++- .../plugins/openvswitch/ovs_neutron_plugin.py | 12 +++- .../openvswitch/test_ovs_neutron_agent.py | 50 +++++++++++---- .../tests/unit/openvswitch/test_ovs_rpcapi.py | 3 +- .../tests/unit/openvswitch/test_ovs_tunnel.py | 35 +++++------ 7 files changed, 138 insertions(+), 70 deletions(-) diff --git a/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini b/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini index 1660a7b34..59c946cef 100644 --- a/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +++ b/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini @@ -26,12 +26,20 @@ # for GRE or VXLAN networks. Requires kernel support for OVS patch ports and # GRE or VXLAN tunneling. # -# WARNING: This option will be deprecated in the Icehouse release, and will -# be replaced by specifying one or more 'tunnel_types' in the -# "agent" section of the configuration file below. +# WARNING: This option will be deprecated in the Icehouse release, at which +# point setting tunnel_type below will be required to enable +# tunneling. # # enable_tunneling = False +# (StrOpt) The type of tunnel network, if any, supported by the plugin. If +# this is set, it will cause tunneling to be enabled. If this is not set and +# the option enable_tunneling is set, this will default to 'gre'. +# +# tunnel_type = +# Example: tunnel_type = gre +# Example: tunnel_type = vxlan + # (ListOpt) Comma-separated list of : tuples # enumerating ranges of GRE or VXLAN tunnel IDs that are available for # tenant network allocation if tenant_network_type is 'gre' or 'vxlan'. @@ -79,17 +87,22 @@ # Agent's polling interval in seconds # polling_interval = 2 -# (StrOpt) The type of tenant network tunnels to utilize when tunneling -# is enabled. This can be set to either 'gre' or 'vxlan' currently. If -# this is unset, it will default to 'None'. +# (ListOpt) The types of tenant network tunnels supported by the agent. +# Setting this will enable tunneling support in the agent. This can be set to +# either 'gre' or 'vxlan'. If this is unset, it will default to [] and +# disable tunneling support in the agent. When running the agent with the OVS +# plugin, this value must be the same as "tunnel_type" in the "[ovs]" section. +# When running the agent with ML2, you can specify as many values here as +# your compute hosts supports. # -# tunnel_type = -# Example: tunnel_type = gre -# Example: tunnel_type = vxlan +# tunnel_types = +# Example: tunnel_types = gre +# Example: tunnel_types = vxlan +# Example: tunnel_types = vxlan, gre -# (IntOpt) The port number to utilize if tunnel_type is 'vxlan'. By default, -# this will make use of the Open vSwitch default value of '4789' if not -# specified. +# (IntOpt) The port number to utilize if tunnel_types includes 'vxlan'. By +# default, this will make use of the Open vSwitch default value of '4789' if +# not specified. # # vxlan_udp_port = # Example: vxlan_udp_port = 8472 diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py index 2e54dbcb7..48b06f795 100644 --- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py @@ -150,7 +150,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): def __init__(self, integ_br, tun_br, local_ip, bridge_mappings, root_helper, - polling_interval, tunnel_type=constants.TYPE_NONE): + polling_interval, tunnel_types=None): '''Constructor. :param integ_br: name of the integration bridge. @@ -159,8 +159,9 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): :param bridge_mappings: mappings from physical network name to bridge. :param root_helper: utility to use when running shell cmds. :param polling_interval: interval (secs) to poll DB. - :param tunnel_type: Either gre or vxlan. If set, will automatically - set enable_tunneling to True. + :param tunnel_types: A list of tunnel types to enable support for in + the agent. If set, will automatically set enable_tunneling to + True. ''' self.root_helper = root_helper self.available_local_vlans = set(xrange(q_const.MIN_VLAN_TAG, @@ -171,13 +172,13 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): self.polling_interval = polling_interval - if tunnel_type in constants.TUNNEL_NETWORK_TYPES: + if tunnel_types: self.enable_tunneling = True else: self.enable_tunneling = False self.local_ip = local_ip self.tunnel_count = 0 - self.tunnel_type = tunnel_type + self.tunnel_types = tunnel_types or [] self.vxlan_udp_port = cfg.CONF.AGENT.vxlan_udp_port self._check_ovs_version() if self.enable_tunneling: @@ -188,7 +189,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): 'topic': q_const.L2_AGENT_TOPIC, 'configurations': bridge_mappings, 'agent_type': q_const.AGENT_TYPE_OVS, - 'tunnel_type': self.tunnel_type, + 'tunnel_types': self.tunnel_types, 'start_flag': True} self.setup_rpc() @@ -198,7 +199,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): root_helper) def _check_ovs_version(self): - if self.enable_tunneling and self.tunnel_type == constants.TYPE_VXLAN: + if constants.TYPE_VXLAN in self.tunnel_types: check_ovs_version(constants.MINIMUM_OVS_VXLAN_VERSION, self.root_helper) @@ -289,10 +290,17 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): return tunnel_ip = kwargs.get('tunnel_ip') tunnel_id = kwargs.get('tunnel_id') + tunnel_type = kwargs.get('tunnel_type') + if not tunnel_type: + LOG.error(_("No tunnel_type specified, cannot create tunnels")) + return + if tunnel_type not in self.tunnel_types: + LOG.error(_("tunnel_type %s not supported by agent"), tunnel_type) + return if tunnel_ip == self.local_ip: return - tun_name = '%s-%s' % (self.tunnel_type, tunnel_id) - self.tun_br.add_tunnel_port(tun_name, tunnel_ip, self.tunnel_type, + tun_name = '%s-%s' % (tunnel_type, tunnel_id) + self.tun_br.add_tunnel_port(tun_name, tunnel_ip, tunnel_type, self.vxlan_udp_port) def create_rpc_dispatcher(self): @@ -696,9 +704,14 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): tunnels = details['tunnels'] for tunnel in tunnels: if self.local_ip != tunnel['ip_address']: - tun_name = '%s-%s' % (self.tunnel_type, tunnel['id']) + tunnel_type = tunnel.get('tunnel_type') + if not tunnel_type: + LOG.error(_('No tunnel_type specified, cannot add ' + 'tunnel port')) + return + tun_name = '%s-%s' % (tunnel_type, tunnel['id']) self.tun_br.add_tunnel_port(tun_name, tunnel['ip_address'], - self.tunnel_type, + tunnel_type, self.vxlan_udp_port) except Exception as e: LOG.debug(_("Unable to sync tunnel IP %(local_ip)s: %(e)s"), @@ -777,17 +790,17 @@ def check_ovs_version(min_required_version, root_helper): 'VXLAN tunnels with OVS, please ensure ' 'the OVS version is %s or newer!'), min_required_version) - sys.exti(1) - else: - LOG.warning(_('Cannot determine kernel Open vSwitch version, ' - 'please ensure your Open vSwitch kernel module ' - 'is at least version %s to support VXLAN ' - 'tunnels.'), min_required_version) + raise SystemExit(1) + else: + LOG.warning(_('Cannot determine kernel Open vSwitch version, ' + 'please ensure your Open vSwitch kernel module ' + 'is at least version %s to support VXLAN ' + 'tunnels.'), min_required_version) else: LOG.warning(_('Unable to determine Open vSwitch version. Please ' 'ensure that its version is %s or newer to use VXLAN ' 'tunnels with OVS.'), min_required_version) - sys.exit(1) + raise SystemExit(1) def create_agent_config_map(config): @@ -808,14 +821,18 @@ def create_agent_config_map(config): bridge_mappings=bridge_mappings, root_helper=config.AGENT.root_helper, polling_interval=config.AGENT.polling_interval, - tunnel_type=config.AGENT.tunnel_type, + tunnel_types=config.AGENT.tunnel_types, ) # If enable_tunneling is TRUE, set tunnel_type to default to GRE - if config.OVS.enable_tunneling and not kwargs['tunnel_type']: - kwargs['tunnel_type'] = constants.TYPE_GRE + if config.OVS.enable_tunneling and not kwargs['tunnel_types']: + kwargs['tunnel_types'] = [constants.TYPE_GRE] - if kwargs['tunnel_type'] in constants.TUNNEL_NETWORK_TYPES: + # Verify the tunnel_types specified are valid + for tun in kwargs['tunnel_types']: + if tun not in constants.TUNNEL_NETWORK_TYPES: + msg = _('Invalid tunnel type specificed: %s'), tun + raise ValueError(msg) if not kwargs['local_ip']: msg = _('Tunneling cannot be enabled without a valid local_ip.') raise ValueError(msg) diff --git a/neutron/plugins/openvswitch/common/config.py b/neutron/plugins/openvswitch/common/config.py index 90578aeb3..19e82fdd9 100644 --- a/neutron/plugins/openvswitch/common/config.py +++ b/neutron/plugins/openvswitch/common/config.py @@ -24,6 +24,7 @@ from neutron import scheduler DEFAULT_BRIDGE_MAPPINGS = [] DEFAULT_VLAN_RANGES = [] DEFAULT_TUNNEL_RANGES = [] +DEFAULT_TUNNEL_TYPES = [] ovs_opts = [ cfg.StrOpt('integration_bridge', default='br-int', @@ -53,15 +54,18 @@ ovs_opts = [ cfg.ListOpt('tunnel_id_ranges', default=DEFAULT_TUNNEL_RANGES, help=_("List of :")), + cfg.StrOpt('tunnel_type', default='', + help=_("The type of tunnels to use when utilizing tunnels, " + "either 'gre' or 'vxlan'")), ] agent_opts = [ cfg.IntOpt('polling_interval', default=2, help=_("The number of seconds the agent will wait between " "polling for local device changes.")), - cfg.StrOpt('tunnel_type', default=None, - help=_("Network type for agent tunnel networks " - "(gre or vxlan)")), + cfg.ListOpt('tunnel_types', default=DEFAULT_TUNNEL_TYPES, + help=_("Network types supported by the agent " + "(gre and/or vxlan)")), cfg.IntOpt('vxlan_udp_port', default=constants.VXLAN_UDP_PORT, help=_("The UDP port to use for VXLAN tunnels.")), ] diff --git a/neutron/plugins/openvswitch/ovs_neutron_plugin.py b/neutron/plugins/openvswitch/ovs_neutron_plugin.py index 14194e974..55880df9f 100644 --- a/neutron/plugins/openvswitch/ovs_neutron_plugin.py +++ b/neutron/plugins/openvswitch/ovs_neutron_plugin.py @@ -161,7 +161,7 @@ class OVSRpcCallbacks(dhcp_rpc_base.DhcpRpcCallbackMixin, entry['tunnels'] = tunnels # Notify all other listening agents self.notifier.tunnel_update(rpc_context, tunnel.ip_address, - tunnel.id) + tunnel.id, cfg.CONF.OVS.tunnel_type) # Return the list of tunnels IP's to the agent return entry @@ -206,11 +206,12 @@ class AgentNotifierApi(proxy.RpcProxy, physical_network=physical_network), topic=self.topic_port_update) - def tunnel_update(self, context, tunnel_ip, tunnel_id): + def tunnel_update(self, context, tunnel_ip, tunnel_id, tunnel_type): self.fanout_cast(context, self.make_msg('tunnel_update', tunnel_ip=tunnel_ip, - tunnel_id=tunnel_id), + tunnel_id=tunnel_id, + tunnel_type=tunnel_type), topic=self.topic_tunnel_update) @@ -280,6 +281,11 @@ class OVSNeutronPluginV2(db_base_plugin_v2.NeutronDbPluginV2, self.tenant_network_type) sys.exit(1) self.enable_tunneling = cfg.CONF.OVS.enable_tunneling + if self.enable_tunneling: + self.tunnel_type = cfg.CONF.OVS.tunnel_type or constants.TYPE_GRE + elif cfg.CONF.OVS.tunnel_type: + self.tunnel_type = cfg.CONF.OVS.tunnel_type + self.enable_tunneling = True self.tunnel_id_ranges = [] if self.enable_tunneling: self._parse_tunnel_id_ranges() diff --git a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py index 28188bc6c..33ad6b26b 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py +++ b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py @@ -40,8 +40,13 @@ class CreateAgentConfigMap(base.BaseTestCase): def test_create_agent_config_map_fails_for_invalid_tunnel_config(self): self.addCleanup(cfg.CONF.reset) - # An ip address is required for tunneling but there is no default - cfg.CONF.set_override('tunnel_type', constants.TYPE_GRE, + # An ip address is required for tunneling but there is no default, + # verify this for both gre and vxlan tunnels. + cfg.CONF.set_override('tunnel_types', [constants.TYPE_GRE], + group='AGENT') + with testtools.ExpectedException(ValueError): + ovs_neutron_agent.create_agent_config_map(cfg.CONF) + cfg.CONF.set_override('tunnel_types', [constants.TYPE_VXLAN], group='AGENT') with testtools.ExpectedException(ValueError): ovs_neutron_agent.create_agent_config_map(cfg.CONF) @@ -49,11 +54,11 @@ class CreateAgentConfigMap(base.BaseTestCase): def test_create_agent_config_map_enable_tunneling(self): self.addCleanup(cfg.CONF.reset) # Verify setting only enable_tunneling will default tunnel_type to GRE - cfg.CONF.set_override('tunnel_type', None, group='AGENT') + cfg.CONF.set_override('tunnel_types', None, group='AGENT') cfg.CONF.set_override('enable_tunneling', True, group='OVS') cfg.CONF.set_override('local_ip', '10.10.10.10', group='OVS') cfgmap = ovs_neutron_agent.create_agent_config_map(cfg.CONF) - self.assertEqual(cfgmap['tunnel_type'], constants.TYPE_GRE) + self.assertEqual(cfgmap['tunnel_types'], [constants.TYPE_GRE]) def test_create_agent_config_map_fails_no_local_ip(self): self.addCleanup(cfg.CONF.reset) @@ -62,6 +67,21 @@ class CreateAgentConfigMap(base.BaseTestCase): with testtools.ExpectedException(ValueError): ovs_neutron_agent.create_agent_config_map(cfg.CONF) + def test_create_agent_config_map_fails_for_invalid_tunnel_type(self): + self.addCleanup(cfg.CONF.reset) + cfg.CONF.set_override('tunnel_types', ['foobar'], group='AGENT') + with testtools.ExpectedException(ValueError): + ovs_neutron_agent.create_agent_config_map(cfg.CONF) + + def test_create_agent_config_map_multiple_tunnel_types(self): + self.addCleanup(cfg.CONF.reset) + cfg.CONF.set_override('local_ip', '10.10.10.10', group='OVS') + cfg.CONF.set_override('tunnel_types', [constants.TYPE_GRE, + constants.TYPE_VXLAN], group='AGENT') + cfgmap = ovs_neutron_agent.create_agent_config_map(cfg.CONF) + self.assertEqual(cfgmap['tunnel_types'], + [constants.TYPE_GRE, constants.TYPE_VXLAN]) + class TestOvsNeutronAgent(base.BaseTestCase): @@ -329,7 +349,8 @@ class TestOvsNeutronAgent(base.BaseTestCase): self.agent.port_unbound("vif3", "netuid12345") self.assertEqual(reclvl_fn.call_count, 2) - def _check_ovs_vxlan_version(self, installed_version, min_vers, + def _check_ovs_vxlan_version(self, installed_usr_version, + installed_klm_version, min_vers, expecting_ok): with mock.patch( 'neutron.agent.linux.ovs_lib.get_installed_ovs_klm_version' @@ -338,9 +359,9 @@ class TestOvsNeutronAgent(base.BaseTestCase): 'neutron.agent.linux.ovs_lib.get_installed_ovs_usr_version' ) as usr_cmd: try: - klm_cmd.return_value = installed_version - usr_cmd.return_value = installed_version - self.agent.tunnel_type = 'vxlan' + klm_cmd.return_value = installed_klm_version + usr_cmd.return_value = installed_usr_version + self.agent.tunnel_types = 'vxlan' ovs_neutron_agent.check_ovs_version(min_vers, root_helper='sudo') version_ok = True @@ -350,21 +371,26 @@ class TestOvsNeutronAgent(base.BaseTestCase): self.assertEqual(version_ok, expecting_ok) def test_check_minimum_version(self): - self._check_ovs_vxlan_version('1.10', + self._check_ovs_vxlan_version('1.10', '1.10', constants.MINIMUM_OVS_VXLAN_VERSION, expecting_ok=True) def test_check_future_version(self): - self._check_ovs_vxlan_version('1.11', + self._check_ovs_vxlan_version('1.11', '1.11', constants.MINIMUM_OVS_VXLAN_VERSION, expecting_ok=True) def test_check_fail_version(self): - self._check_ovs_vxlan_version('1.9', + self._check_ovs_vxlan_version('1.9', '1.9', constants.MINIMUM_OVS_VXLAN_VERSION, expecting_ok=False) def test_check_fail_no_version(self): - self._check_ovs_vxlan_version(None, + self._check_ovs_vxlan_version(None, None, + constants.MINIMUM_OVS_VXLAN_VERSION, + expecting_ok=False) + + def test_check_fail_klm_version(self): + self._check_ovs_vxlan_version('1.10', '1.9', constants.MINIMUM_OVS_VXLAN_VERSION, expecting_ok=False) diff --git a/neutron/tests/unit/openvswitch/test_ovs_rpcapi.py b/neutron/tests/unit/openvswitch/test_ovs_rpcapi.py index ad7bab452..8494f3e64 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_rpcapi.py +++ b/neutron/tests/unit/openvswitch/test_ovs_rpcapi.py @@ -87,7 +87,8 @@ class rpcApiTestCase(base.BaseTestCase): constants.TUNNEL, topics.UPDATE), 'tunnel_update', rpc_method='fanout_cast', - tunnel_ip='fake_ip', tunnel_id='fake_id') + tunnel_ip='fake_ip', tunnel_id='fake_id', + tunnel_type=None) def test_device_details(self): rpcapi = agent_rpc.PluginApi(topics.PLUGIN) diff --git a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py index 3d6a4449a..6e3e9a527 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py +++ b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py @@ -129,7 +129,7 @@ class TunnelTest(base.BaseTestCase): ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) self.mox.VerifyAll() def testConstructVXLAN(self): @@ -141,7 +141,7 @@ class TunnelTest(base.BaseTestCase): ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'vxlan') + 'sudo', 2, ['vxlan']) self.mox.VerifyAll() def testProvisionLocalVlan(self): @@ -158,7 +158,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.available_local_vlans = set([LV_ID]) a.provision_local_vlan(NET_UUID, constants.TYPE_GRE, None, LS_ID) self.mox.VerifyAll() @@ -178,7 +178,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.available_local_vlans = set([LV_ID]) a.phys_brs['net1'] = self.mock_map_tun_bridge a.phys_ofports['net1'] = self.MAP_TUN_OFPORT @@ -191,7 +191,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.provision_local_vlan(NET_UUID, constants.TYPE_FLAT, 'net2', LS_ID) self.mox.VerifyAll() @@ -209,7 +209,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.available_local_vlans = set([LV_ID]) a.phys_brs['net1'] = self.mock_map_tun_bridge a.phys_ofports['net1'] = self.MAP_TUN_OFPORT @@ -222,7 +222,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.provision_local_vlan(NET_UUID, constants.TYPE_VLAN, 'net2', LS_ID) self.mox.VerifyAll() @@ -235,7 +235,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.available_local_vlans = set() a.local_vlan_map[NET_UUID] = LVM a.reclaim_local_vlan(NET_UUID, LVM) @@ -253,7 +253,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.phys_brs['net1'] = self.mock_map_tun_bridge a.phys_ofports['net1'] = self.MAP_TUN_OFPORT a.int_ofports['net1'] = self.INT_OFPORT @@ -275,7 +275,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.phys_brs['net1'] = self.mock_map_tun_bridge a.phys_ofports['net1'] = self.MAP_TUN_OFPORT a.int_ofports['net1'] = self.INT_OFPORT @@ -300,7 +300,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.local_vlan_map[NET_UUID] = LVM a.port_bound(VIF_PORT, NET_UUID, 'gre', None, LS_ID) self.mox.VerifyAll() @@ -320,7 +320,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.local_vlan_map[NET_UUID] = LVM a.port_bound(VIF_PORT, NET_UUID, 'gre', None, LS_ID) a.available_local_vlans = set([LV_ID]) @@ -339,7 +339,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.available_local_vlans = set([LV_ID]) a.local_vlan_map[NET_UUID] = LVM a.port_dead(VIF_PORT) @@ -351,9 +351,10 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.tunnel_update( - mox.MockAnything, tunnel_id='1', tunnel_ip='10.0.10.1') + mox.MockAnything, tunnel_id='1', tunnel_ip='10.0.10.1', + tunnel_type=constants.TYPE_GRE) self.mox.VerifyAll() def testTunnelUpdateSelf(self): @@ -361,7 +362,7 @@ class TunnelTest(base.BaseTestCase): a = ovs_neutron_agent.OVSNeutronAgent(self.INT_BRIDGE, self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) a.tunnel_update( mox.MockAnything, tunnel_id='1', tunnel_ip='10.0.0.1') self.mox.VerifyAll() @@ -401,7 +402,7 @@ class TunnelTest(base.BaseTestCase): self.TUN_BRIDGE, '10.0.0.1', self.NET_MAPPING, - 'sudo', 2, 'gre') + 'sudo', 2, ['gre']) # Hack to test loop # We start method and expect it will raise after 2nd loop -- 2.45.2