
"""Utility methods for scheduling."""

from nova.compute import flavors
from nova.openstack.common import jsonutils


def build_request_spec(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]
    request_spec = {
            'image': image,
            'instance_properties': instance,
            'instance_type': flavors.extract_flavor(instance),
            'instance_uuids': [inst['uuid'] for inst in instances]}
    return jsonutils.to_primitive(request_spec)


"""Utility methods for scheduling."""

from nova.compute import flavors
from nova import db
from nova.openstack.common import jsonutils


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': instance_type,
            'instance_uuids': [inst['uuid'] for inst in instances]}
    return jsonutils.to_primitive(request_spec)

Make sure instance_type has extra_specs
Make sure instance_type has extra_specs

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

  
  """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)
  
Make sure instance_type has extra_specs
## Code Before:

"""Utility methods for scheduling."""

from nova.compute import flavors
from nova.openstack.common import jsonutils


def build_request_spec(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]
    request_spec = {
            'image': image,
            'instance_properties': instance,
            'instance_type': flavors.extract_flavor(instance),
            'instance_uuids': [inst['uuid'] for inst in instances]}
    return jsonutils.to_primitive(request_spec)

## Instruction:
Make sure instance_type has extra_specs
## Code After:

"""Utility methods for scheduling."""

from nova.compute import flavors
from nova import db
from nova.openstack.common import jsonutils


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': instance_type,
            'instance_uuids': [inst['uuid'] for inst in instances]}
    return jsonutils.to_primitive(request_spec)
