Merge "Use instance project/user when creating RequestSpec during resize reschedule" into stable/pike
This commit is contained in:
commit
20ccd3c94e
|
@ -298,7 +298,8 @@ class ComputeTaskManager(base.Base):
|
|||
request_spec = objects.RequestSpec.from_components(
|
||||
context, instance.uuid, image,
|
||||
flavor, instance.numa_topology, instance.pci_requests,
|
||||
filter_properties, None, instance.availability_zone)
|
||||
filter_properties, None, instance.availability_zone,
|
||||
project_id=instance.project_id)
|
||||
else:
|
||||
# NOTE(sbauza): Resizes means new flavor, so we need to update the
|
||||
# original RequestSpec object for make sure the scheduler verifies
|
||||
|
|
|
@ -2288,6 +2288,7 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
|
|||
instance_type_id=flavor['id'],
|
||||
system_metadata={},
|
||||
uuid=uuids.instance,
|
||||
project_id=fakes.FAKE_PROJECT_ID,
|
||||
user_id=fakes.FAKE_USER_ID,
|
||||
flavor=flavor,
|
||||
numa_topology=None,
|
||||
|
@ -2311,6 +2312,10 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
|
|||
set_vm_mock.assert_called_once_with(self.context, inst_obj.uuid,
|
||||
'migrate_server', updates,
|
||||
exception, legacy_request_spec)
|
||||
spec_fc_mock.assert_called_once_with(
|
||||
self.context, inst_obj.uuid, image, flavor, inst_obj.numa_topology,
|
||||
inst_obj.pci_requests, {}, None, inst_obj.availability_zone,
|
||||
project_id=inst_obj.project_id)
|
||||
|
||||
@mock.patch.object(objects.InstanceMapping, 'get_by_instance_uuid')
|
||||
@mock.patch.object(scheduler_utils, 'setup_instance_group')
|
||||
|
|
Loading…
Reference in New Issue