Merge "Use dependency injection for assignment and identity"

9 files changed, 32 insertions, 20 deletions

diff --git a/keystone/assignment/backends/kvs.py b/keystone/assignment/backends/kvs.py
index 4dfd908f..30d7b2eb 100644
--- a/keystone/assignment/backends/kvs.py
+++ b/keystone/assignment/backends/kvs.py
@@ -16,11 +16,13 @@
 
 from keystone import assignment
 from keystone import clean
+from keystone.common import dependency
 from keystone.common import kvs
 from keystone import exception
 from keystone import identity
 
 
+@dependency.requires('identity_api')
 class Assignment(kvs.Base, assignment.Driver):
     def __init__(self):
         super(Assignment, self).__init__()
diff --git a/keystone/assignment/backends/ldap.py b/keystone/assignment/backends/ldap.py
index f8c81eae..9b273e40 100644
--- a/keystone/assignment/backends/ldap.py
+++ b/keystone/assignment/backends/ldap.py
@@ -21,6 +21,7 @@ import ldap as ldap
 
 from keystone import assignment
 from keystone import clean
+from keystone.common import dependency
 from keystone.common import ldap as common_ldap
 from keystone.common import logging
 from keystone.common import models
@@ -39,6 +40,7 @@ DEFAULT_DOMAIN = {
 }
 
 
+@dependency.requires('identity_api')
 class Assignment(assignment.Driver):
     def __init__(self):
         super(Assignment, self).__init__()
diff --git a/keystone/assignment/backends/sql.py b/keystone/assignment/backends/sql.py
index 5ec435ff..024a291a 100644
--- a/keystone/assignment/backends/sql.py
+++ b/keystone/assignment/backends/sql.py
@@ -16,15 +16,14 @@
 
 from keystone import assignment
 from keystone import clean
+from keystone.common import dependency
 from keystone.common import sql
 from keystone.common.sql import migration
 from keystone import exception
 
 
+@dependency.requires('identity_api')
 class Assignment(sql.Base, assignment.Driver):
-    def __init__(self):
-        super(Assignment, self).__init__()
-        self.identity_api = None
 
     # Internal interface to manage the database
     def db_sync(self, version=None):
diff --git a/keystone/assignment/core.py b/keystone/assignment/core.py
index b71e2a18..64edb3fa 100644
--- a/keystone/assignment/core.py
+++ b/keystone/assignment/core.py
@@ -35,6 +35,7 @@ DEFAULT_DOMAIN = {'description':
 
 
 @dependency.provider('assignment_api')
+@dependency.requires('identity_api')
 class Manager(manager.Manager):
     """Default pivot point for the Assignment backend.
 
@@ -45,18 +46,14 @@ class Manager(manager.Manager):
     api object by both managers.
     """
 
-    def __init__(self, identity_api=None):
-        if identity_api is None:
-            from keystone import identity
-            identity_api = identity.Manager(self)
-
+    def __init__(self):
         assignment_driver = CONF.assignment.driver
+
         if assignment_driver is None:
-            assignment_driver = identity_api.default_assignment_driver()
+            identity_driver = dependency.REGISTRY['identity_api'].driver
+            assignment_driver = identity_driver.default_assignment_driver()
+
         super(Manager, self).__init__(assignment_driver)
-        self.driver.identity_api = identity_api
-        self.identity_api = identity_api
-        self.identity_api.assignment_api = self
 
     def get_roles_for_user_and_project(self, user_id, tenant_id):
         """Get the roles associated with a user within given project.
diff --git a/keystone/identity/backends/ldap.py b/keystone/identity/backends/ldap.py
index 53f7f156..91ea1e41 100644
--- a/keystone/identity/backends/ldap.py
+++ b/keystone/identity/backends/ldap.py
@@ -19,6 +19,7 @@ import uuid
 import ldap
 
 from keystone import clean
+from keystone.common import dependency
 from keystone.common import ldap as common_ldap
 from keystone.common import logging
 from keystone.common import models
@@ -38,6 +39,7 @@ DEFAULT_DOMAIN = {
 }
 
 
+@dependency.requires('assignment_api')
 class Identity(identity.Driver):
     def __init__(self):
         super(Identity, self).__init__()
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index ba97758c..bff41106 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from keystone.common import dependency
 from keystone.common import sql
 from keystone.common.sql import migration
 from keystone.common import utils
@@ -61,6 +62,7 @@ class UserGroupMembership(sql.ModelBase, sql.DictBase):
                           primary_key=True)
 
 
+@dependency.requires('assignment_api')
 class Identity(sql.Base, identity.Driver):
     def default_assignment_driver(self):
         return "keystone.assignment.backends.sql.Assignment"
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index 3d9bcf62..b2b3eaf0 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -16,7 +16,6 @@
 
 """Main entry point into the Identity service."""
 
-from keystone import assignment
 from keystone import clean
 from keystone.common import dependency
 from keystone.common import logging
@@ -53,6 +52,7 @@ def filter_user(user_ref):
 
 
 @dependency.provider('identity_api')
+@dependency.requires('assignment_api')
 class Manager(manager.Manager):
     """Default pivot point for the Identity backend.
 
@@ -61,12 +61,8 @@ class Manager(manager.Manager):
 
     """
 
-    def __init__(self, assignment_api=None):
+    def __init__(self):
         super(Manager, self).__init__(CONF.identity.driver)
-        if assignment_api is None:
-            assignment_api = assignment.Manager(self)
-        self.assignment_api = assignment_api
-        self.driver.assignment_api = assignment_api
 
     def create_user(self, user_id, user_ref):
         user = user_ref.copy()
diff --git a/keystone/service.py b/keystone/service.py
index 775dfe5d..ce64aba8 100644
--- a/keystone/service.py
+++ b/keystone/service.py
@@ -16,6 +16,7 @@
 
 import routes
 
+from keystone import assignment
 from keystone import auth
 from keystone import catalog
 from keystone.common import dependency
@@ -35,11 +36,18 @@ from keystone import trust
 CONF = config.CONF
 LOG = logging.getLogger(__name__)
 
+
+# Ensure that the identity driver is created before the assignment manager.
+# The default assignment driver is determined by the identity driver, so the
+# identity driver must be available to the assignment manager.
+_IDENTITY_API = identity.Manager()
+
 DRIVERS = dict(
+    assignment_api=assignment.Manager(),
     catalog_api=catalog.Manager(),
     credentials_api=credential.Manager(),
     ec2_api=ec2.Manager(),
-    identity_api=identity.Manager(),
+    identity_api=_IDENTITY_API,
     policy_api=policy.Manager(),
     token_api=token.Manager(),
     trust_api=trust.Manager(),
diff --git a/keystone/test.py b/keystone/test.py
index 55aca3c6..5d1ad505 100644
--- a/keystone/test.py
+++ b/keystone/test.py
@@ -266,7 +266,11 @@ class TestCase(NoModule, unittest.TestCase):
         # only call load_backends once.
         dependency.reset()
 
-        for manager in [assignment, catalog, credential, ec2, identity, policy,
+        # NOTE(blk-u): identity must be before assignment to ensure that the
+        # identity driver is available to the assignment manager because the
+        # assignment manager gets the default assignment driver from the
+        # identity driver.
+        for manager in [identity, assignment, catalog, credential, ec2, policy,
                         token, token_provider, trust]:
             manager_name = '%s_api' % manager.__name__.split('.')[-1]
             setattr(self, manager_name, manager.Manager())