Fixed test for security groups when checking for project/tenant ID

This problem has only been observed on the WindRiver pod during the
OPNFV Plug/Hackfest

This is exactly the same patch that was checked in master

JIRA: SNAPS-72

Change-Id: I595cf0bca7394d8ffd95cec5824afbacda80d3ef
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

diff --git a/snaps/openstack/tests/create_project_tests.py b/snaps/openstack/tests/create_project_tests.py
index 9d53467..4e1d254 100644 (file)
--- a/snaps/openstack/tests/create_project_tests.py
+++ b/snaps/openstack/tests/create_project_tests.py
@@ -193,10 +193,12 @@ class CreateProjectUserTests(OSComponentTestCase):
         self.assertIsNotNone(sec_grp)
         self.sec_grp_creators.append(sec_grp_creator)
 
-        if self.keystone.version == keystone_utils.V2_VERSION:
+        if 'tenant_id' in sec_grp['security_group']:
             self.assertEquals(self.project_creator.get_project().id, sec_grp['security_group']['tenant_id'])
-        else:
+        elif 'project_id' in sec_grp['security_group']:
             self.assertEquals(self.project_creator.get_project().id, sec_grp['security_group']['project_id'])
+        else:
+            self.fail('Cannot locate the project or tenant ID')
 
     def test_create_project_sec_grp_two_users(self):
         """
@@ -225,4 +227,10 @@ class CreateProjectUserTests(OSComponentTestCase):
             sec_grp = sec_grp_creator.create()
             self.assertIsNotNone(sec_grp)
             self.sec_grp_creators.append(sec_grp_creator)
-            self.assertEquals(self.project_creator.get_project().id, sec_grp['security_group']['tenant_id'])
+
+            if 'tenant_id' in sec_grp['security_group']:
+                self.assertEquals(self.project_creator.get_project().id, sec_grp['security_group']['tenant_id'])
+            elif 'project_id' in sec_grp['security_group']:
+                self.assertEquals(self.project_creator.get_project().id, sec_grp['security_group']['project_id'])
+            else:
+                self.fail('Cannot locate the project or tenant ID')