x/vmware-nsx
Code Issues Proposed changes

Merge "When l2-pop ON, clean stale ports in table0 br-tun"

Browse Source
This commit is contained in:
Jenkins
2014-06-14 07:22:05 +00:00
committed by Gerrit Code Review
parent 5fa9f154d0 2221191ddf
commit c5cad9a92f
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
View File

@@ -1080,6 +1080,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
port_name = '%s-%s' % (tunnel_type, port_name = '%s-%s' % (tunnel_type,
self.get_ip_in_hex(remote_ip)) self.get_ip_in_hex(remote_ip))
self.tun_br.delete_port(port_name) self.tun_br.delete_port(port_name)
self.tun_br.delete_flows(in_port=ofport)
self.tun_br_ofports[tunnel_type].pop(remote_ip, None) self.tun_br_ofports[tunnel_type].pop(remote_ip, None)
def treat_devices_added_or_updated(self, devices, ovs_restarted): def treat_devices_added_or_updated(self, devices, ovs_restarted):

16
neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
View File

@@ -624,19 +624,19 @@ class TestOvsNeutronAgent(base.BaseTestCase):
mock.patch.object(self.agent.tun_br, 'delete_flows'), mock.patch.object(self.agent.tun_br, 'delete_flows'),
) as (mod_flow_fn, del_flow_fn): ) as (mod_flow_fn, del_flow_fn):
self.agent.fdb_remove(None, fdb_entry) self.agent.fdb_remove(None, fdb_entry)
del_flow_fn.assert_has_calls([ mod_flow_fn.assert_called_with(table=constants.FLOOD_TO_TUN,
mock.call(table=constants.ARP_RESPONDER, dl_vlan='vlan2',
actions='strip_vlan,'
'set_tunnel:seg2,output:1')
expected = [mock.call(table=constants.ARP_RESPONDER,
proto='arp', proto='arp',
dl_vlan='vlan2', dl_vlan='vlan2',
nw_dst=FAKE_IP1), nw_dst=FAKE_IP1),
mock.call(table=constants.UCAST_TO_TUN, mock.call(table=constants.UCAST_TO_TUN,
dl_vlan='vlan2', dl_vlan='vlan2',
dl_dst=FAKE_MAC) dl_dst=FAKE_MAC),
]) mock.call(in_port='2')]
mod_flow_fn.assert_called_with(table=constants.FLOOD_TO_TUN, del_flow_fn.assert_has_calls(expected)
dl_vlan='vlan2',
actions='strip_vlan,'
'set_tunnel:seg2,output:1')
def test_fdb_add_port(self): def test_fdb_add_port(self):
self._prepare_l2_pop_ofports() self._prepare_l2_pop_ofports()