Merge "Update Keystone core to Mitaka."

1 files changed, 12 insertions, 11 deletions

diff --git a/keystone-moon/keystone/tests/unit/test_backend_endpoint_policy.py b/keystone-moon/keystone/tests/unit/test_backend_endpoint_policy.py
index 6c2181aa..f72cad63 100644
--- a/keystone-moon/keystone/tests/unit/test_backend_endpoint_policy.py
+++ b/keystone-moon/keystone/tests/unit/test_backend_endpoint_policy.py
@@ -18,6 +18,7 @@ from six.moves import range
 from testtools import matchers
 
 from keystone import exception
+from keystone.tests import unit
 
 
 class PolicyAssociationTests(object):
@@ -51,11 +52,11 @@ class PolicyAssociationTests(object):
           5 - region 2, Service 0
 
         """
-
         def new_endpoint(region_id, service_id):
-            endpoint = {'id': uuid.uuid4().hex, 'interface': 'test',
-                        'region_id': region_id, 'service_id': service_id,
-                        'url': '/url'}
+            endpoint = unit.new_endpoint_ref(interface='test',
+                                             region_id=region_id,
+                                             service_id=service_id,
+                                             url='/url')
             self.endpoint.append(self.catalog_api.create_endpoint(
                 endpoint['id'], endpoint))
 
@@ -63,18 +64,18 @@ class PolicyAssociationTests(object):
         self.endpoint = []
         self.service = []
         self.region = []
+
+        parent_region_id = None
         for i in range(3):
-            policy = {'id': uuid.uuid4().hex, 'type': uuid.uuid4().hex,
-                      'blob': {'data': uuid.uuid4().hex}}
+            policy = unit.new_policy_ref()
             self.policy.append(self.policy_api.create_policy(policy['id'],
                                                              policy))
-            service = {'id': uuid.uuid4().hex, 'type': uuid.uuid4().hex}
+            service = unit.new_service_ref()
             self.service.append(self.catalog_api.create_service(service['id'],
                                                                 service))
-            region = {'id': uuid.uuid4().hex, 'description': uuid.uuid4().hex}
-            # Link the 3 regions together as a hierarchy, [0] at the top
-            if i != 0:
-                region['parent_region_id'] = self.region[i - 1]['id']
+            region = unit.new_region_ref(parent_region_id=parent_region_id)
+            # Link the regions together as a hierarchy, [0] at the top
+            parent_region_id = region['id']
             self.region.append(self.catalog_api.create_region(region))
 
         new_endpoint(self.region[0]['id'], self.service[0]['id'])