Merge "ovsfw: followup cleanups for the conjunction patch"
This commit is contained in:
@@ -80,7 +80,6 @@ class SecurityGroup(object):
|
|||||||
self.raw_rules = []
|
self.raw_rules = []
|
||||||
self.remote_rules = []
|
self.remote_rules = []
|
||||||
self.members = {}
|
self.members = {}
|
||||||
self.members_on_flows = {}
|
|
||||||
self.ports = set()
|
self.ports = set()
|
||||||
|
|
||||||
def update_rules(self, rules):
|
def update_rules(self, rules):
|
||||||
|
|||||||
@@ -256,7 +256,7 @@ class TestConjIdMap(base.BaseTestCase):
|
|||||||
result = self.conj_id_map.delete_sg('sg1')
|
result = self.conj_id_map.delete_sg('sg1')
|
||||||
self.assertIn(('sg1', ids[0]), result)
|
self.assertIn(('sg1', ids[0]), result)
|
||||||
self.assertIn(('sg2', ids[1]), 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(
|
reallocated = self.conj_id_map.get_conj_id(
|
||||||
'sg-foo', 'sg-foo', firewall.INGRESS_DIRECTION,
|
'sg-foo', 'sg-foo', firewall.INGRESS_DIRECTION,
|
||||||
|
|||||||
Reference in New Issue
Block a user