openstack
/
neutron
Code Issues Proposed changes

Add more condition to check sg member exist 

Only check sg object is not enough, we should also
check sg'ports is {} or not. Otherwise the old conjunction
will still exist.

Change-Id: I10588e73a9da7fdd43677f9247c176811dd68c62
Closes-Bug: #1854131
(cherry picked from commit 5cb0ff418a)
This commit is contained in:
Yang Li 2019-11-27 14:48:05 +08:00 committed by Nate Johnston
parent a4633151d3
commit a5642453a8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,7 +293,7 @@ class ConjIPFlowManager(object):
addr_to_conj = collections.defaultdict(list) addr_to_conj = collections.defaultdict(list)
for remote_id, conj_id_set in sg_conj_id_map.items(): for remote_id, conj_id_set in sg_conj_id_map.items():
remote_group = self.driver.sg_port_map.get_sg(remote_id) remote_group = self.driver.sg_port_map.get_sg(remote_id)
if not remote_group: if not remote_group or not remote_group.ports:
LOG.debug('No member for SG %s', remote_id) LOG.debug('No member for SG %s', remote_id)
continue continue
for addr in remote_group.get_ethertype_filtered_addresses( for addr in remote_group.get_ethertype_filtered_addresses(

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

@ -303,6 +303,18 @@ class TestConjIPFlowManager(base.BaseTestCase):
self.vlan_tag = 100 self.vlan_tag = 100
self.conj_id = 16 self.conj_id = 16
def test_update_flows_for_vlan_no_ports(self):
remote_group = self.driver.sg_port_map.get_sg.return_value
remote_group.ports = {}
with mock.patch.object(self.manager.conj_id_map,
'get_conj_id') as get_conj_id_mock:
get_conj_id_mock.return_value = self.conj_id
self.manager.add(self.vlan_tag, 'sg', 'remote_id',
constants.INGRESS_DIRECTION, constants.IPv4, 0)
self.manager.update_flows_for_vlan(self.vlan_tag)
self.assertFalse(remote_group.get_ethertype_filtered_addresses.called)
self.assertFalse(self.driver._add_flow.called)
def test_update_flows_for_vlan(self): def test_update_flows_for_vlan(self):
remote_group = self.driver.sg_port_map.get_sg.return_value remote_group = self.driver.sg_port_map.get_sg.return_value
remote_group.get_ethertype_filtered_addresses.return_value = [ remote_group.get_ethertype_filtered_addresses.return_value = [