add keystone middlewares for ec2 api

nova/tests/test_api.py

@@ -32,6 +32,7 @@ from nova import context
 from nova import exception
 from nova import test
 from nova import wsgi
+from nova.api import auth
 from nova.api import ec2
 from nova.api.ec2 import apirequest
 from nova.api.ec2 import cloud
@@ -199,7 +200,7 @@ class ApiEc2TestCase(test.TestCase):
         # NOTE(vish): skipping the Authorizer
         roles = ['sysadmin', 'netadmin']
         ctxt = context.RequestContext('fake', 'fake', roles=roles)
-        self.app = wsgi.InjectContext(ctxt,
+        self.app = auth.InjectContext(ctxt,
                 ec2.Requestify(ec2.Authorizer(ec2.Executor()),
                                'nova.api.ec2.cloud.CloudController'))
 

nova/wsgi.py

@@ -274,18 +274,6 @@ class Middleware(Application):
         return self.process_response(response)
 
 
-class InjectContext(Middleware):
-    """Add a 'nova.context' to WSGI environ."""
-    def __init__(self, context, *args, **kwargs):
-        self.context = context
-        super(InjectContext, self).__init__(*args, **kwargs)
-
-    @webob.dec.wsgify(RequestClass=Request)
-    def __call__(self, req):
-        req.environ['nova.context'] = self.context
-        return self.application
-
-
 class Debug(Middleware):
     """Helper class for debugging a WSGI application.