x/gantt
Code Issues Proposed changes

add keystone middlewares for ec2 api

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-08-11 21:03:37 -07:00
parent b2702c3876
commit ddab1d537b
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/test_api.py
View File

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

12
nova/wsgi.py
View File

@@ -274,18 +274,6 @@ class Middleware(Application):
return self.process_response(response) 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): class Debug(Middleware):
"""Helper class for debugging a WSGI application. """Helper class for debugging a WSGI application.