openstack
/
neutron
Code Issues Proposed changes

Merge "Make sure the port still in port map when prepare_port_filter" into stable/queens

This commit is contained in:
Zuul 2019-08-14 22:16:58 +00:00 committed by Gerrit Code Review
parent a6397771e8 eabe3b707a
commit a74539bfab
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/linux/openvswitch_firewall/firewall.py
View File

@ -534,7 +534,9 @@ class OVSFirewallDriver(firewall.FirewallDriver):
if of_port.ofport != ovs_port.ofport: if of_port.ofport != ovs_port.ofport:
self.sg_port_map.remove_port(of_port) self.sg_port_map.remove_port(of_port)
of_port = OFPort(port, ovs_port, of_port.vlan_tag) of_port = OFPort(port, ovs_port, of_port.vlan_tag)
self.sg_port_map.update_port(of_port, port) self.sg_port_map.create_port(of_port, port)
else:
self.sg_port_map.update_port(of_port, port)
return of_port return of_port

1
neutron/tests/unit/agent/linux/openvswitch_firewall/test_firewall.py
View File

@ -475,6 +475,7 @@ class TestOVSFirewallDriver(base.BaseTestCase):
self.mock_bridge.br.get_vif_port_by_id.return_value = \ self.mock_bridge.br.get_vif_port_by_id.return_value = \
fake_ovs_port fake_ovs_port
port = self.firewall.get_or_create_ofport(port_dict) port = self.firewall.get_or_create_ofport(port_dict)
self.assertIn(of_port.id, self.firewall.sg_port_map.ports.keys())
self.assertEqual(port.ofport, 2) self.assertEqual(port.ofport, 2)
def test_get_or_create_ofport_missing(self): def test_get_or_create_ofport_missing(self):