openstack
/
neutron
Code Issues Proposed changes

Merge "Fix OVS conjunctive IP flows cleanup" into stable/queens

This commit is contained in:
Zuul 2021-04-13 17:07:51 +00:00 committed by Gerrit Code Review
parent e94732b379 0c8d9fed08
commit 3e818718b6
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1510,4 +1510,9 @@ class OVSFirewallDriver(firewall.FirewallDriver):
# the actions field is bogus anyway. # the actions field is bogus anyway.
del flow['actions'] del flow['actions']
del flow['priority'] del flow['priority']
# NOTE(hangyang) If cookie is not set then _delete_flows will
# use the OVSBridge._default_cookie to filter the flows but that
# will not match with the ip flow's cookie so OVS won't actually
# delete the flow
flow['cookie'] = ovs_lib.COOKIE_ANY
self._delete_flows(deferred=False, **flow) self._delete_flows(deferred=False, **flow)

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

@ -1061,6 +1061,16 @@ class TestOVSFirewallDriver(base.BaseTestCase):
addr_to_conj = {'addr1': {8, 16, 24}} addr_to_conj = {'addr1': {8, 16, 24}}
self._test_delete_flows_for_flow_state(addr_to_conj, False) self._test_delete_flows_for_flow_state(addr_to_conj, False)
def test_delete_flow_for_ip_using_cookie_any(self):
with mock.patch.object(self.firewall, '_delete_flows') as \
mock_delete_flows:
self.firewall.delete_flow_for_ip('10.1.2.3',
constants.INGRESS_DIRECTION,
constants.IPv4, 100, [0])
_, kwargs = mock_delete_flows.call_args
self.assertIn('cookie', kwargs)
self.assertIs(ovs_lib.COOKIE_ANY, kwargs['cookie'])
class TestCookieContext(base.BaseTestCase): class TestCookieContext(base.BaseTestCase):
def setUp(self): def setUp(self):