diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-07-11 12:08:53 -0600 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-07-11 12:54:46 -0600 |
| commit | 589f587b9139b84437d1b7e8cb017018fc9a4e06 (patch) | |
| tree | 3064f18ec710d09fa22daf133036d1607a979f7a /snaps/openstack/tests | |
| parent | 5f3fe6856f07bd1289bac532264eccf6cba68d77 (diff) | |
Created domain classes for security groups.
Created SecurityGroup and SecurityGroupRule classes so the neutron_utils
for security groups will be returning objects of these types instead of
the OpenStack objects returned by the API calls.
JIRA: SNAPS-116
Change-Id: I76ed1f85f7d54b984fc6f6ac28cee7680a1109e5
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/tests')
| -rw-r--r-- | snaps/openstack/tests/create_project_tests.py | 20 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_security_group_tests.py | 2 |
2 files changed, 5 insertions, 17 deletions
diff --git a/snaps/openstack/tests/create_project_tests.py b/snaps/openstack/tests/create_project_tests.py index 068ab95..da93b13 100644 --- a/snaps/openstack/tests/create_project_tests.py +++ b/snaps/openstack/tests/create_project_tests.py @@ -209,14 +209,8 @@ class CreateProjectUserTests(OSComponentTestCase): self.assertIsNotNone(sec_grp) self.sec_grp_creators.append(sec_grp_creator) - if 'tenant_id' in sec_grp['security_group']: - self.assertEqual(self.project_creator.get_project().id, - sec_grp['security_group']['tenant_id']) - elif 'project_id' in sec_grp['security_group']: - self.assertEqual(self.project_creator.get_project().id, - sec_grp['security_group']['project_id']) - else: - self.fail('Cannot locate the project or tenant ID') + self.assertEqual(self.project_creator.get_project().id, + sec_grp.project_id) def test_create_project_sec_grp_two_users(self): """ @@ -254,11 +248,5 @@ class CreateProjectUserTests(OSComponentTestCase): self.assertIsNotNone(sec_grp) self.sec_grp_creators.append(sec_grp_creator) - if 'tenant_id' in sec_grp['security_group']: - self.assertEqual(self.project_creator.get_project().id, - sec_grp['security_group']['tenant_id']) - elif 'project_id' in sec_grp['security_group']: - self.assertEqual(self.project_creator.get_project().id, - sec_grp['security_group']['project_id']) - else: - self.fail('Cannot locate the project or tenant ID') + self.assertEqual(self.project_creator.get_project().id, + sec_grp.project_id) diff --git a/snaps/openstack/tests/create_security_group_tests.py b/snaps/openstack/tests/create_security_group_tests.py index 8fd8a6a..75c6387 100644 --- a/snaps/openstack/tests/create_security_group_tests.py +++ b/snaps/openstack/tests/create_security_group_tests.py @@ -368,7 +368,7 @@ class CreateSecurityGroupTests(OSIntegrationTestCase): rules) self.sec_grp_creator.remove_rule( - rule_id=rules[0]['security_group_rule']['id']) + rule_id=rules[0].id) rules_after_del = neutron_utils.get_rules_by_security_group( self.neutron, self.sec_grp_creator.get_security_group()) |