openstack/neutron
Code Issues Proposed changes

Merge "Improve tunnel_sync"

Browse Source
This commit is contained in:
Jenkins 2017-02-07 04:05:19 +00:00 committed by Gerrit Code Review
commit e6ee6ad8ee
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -470,6 +470,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
if not self.l2_pop: if not self.l2_pop:
self._setup_tunnel_port(self.tun_br, tun_name, tunnel_ip, self._setup_tunnel_port(self.tun_br, tun_name, tunnel_ip,
tunnel_type) tunnel_type)
self._setup_tunnel_flood_flow(self.tun_br, tunnel_type)
def tunnel_delete(self, context, **kwargs): def tunnel_delete(self, context, **kwargs):
LOG.debug("tunnel_delete received") LOG.debug("tunnel_delete received")
@ -1440,7 +1441,9 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
# Add flow in default table to resubmit to the right # Add flow in default table to resubmit to the right
# tunneling table (lvid will be set in the latter) # tunneling table (lvid will be set in the latter)
br.setup_tunnel_port(tunnel_type, ofport) br.setup_tunnel_port(tunnel_type, ofport)
return ofport
def _setup_tunnel_flood_flow(self, br, tunnel_type):
ofports = self.tun_br_ofports[tunnel_type].values() ofports = self.tun_br_ofports[tunnel_type].values()
if ofports and not self.l2_pop: if ofports and not self.l2_pop:
# Update flooding flows to include the new tunnel # Update flooding flows to include the new tunnel
@ -1449,7 +1452,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
br.install_flood_to_tun(vlan_mapping.vlan, br.install_flood_to_tun(vlan_mapping.vlan,
vlan_mapping.segmentation_id, vlan_mapping.segmentation_id,
ofports) ofports)
return ofport
def setup_tunnel_port(self, br, remote_ip, network_type): def setup_tunnel_port(self, br, remote_ip, network_type):
port_name = self.get_tunnel_name( port_name = self.get_tunnel_name(
@ -1460,6 +1462,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
port_name, port_name,
remote_ip, remote_ip,
network_type) network_type)
self._setup_tunnel_flood_flow(br, network_type)
return ofport return ofport
def cleanup_tunnel_port(self, br, tun_ofport, tunnel_type): def cleanup_tunnel_port(self, br, tun_ofport, tunnel_type):
@ -1712,6 +1715,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
tun_name, tun_name,
tunnel['ip_address'], tunnel['ip_address'],
tunnel_type) tunnel_type)
self._setup_tunnel_flood_flow(self.tun_br, tunnel_type)
except Exception as e: except Exception as e:
LOG.debug("Unable to sync tunnel IP %(local_ip)s: %(e)s", LOG.debug("Unable to sync tunnel IP %(local_ip)s: %(e)s",
{'local_ip': self.local_ip, 'e': e}) {'local_ip': self.local_ip, 'e': e})

23
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
View File

@ -1735,6 +1735,28 @@ class TestOvsNeutronAgent(object):
'vxlan') 'vxlan')
self.assertEqual([], cleanup.mock_calls) self.assertEqual([], cleanup.mock_calls)
def test_tunnel_sync_setup_tunnel_flood_flow_once(self):
fake_tunnel_details = {'tunnels': [{'ip_address': '200.200.200.200'},
{'ip_address': '100.100.100.100'}]}
with mock.patch.object(self.agent.plugin_rpc,
'tunnel_sync',
return_value=fake_tunnel_details),\
mock.patch.object(
self.agent,
'_setup_tunnel_port') as _setup_tunnel_port_fn,\
mock.patch.object(
self.agent,
'_setup_tunnel_flood_flow') as _setup_tunnel_flood_flow:
self.agent.tunnel_types = ['vxlan']
self.agent.tunnel_sync()
expected_calls = [mock.call(self.agent.tun_br, 'vxlan-c8c8c8c8',
'200.200.200.200', 'vxlan'),
mock.call(self.agent.tun_br, 'vxlan-64646464',
'100.100.100.100', 'vxlan')]
_setup_tunnel_port_fn.assert_has_calls(expected_calls)
_setup_tunnel_flood_flow.assert_called_once_with(self.agent.tun_br,
'vxlan')
def test_tunnel_update(self): def test_tunnel_update(self):
kwargs = {'tunnel_ip': '10.10.10.10', kwargs = {'tunnel_ip': '10.10.10.10',
'tunnel_type': 'gre'} 'tunnel_type': 'gre'}
@ -2053,6 +2075,7 @@ class TestOvsNeutronAgent(object):
bridge.install_flood_to_tun.side_effect = add_new_vlan_mapping bridge.install_flood_to_tun.side_effect = add_new_vlan_mapping
self.agent._setup_tunnel_port(bridge, 1, '1.2.3.4', self.agent._setup_tunnel_port(bridge, 1, '1.2.3.4',
tunnel_type=tunnel_type) tunnel_type=tunnel_type)
self.agent._setup_tunnel_flood_flow(bridge, tunnel_type)
self.assertIn('bar', self.agent.vlan_manager) self.assertIn('bar', self.agent.vlan_manager)
def test_setup_entry_for_arp_reply_ignores_ipv6_addresses(self): def test_setup_entry_for_arp_reply_ignores_ipv6_addresses(self):