diff options
author | Steven Pisarski <s.pisarski@cablelabs.com> | 2017-07-12 13:24:02 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-07-12 13:24:02 +0000 |
commit | 2a6d3a0f73eb58762bdbe10567cfbb6edec54abb (patch) | |
tree | 81b8ccadc0756dd60c64ebaab397fa91c4d8d22d /snaps/openstack/utils/tests | |
parent | b9a8899d9fd402cb9011ce40f08d6979cee9228a (diff) | |
parent | 589f587b9139b84437d1b7e8cb017018fc9a4e06 (diff) |
Merge "Created domain classes for security groups."
Diffstat (limited to 'snaps/openstack/utils/tests')
-rw-r--r-- | snaps/openstack/utils/tests/neutron_utils_tests.py | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/snaps/openstack/utils/tests/neutron_utils_tests.py b/snaps/openstack/utils/tests/neutron_utils_tests.py index 1e89dda..516628b 100644 --- a/snaps/openstack/utils/tests/neutron_utils_tests.py +++ b/snaps/openstack/utils/tests/neutron_utils_tests.py @@ -669,14 +669,13 @@ class NeutronUtilsSecurityGroupTests(OSComponentTestCase): self.keystone, sec_grp_settings) - self.assertTrue(sec_grp_settings.name, - security_group['security_group']['name']) + self.assertTrue(sec_grp_settings.name, security_group.name) sec_grp_get = neutron_utils.get_security_group(self.neutron, sec_grp_settings.name) self.assertIsNotNone(sec_grp_get) self.assertTrue(validation_utils.objects_equivalent( - security_group['security_group'], sec_grp_get['security_group'])) + security_group, sec_grp_get)) neutron_utils.delete_security_group(self.neutron, security_group) sec_grp_get = neutron_utils.get_security_group(self.neutron, @@ -707,18 +706,13 @@ class NeutronUtilsSecurityGroupTests(OSComponentTestCase): neutron_utils.create_security_group(self.neutron, self.keystone, sec_grp_settings)) - self.assertTrue(sec_grp_settings.name, - self.security_groups[0]['security_group']['name']) - self.assertTrue(sec_grp_settings.description, - self.security_groups[0]['security_group'][ - 'description']) + self.assertTrue(sec_grp_settings.name, self.security_groups[0].name) + self.assertEqual(sec_grp_settings.name, self.security_groups[0].name) sec_grp_get = neutron_utils.get_security_group(self.neutron, sec_grp_settings.name) self.assertIsNotNone(sec_grp_get) - self.assertTrue(validation_utils.objects_equivalent( - self.security_groups[0]['security_group'], - sec_grp_get['security_group'])) + self.assertEqual(self.security_groups[0], sec_grp_get) def test_create_sec_grp_one_rule(self): """ @@ -751,19 +745,15 @@ class NeutronUtilsSecurityGroupTests(OSComponentTestCase): security_group) self.assertTrue( - validation_utils.objects_equivalent(self.security_group_rules, - rules)) + validation_utils.objects_equivalent( + self.security_group_rules, rules)) - self.assertTrue(sec_grp_settings.name, - security_group['security_group']['name']) - self.assertTrue(sec_grp_settings.description, - security_group['security_group']['description']) + self.assertTrue(sec_grp_settings.name, security_group.name) sec_grp_get = neutron_utils.get_security_group(self.neutron, sec_grp_settings.name) self.assertIsNotNone(sec_grp_get) - self.assertTrue(validation_utils.objects_equivalent( - security_group['security_group'], sec_grp_get['security_group'])) + self.assertEqual(security_group, sec_grp_get) def test_get_sec_grp_by_id(self): """ @@ -780,14 +770,12 @@ class NeutronUtilsSecurityGroupTests(OSComponentTestCase): description='hello group'))) sec_grp_1b = neutron_utils.get_security_group_by_id( - self.neutron, self.security_groups[0]['security_group']['id']) + self.neutron, self.security_groups[0].id) sec_grp_2b = neutron_utils.get_security_group_by_id( - self.neutron, self.security_groups[1]['security_group']['id']) + self.neutron, self.security_groups[1].id) - self.assertEqual(self.security_groups[0]['security_group']['id'], - sec_grp_1b['security_group']['id']) - self.assertEqual(self.security_groups[1]['security_group']['id'], - sec_grp_2b['security_group']['id']) + self.assertEqual(self.security_groups[0].id, sec_grp_1b.id) + self.assertEqual(self.security_groups[1].id, sec_grp_2b.id) class NeutronUtilsFloatingIpTests(OSComponentTestCase): |