Rework how routing is done in ec2 endpoint.

2 files changed, 49 insertions, 13 deletions

diff --git a/etc/nova-api.conf b/etc/nova-api.conf
index c5dd0aaec..cf49b7254 100644
--- a/etc/nova-api.conf
+++ b/etc/nova-api.conf
@@ -12,19 +12,28 @@ openstack_address = 0.0.0.0
 [composite:ec2]
 use = egg:Paste#urlmap
 /: ec2versions
-/services: ec2api
+/services/Cloud: ec2cloud
+/services/Admin: ec2admin
 /latest: ec2metadata
 /200: ec2metadata
 /1.0: ec2metadata
 
-[pipeline:ec2api]
-pipeline = authenticate router authorizer ec2executor
+[pipeline:ec2cloud]
+pipeline = authenticate cloudrequest authorizer ec2executor
+
+[pipeline:ec2admin]
+pipeline = authenticate adminrequest authorizer ec2executor
 
 [filter:authenticate]
 paste.filter_factory = nova.api.ec2:authenticate_factory
 
-[filter:router]
-paste.filter_factory = nova.api.ec2:router_factory
+[filter:cloudrequest]
+controller = nova.api.ec2.cloud.CloudController
+paste.filter_factory = nova.api.ec2:requestify_factory
+
+[filter:adminrequest]
+controller = nova.api.ec2.admin.AdminController
+paste.filter_factory = nova.api.ec2:requestify_factory
 
 [filter:authorizer]
 paste.filter_factory = nova.api.ec2:authorizer_factory
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index aa3bfaeb4..a5810479e 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -29,6 +29,7 @@ import webob.exc
 from nova import context
 from nova import exception
 from nova import flags
+from nova import utils
 from nova import wsgi
 from nova.api.ec2 import apirequest
 from nova.api.ec2 import admin
@@ -157,6 +158,31 @@ class Authenticate(wsgi.Middleware):
         return self.application
 
 
+class Requestify(wsgi.Middleware):
+
+    def __init__(self, app, controller_name):
+        super(Requestify, self).__init__(app)
+        self.controller = utils.import_class(controller_name)()
+
+    @webob.dec.wsgify
+    def __call__(self, req):
+        non_args = ['Action', 'Signature', 'AWSAccessKeyId', 'SignatureMethod',
+                    'SignatureVersion', 'Version', 'Timestamp']
+        args = dict(req.params)
+        try:
+            # Raise KeyError if omitted
+            action = req.params['Action']
+            for non_arg in non_args:
+                # Remove, but raise KeyError if omitted
+                args.pop(non_arg)
+        except:
+            raise webob.exc.HTTPBadRequest()
+        api_request = apirequest.APIRequest(self.controller, action)
+        req.environ['ec2.request'] = api_request
+        req.environ['ec2.action_args'] = args
+        return self.application
+
+
 class Router(wsgi.Middleware):
 
     """Add ec2.'controller', .'action', and .'action_args' to WSGI environ."""
@@ -256,10 +282,9 @@ class Authorizer(wsgi.Middleware):
     @webob.dec.wsgify
     def __call__(self, req):
         context = req.environ['ec2.context']
-        controller_name = req.environ['ec2.controller'].__class__.__name__
-        action = req.environ['ec2.action']
-        allowed_roles = self.action_roles[controller_name].get(action,
-                                                               ['none'])
+        controller = req.environ['ec2.request'].controller.__class__.__name__
+        action = req.environ['ec2.request'].action
+        allowed_roles = self.action_roles[controller].get(action, ['none'])
         if self._matches_any_role(context, allowed_roles):
             return self.application
         else:
@@ -289,11 +314,8 @@ class Executor(wsgi.Application):
     @webob.dec.wsgify
     def __call__(self, req):
         context = req.environ['ec2.context']
-        controller = req.environ['ec2.controller']
-        action = req.environ['ec2.action']
         args = req.environ['ec2.action_args']
-
-        api_request = apirequest.APIRequest(controller, action)
+        api_request = req.environ['ec2.request']
         result = None
         try:
             result = api_request.send(context, **args)
@@ -369,3 +391,8 @@ def executor_factory(global_args, **local_args):
 
 def versions_factory(global_args, **local_args):
     return Versions()
+
+def requestify_factory(global_args, **local_args):
+    def requestifier(app):
+        return Requestify(app, local_args['controller'])
+    return requestifier