Merge "Make all fixture project_ids into uuids" into stable/mitaka

4 files changed, 26 insertions, 18 deletions

diff --git a/keystone/tests/unit/core.py b/keystone/tests/unit/core.py
index 3d7ed61cd..1054e1311 100644
--- a/keystone/tests/unit/core.py
+++ b/keystone/tests/unit/core.py
@@ -729,7 +729,8 @@ class TestCase(BaseTestCase):
                 fixtures_to_cleanup.append(attrname)
 
             for tenant in fixtures.TENANTS:
-                if hasattr(self, 'tenant_%s' % tenant['id']):
+                tenant_attr_name = 'tenant_%s' % tenant['name'].lower()
+                if hasattr(self, tenant_attr_name):
                     try:
                         # This will clear out any roles on the project as well
                         self.resource_api.delete_project(tenant['id'])
@@ -738,9 +739,8 @@ class TestCase(BaseTestCase):
                 rv = self.resource_api.create_project(
                     tenant['id'], tenant)
 
-                attrname = 'tenant_%s' % tenant['id']
-                setattr(self, attrname, rv)
-                fixtures_to_cleanup.append(attrname)
+                setattr(self, tenant_attr_name, rv)
+                fixtures_to_cleanup.append(tenant_attr_name)
 
             for role in fixtures.ROLES:
                 try:
diff --git a/keystone/tests/unit/default_fixtures.py b/keystone/tests/unit/default_fixtures.py
index 19c5ef19d..7f6619867 100644
--- a/keystone/tests/unit/default_fixtures.py
+++ b/keystone/tests/unit/default_fixtures.py
@@ -14,12 +14,17 @@
 
 # NOTE(dolph): please try to avoid additional fixtures if possible; test suite
 #              performance may be negatively affected.
+import uuid
 
+BAR_TENANT_ID = uuid.uuid4().hex
+BAZ_TENANT_ID = uuid.uuid4().hex
+MTU_TENANT_ID = uuid.uuid4().hex
+SERVICE_TENANT_ID = uuid.uuid4().hex
 DEFAULT_DOMAIN_ID = 'default'
 
 TENANTS = [
     {
-        'id': 'bar',
+        'id': BAR_TENANT_ID,
         'name': 'BAR',
         'domain_id': DEFAULT_DOMAIN_ID,
         'description': 'description',
@@ -27,7 +32,7 @@ TENANTS = [
         'parent_id': DEFAULT_DOMAIN_ID,
         'is_domain': False,
     }, {
-        'id': 'baz',
+        'id': BAZ_TENANT_ID,
         'name': 'BAZ',
         'domain_id': DEFAULT_DOMAIN_ID,
         'description': 'description',
@@ -35,7 +40,7 @@ TENANTS = [
         'parent_id': DEFAULT_DOMAIN_ID,
         'is_domain': False,
     }, {
-        'id': 'mtu',
+        'id': MTU_TENANT_ID,
         'name': 'MTU',
         'description': 'description',
         'enabled': True,
@@ -43,7 +48,7 @@ TENANTS = [
         'parent_id': DEFAULT_DOMAIN_ID,
         'is_domain': False,
     }, {
-        'id': 'service',
+        'id': SERVICE_TENANT_ID,
         'name': 'service',
         'description': 'description',
         'enabled': True,
@@ -69,7 +74,7 @@ USERS = [
         'name': 'FOO',
         'domain_id': DEFAULT_DOMAIN_ID,
         'password': 'foo2',
-        'tenants': ['bar'],
+        'tenants': [BAR_TENANT_ID],
         'enabled': True,
         'email': 'foo@bar.com',
     }, {
@@ -78,8 +83,8 @@ USERS = [
         'domain_id': DEFAULT_DOMAIN_ID,
         'password': 'two2',
         'enabled': True,
-        'default_project_id': 'baz',
-        'tenants': ['baz'],
+        'default_project_id': BAZ_TENANT_ID,
+        'tenants': [BAZ_TENANT_ID],
         'email': 'two@three.com',
     }, {
         'id': 'badguy',
@@ -87,8 +92,8 @@ USERS = [
         'domain_id': DEFAULT_DOMAIN_ID,
         'password': 'bad',
         'enabled': False,
-        'default_project_id': 'baz',
-        'tenants': ['baz'],
+        'default_project_id': BAZ_TENANT_ID,
+        'tenants': [BAZ_TENANT_ID],
         'email': 'bad@guy.com',
     }, {
         'id': 'sna',
@@ -96,7 +101,7 @@ USERS = [
         'domain_id': DEFAULT_DOMAIN_ID,
         'password': 'snafu',
         'enabled': True,
-        'tenants': ['bar'],
+        'tenants': [BAR_TENANT_ID],
         'email': 'sna@snl.coom',
     }
 ]
@@ -137,7 +142,7 @@ ROLES = [
 ROLE_ASSIGNMENTS = [
     {
         'user': 'reqadmin',
-        'tenant_id': 'service',
+        'tenant_id': SERVICE_TENANT_ID,
         'role_id': 'admin'
     },
 ]
diff --git a/keystone/tests/unit/rest.py b/keystone/tests/unit/rest.py
index db1416919..512c301d8 100644
--- a/keystone/tests/unit/rest.py
+++ b/keystone/tests/unit/rest.py
@@ -223,7 +223,7 @@ class RestfulTestCase(unit.TestCase):
                     'username': self.user_reqadmin['name'],
                     'password': self.user_reqadmin['password']
                 },
-                'tenantId': 'service'
+                'tenantId': default_fixtures.SERVICE_TENANT_ID
             }
         })
 
diff --git a/keystone/tests/unit/test_v2.py b/keystone/tests/unit/test_v2.py
index 0885d73be..e81c60409 100644
--- a/keystone/tests/unit/test_v2.py
+++ b/keystone/tests/unit/test_v2.py
@@ -24,6 +24,7 @@ from testtools import matchers
 
 from keystone.common import extension as keystone_extension
 from keystone.tests import unit
+from keystone.tests.unit import default_fixtures
 from keystone.tests.unit import ksfixtures
 from keystone.tests.unit import rest
 from keystone.tests.unit.schema import v2
@@ -180,7 +181,8 @@ class CoreApiTests(object):
             self.tenant_service['id'],
             self.role_service['id'])
 
-        token = self.get_scoped_token(tenant_id='service')
+        token = self.get_scoped_token(
+            tenant_id=default_fixtures.SERVICE_TENANT_ID)
         r = self.admin_request(
             path='/v2.0/tokens/%s' % token,
             token=token)
@@ -192,7 +194,8 @@ class CoreApiTests(object):
             self.tenant_service['id'],
             self.role_service['id'])
 
-        token = self.get_scoped_token(tenant_id='service')
+        token = self.get_scoped_token(
+            tenant_id=default_fixtures.SERVICE_TENANT_ID)
         r = self.admin_request(
             path='/v2.0/tokens/%s' % token,
             token=token)