Numa filter fails to get instance_properties

[Przemyslaw Czesnowicz]

NUMATopologyFilter tries to get instance_properties from filter_properties. But in fact instance_properties are in another dictionary (request_spec) that is embedded in filter_properties.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/121887

[Nikola Đipanov (ndipanov)]

Hmmm not sure this is correct... See:

https://github.com/openstack/nova/blob/b00da8421c0f69f782cf92eba31c4a91c2199d96/nova/scheduler/filter_scheduler.py#L250

(current master)

[Przemyslaw Czesnowicz (pczesno)]

I think this actually shows that we need this change.
I checked and there is no instance_properties key in filter_properties

(Pdb) print filter_properties
{u'instance_type': {u'root_gb': 0, u'name': u'nano_numa', u'ephemeral_gb': 0, u'memory_mb': 64, u'vcpus': 1, u'extra_specs': {u'hw:numa_nodes': u'1'}, u'swap': 0, u'rxtx_factor': 1.0, u'flavorid': u'22', u'vcpu_weight': None, u'id': 9}, 'config_options': {}, u'retry': {u'num_attempts': 1, u'hosts': []}, 'context': <nova.context.RequestContext object at 0x4797b50>, 'request_spec': {u'instance_properties': {u'vm_state': u'building', u'availability_zone': u'nova', u'terminated_at': None, u'ephemeral_gb': 0, u'instance_type_id': 9, u'user_data': None, u'numa_topology': {u'instance_uuid': u'6e96284c-bd92-45fb-897e-ba8e45148e9a', u'cells': [{u'cpuset': [0], u'id': 0, u'memory': 64}], u'id': 2}, u'cleaned': False, u'vm_mode': None, u'deleted_at': None, u'reservation_id': u'r-j3lwkmdn', u'id': 2, u'security_groups': [], u'disable_terminate': False, u'display_name': u'mnmn', u'uuid': u'6e96284c-bd92-45fb-897e-ba8e45148e9a', u'default_swap_device': None, u'info_cache': {u'instance_uuid': u'6e96284c-bd92-45fb-897e-ba8e45148e9a', u'deleted': False, u'network_info': [], u'created_at': u'2014-09-16T15:16:13.000000', u'deleted_at': None, u'updated_at': None}, u'hostname': u'mnmn', u'launched_on': None, u'display_description': u'mnmn', u'key_data': None, u'kernel_id': u'116fe9f1-d3f0-4a18-8e1e-522c0ce15ffc', u'power_state': 0, u'default_ephemeral_device': None, u'progress': 0, u'project_id': u'0c8059d6d0d248599db4238a28335e97', u'launched_at': None, u'scheduled_at': None, u'node': None, u'ramdisk_id': u'9637b8a6-0414-4819-927e-04fe9f98981f', u'access_ip_v6': None, u'access_ip_v4': None, u'deleted': False, u'key_name': None, u'updated_at': None, u'host': None, u'ephemeral_key_uuid': None, u'architecture': None, u'user_id': u'8348954965c54882b6ff07e3fc51e5f6', u'system_metadata': {u'image_kernel_id': u'116fe9f1-d3f0-4a18-8e1e-522c0ce15ffc', u'instance_type_vcpu_weight': None, u'instance_type_root_gb': u'0', u'instance_type_name': u'nano_numa', u'image_ramdisk_id': u'9637b8a6-0414-4819-927e-04fe9f98981f', u'instance_type_id': u'9', u'instance_type_rxtx_factor': u'1.0', u'instance_type_vcpus': u'1', u'image_min_ram': u'0', u'image_disk_format': u'ami', u'instance_type_memory_mb': u'64', u'instance_type_swap': u'0', u'instance_type_ephemeral_gb': u'0', u'instance_type_flavorid': u'22', u'image_container_format': u'ami', u'image_min_disk': u'0', u'image_base_image_ref': u'0ccb2a4b-16d8-46a6-b30d-69d9e362814e'}, u'task_state': u'scheduling', u'shutdown_terminate': False, u'cell_name': None, u'root_gb': 0, u'locked': False, u'name': u'instance-00000002', u'created_at': u'2014-09-16T15:16:13.000000', u'locked_by': None, u'launch_index': 0, u'metadata': {}, u'memory_mb': 64, u'vcpus': 1, u'image_ref': u'0ccb2a4b-16d8-46a6-b30d-69d9e362814e', u'root_device_name': None, u'auto_disk_config': True, u'os_type': None, u'config_drive': u''}, u'instance_type': {u'root_gb': 0, u'name': u'nano_numa', u'ephemeral_gb': 0, u'memory_mb': 64, u'vcpus': 1, u'extra_specs': {u'hw:numa_nodes': u'1'}, u'swap': 0, u'rxtx_factor': 1.0...

[Nikola Đipanov (ndipanov)]

Yep - I was wrong. The proposed fix is correct.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/121887
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=e517c884eff3c2bb1255dc2bf8e52fd655b1ea1a
Submitter: Jenkins
Branch: master

commit e517c884eff3c2bb1255dc2bf8e52fd655b1ea1a
Author: Przemyslaw Czesnowicz <email address hidden>
Date: Tue Sep 16 15:53:38 2014 +0100

    Get instance_properties from request_spec

    In NUMATopologyFilter instance_properties should
    be retrived from request_spec which is embedded in
    filter_properties and not from filter_properties
    directly

    Closes-bug: #1370068

    Change-Id: If8f9464c6eb5451d0e21ddd14b072be3d2946c50