x/gantt
Code Issues Proposed changes

Merged trunk.

Browse Source
This commit is contained in:
Brian Lamar
2011-08-19 18:36:09 -04:00
parent a2bbdf7845 a29fbce672
commit 32d543175e
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/scheduler/abstract_scheduler.py
View File

@@ -62,12 +62,13 @@ class AbstractScheduler(driver.Scheduler):
host = build_plan_item['hostname'] host = build_plan_item['hostname']
base_options = request_spec['instance_properties'] base_options = request_spec['instance_properties']
image = request_spec['image'] image = request_spec['image']
instance_type = request_spec.get('instance_type')
# TODO(sandy): I guess someone needs to add block_device_mapping # TODO(sandy): I guess someone needs to add block_device_mapping
# support at some point? Also, OS API has no concept of security # support at some point? Also, OS API has no concept of security
# groups. # groups.
instance = compute_api.API().create_db_entry_for_new_instance(context, instance = compute_api.API().create_db_entry_for_new_instance(context,
image, base_options, None, []) instance_type, image, base_options, None, [])
instance_id = instance['id'] instance_id = instance['id']
kwargs['instance_id'] = instance_id kwargs['instance_id'] = instance_id

4
nova/scheduler/host_filter.py
View File

@@ -58,8 +58,6 @@ def choose_host_filter(filter_name=None):
if not filter_name: if not filter_name:
filter_name = FLAGS.default_host_filter filter_name = FLAGS.default_host_filter
for filter_class in _get_filters(): for filter_class in _get_filters():
host_match = "%s.%s" % (filter_class.__module__, filter_class.__name__) if filter_class.__name__ == filter_name:
if (host_match.startswith("nova.scheduler.filters") and
(host_match.split(".")[-1] == filter_name)):
return filter_class() return filter_class()
raise exception.SchedulerHostFilterNotFound(filter_name=filter_name) raise exception.SchedulerHostFilterNotFound(filter_name=filter_name)

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

@@ -271,18 +271,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.