module refactoring

Distributes the functionality of service.py into the modules.
Moves ComposableRouters into the modules.
The routers and controllers now have short names.
The controllers get their APIs via the base class.

Change-Id:  I87404b80ea9800d6792f97a7a3a64fe839065c1c

3 files changed, 28 insertions, 18 deletions

diff --git a/keystone/catalog/__init__.py b/keystone/catalog/__init__.py
index c029a486..9c710151 100644
--- a/keystone/catalog/__init__.py
+++ b/keystone/catalog/__init__.py
@@ -16,3 +16,4 @@
 
 from keystone.catalog.core import *
 from keystone.catalog import controllers
+from keystone.catalog import routers
diff --git a/keystone/catalog/controllers.py b/keystone/catalog/controllers.py
index b58f3d07..b0460fc9 100644
--- a/keystone/catalog/controllers.py
+++ b/keystone/catalog/controllers.py
@@ -20,18 +20,9 @@ import uuid
 from keystone.catalog import core
 from keystone.common import controller
 from keystone.common import wsgi
-from keystone import identity
-from keystone import policy
-from keystone import token
 
 
-class Service(wsgi.Application):
-    def __init__(self):
-        self.catalog_api = core.Manager()
-        self.identity_api = identity.Manager()
-        self.policy_api = policy.Manager()
-        self.token_api = token.Manager()
-        super(Service, self).__init__()
+class Service(controller.V2Controller):
 
     def get_services(self, context):
         self.assert_admin(context)
@@ -57,14 +48,7 @@ class Service(wsgi.Application):
         return {'OS-KSADM:service': new_service_ref}
 
 
-class Endpoint(wsgi.Application):
-    def __init__(self):
-        self.catalog_api = core.Manager()
-        self.identity_api = identity.Manager()
-        self.policy_api = policy.Manager()
-        self.token_api = token.Manager()
-        super(Endpoint, self).__init__()
-
+class Endpoint(controller.V2Controller):
     def get_endpoints(self, context):
         self.assert_admin(context)
         endpoint_list = self.catalog_api.list_endpoints(context)
diff --git a/keystone/catalog/routers.py b/keystone/catalog/routers.py
new file mode 100644
index 00000000..f0c547f8
--- /dev/null
+++ b/keystone/catalog/routers.py
@@ -0,0 +1,25 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 OpenStack LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+from keystone.catalog import controllers
+from keystone.common import router
+from keystone.common import wsgi
+
+
+def append_v3_routers(mapper, routers, apis):
+    routers.append(router.Router(controllers.ServiceV3(**apis),
+                                 'services', 'service'))
+    routers.append(router.Router(controllers.EndpointV3(**apis),
+                                 'endpoints', 'endpoint'))