x/gantt
Code Issues Proposed changes

Make sure instance_type has extra_specs

Browse Source 
Make sure that when scheduling, the instance_type used in filters
contains the 'extra_specs'.  This is a bit ugly, but will get cleaned up
with objects.

Fixes bug 1192331

Change-Id: I3614f3a858840c9561b4e618fc30f3d3ae5ac689
This commit is contained in:
Chris Behrens
2013-06-18 21:13:01 +00:00
committed by Dan Smith
parent be6872ba40
commit 4c12b10053
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nova/scheduler/utils.py
View File

@@ -15,19 +15,26 @@
"""Utility methods for scheduling."""
from nova.compute import flavors
from nova import db
from nova.openstack.common import jsonutils
def build_request_spec(image, instances):
def build_request_spec(ctxt, image, instances):
"""Build a request_spec for the scheduler.
The request_spec assumes that all instances to be scheduled are the same
type.
"""
instance = instances[0]
instance_type = flavors.extract_flavor(instance)
# NOTE(comstud): This is a bit ugly, but will get cleaned up when
# we're passing an InstanceType internal object.
extra_specs = db.instance_type_extra_specs_get(ctxt,
instance_type['flavorid'])
instance_type['extra_specs'] = extra_specs
request_spec = {
'image': image,
'instance_properties': instance,
'instance_type': flavors.extract_flavor(instance),
'instance_type': instance_type,
'instance_uuids': [inst['uuid'] for inst in instances]}
return jsonutils.to_primitive(request_spec)