From a429678b218ea45c32d166cd41d0665132abaebd Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Thu, 27 Apr 2017 13:12:48 +0900 Subject: [PATCH] ovsfw: followup cleanups for the conjunction patch This is trivial cleanups for commit 192bc5f. No functional changes. Change-Id: Iafd3d8fbd738737ced7709e84a7a31eb987bf13f Related-bug: #1628819 --- neutron/agent/linux/openvswitch_firewall/firewall.py | 1 - .../unit/agent/linux/openvswitch_firewall/test_firewall.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/neutron/agent/linux/openvswitch_firewall/firewall.py b/neutron/agent/linux/openvswitch_firewall/firewall.py index 26553691ecb..653cc34679a 100644 --- a/neutron/agent/linux/openvswitch_firewall/firewall.py +++ b/neutron/agent/linux/openvswitch_firewall/firewall.py @@ -80,7 +80,6 @@ class SecurityGroup(object): self.raw_rules = [] self.remote_rules = [] self.members = {} - self.members_on_flows = {} self.ports = set() def update_rules(self, rules): diff --git a/neutron/tests/unit/agent/linux/openvswitch_firewall/test_firewall.py b/neutron/tests/unit/agent/linux/openvswitch_firewall/test_firewall.py index d03fa797816..42f5b57fb90 100644 --- a/neutron/tests/unit/agent/linux/openvswitch_firewall/test_firewall.py +++ b/neutron/tests/unit/agent/linux/openvswitch_firewall/test_firewall.py @@ -256,7 +256,7 @@ class TestConjIdMap(base.BaseTestCase): result = self.conj_id_map.delete_sg('sg1') self.assertIn(('sg1', ids[0]), result) self.assertIn(('sg2', ids[1]), result) - self.assertEqual(len(self.conj_id_map.id_map), 0) + self.assertFalse(self.conj_id_map.id_map) reallocated = self.conj_id_map.get_conj_id( 'sg-foo', 'sg-foo', firewall.INGRESS_DIRECTION,