Driver registry

Uses automatic dependency injection to provide controllers with driver
interfaces (identity_api, token_api, etc).

See tests/test_injection.py for a self-contained example.

Change-Id: I255087de534292fbf57a45b19f97488f831f607c

2 files changed, 4 insertions, 2 deletions

diff --git a/keystone/policy/core.py b/keystone/policy/core.py
index a8d01f2f..e3abb3ba 100644
--- a/keystone/policy/core.py
+++ b/keystone/policy/core.py
@@ -17,6 +17,7 @@
 """Main entry point into the Policy service."""
 
 
+from keystone.common import dependency
 from keystone.common import manager
 from keystone import config
 from keystone import exception
@@ -25,6 +26,7 @@ from keystone import exception
 CONF = config.CONF
 
 
+@dependency.provider('policy_api')
 class Manager(manager.Manager):
     """Default pivot point for the Policy backend.
 
diff --git a/keystone/policy/routers.py b/keystone/policy/routers.py
index 6c050757..dbb53e9c 100644
--- a/keystone/policy/routers.py
+++ b/keystone/policy/routers.py
@@ -17,6 +17,6 @@ from keystone.policy import controllers
 from keystone.common import router
 
 
-def append_v3_routers(mapper, routers, apis):
-    policy_controller = controllers.PolicyV3(**apis)
+def append_v3_routers(mapper, routers):
+    policy_controller = controllers.PolicyV3()
     routers.append(router.Router(policy_controller, 'policies', 'policy'))