From 27b8b1c246d63c14f112a99362873fe887c13c10 Mon Sep 17 00:00:00 2001 From: spisarski Date: Fri, 4 Aug 2017 14:57:08 -0600 Subject: Refactored neutron_utils#get_security_group() Added a sec_grp_settings (SecurityGroupSettings) object parameter in addition to sec_grp_name for more robust query options. JIRA: SNAPS-164 Change-Id: I8bb21ff9e5e6b1f532773ca01d37964f8b47b530 Signed-off-by: spisarski --- .../openstack/tests/create_security_group_tests.py | 41 +++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'snaps/openstack/tests') diff --git a/snaps/openstack/tests/create_security_group_tests.py b/snaps/openstack/tests/create_security_group_tests.py index a0392ea..99ea53a 100644 --- a/snaps/openstack/tests/create_security_group_tests.py +++ b/snaps/openstack/tests/create_security_group_tests.py @@ -200,8 +200,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): self.os_creds, sec_grp_settings) self.sec_grp_creator.create() - sec_grp = neutron_utils.get_security_group(self.neutron, - self.sec_grp_name) + sec_grp = neutron_utils.get_security_group( + self.neutron, sec_grp_settings=sec_grp_settings) self.assertIsNotNone(sec_grp) validation_utils.objects_equivalent( @@ -229,8 +229,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): self.os_creds, sec_grp_settings) self.sec_grp_creator.create() - sec_grp = neutron_utils.get_security_group(self.neutron, - self.sec_grp_name) + sec_grp = neutron_utils.get_security_group( + self.neutron, sec_grp_settings=sec_grp_settings) self.assertIsNotNone(sec_grp) validation_utils.objects_equivalent( @@ -258,8 +258,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): self.admin_os_creds, sec_grp_settings) self.sec_grp_creator.create() - sec_grp = neutron_utils.get_security_group(self.neutron, - self.sec_grp_name) + sec_grp = neutron_utils.get_security_group( + self.neutron, sec_grp_settings=sec_grp_settings) self.assertIsNotNone(sec_grp) validation_utils.objects_equivalent( @@ -294,7 +294,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): neutron_utils.delete_security_group(self.neutron, created_sec_grp) self.assertIsNone(neutron_utils.get_security_group( - self.neutron, self.sec_grp_creator.sec_grp_settings.name)) + self.neutron, + sec_grp_settings=self.sec_grp_creator.sec_grp_settings)) self.sec_grp_creator.clean() @@ -316,8 +317,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): self.os_creds, sec_grp_settings) self.sec_grp_creator.create() - sec_grp = neutron_utils.get_security_group(self.neutron, - self.sec_grp_name) + sec_grp = neutron_utils.get_security_group( + self.neutron, sec_grp_settings=sec_grp_settings) validation_utils.objects_equivalent( self.sec_grp_creator.get_security_group(), sec_grp) rules = neutron_utils.get_rules_by_security_group( @@ -351,8 +352,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): self.os_creds, sec_grp_settings) self.sec_grp_creator.create() - sec_grp = neutron_utils.get_security_group(self.neutron, - self.sec_grp_name) + sec_grp = neutron_utils.get_security_group( + self.neutron, sec_grp_settings=sec_grp_settings) validation_utils.objects_equivalent( self.sec_grp_creator.get_security_group(), sec_grp) rules = neutron_utils.get_rules_by_security_group( @@ -395,8 +396,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): self.os_creds, sec_grp_settings) self.sec_grp_creator.create() - sec_grp = neutron_utils.get_security_group(self.neutron, - self.sec_grp_name) + sec_grp = neutron_utils.get_security_group( + self.neutron, sec_grp_settings=sec_grp_settings) validation_utils.objects_equivalent( self.sec_grp_creator.get_security_group(), sec_grp) rules = neutron_utils.get_rules_by_security_group( @@ -428,8 +429,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): self.os_creds, sec_grp_settings) self.sec_grp_creator.create() - sec_grp = neutron_utils.get_security_group(self.neutron, - self.sec_grp_name) + sec_grp = neutron_utils.get_security_group( + self.neutron, sec_grp_settings=sec_grp_settings) validation_utils.objects_equivalent( self.sec_grp_creator.get_security_group(), sec_grp) @@ -484,8 +485,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): self.os_creds, sec_grp_settings) self.sec_grp_creator.create() - sec_grp = neutron_utils.get_security_group(self.neutron, - self.sec_grp_name) + sec_grp = neutron_utils.get_security_group( + self.neutron, sec_grp_settings=sec_grp_settings) validation_utils.objects_equivalent( self.sec_grp_creator.get_security_group(), sec_grp) rules = neutron_utils.get_rules_by_security_group( @@ -535,8 +536,8 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): self.os_creds, sec_grp_settings) self.sec_grp_creator.create() - sec_grp = neutron_utils.get_security_group(self.neutron, - self.sec_grp_name) + sec_grp = neutron_utils.get_security_group( + self.neutron, sec_grp_settings=sec_grp_settings) validation_utils.objects_equivalent( self.sec_grp_creator.get_security_group(), sec_grp) @@ -597,7 +598,7 @@ def validate_sec_grp_rules(neutron, rule_settings, rules): setting_proto = rule_setting.protocol.name sec_grp = neutron_utils.get_security_group( - neutron, rule_setting.sec_grp_name) + neutron, sec_grp_name=rule_setting.sec_grp_name) setting_eth_type = create_security_group.Ethertype.IPv4 if rule_setting.ethertype: -- cgit 1.2.3-korg