Merge "Make sure the port still in port map when prepare_port_filter" into stable/rocky
This commit is contained in:
commit
effd1955db
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -474,6 +474,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):
|
||||||
|
|
Loading…
Reference in New Issue