diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-19 02:02:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-19 02:02:25 +0000 |
| commit | f62eb73d3ffc4cf2117a55032cbbf96aa19d88d0 (patch) | |
| tree | f0e86c536b6cd39f0bcdaef6c74c5654c6b47787 | |
| parent | 7106ba954e8fab3d81429413003203398aebe2ac (diff) | |
| parent | 5c22794cce7a2147625bfb6486ff4308658386d6 (diff) | |
| download | nova-f62eb73d3ffc4cf2117a55032cbbf96aa19d88d0.tar.gz nova-f62eb73d3ffc4cf2117a55032cbbf96aa19d88d0.tar.xz nova-f62eb73d3ffc4cf2117a55032cbbf96aa19d88d0.zip | |
Merge "Add image to request_spec during resize"
| -rw-r--r-- | nova/compute/api.py | 3 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 5e160d2ef..e1b4bdb58 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1981,7 +1981,8 @@ class API(base.Base): request_spec = { 'instance_type': new_instance_type, 'instance_uuids': [instance['uuid']], - 'instance_properties': instance} + 'instance_properties': instance, + 'image': image} filter_properties = {'ignore_hosts': []} diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 6c58fffe0..f16ea6b5d 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -4986,6 +4986,7 @@ class ComputeAPITestCase(BaseTestCase): orig_instance_type) self.assertEqual(request_spec['instance_uuids'], [instance['uuid']]) + self.assertEqual(FAKE_IMAGE_REF, request_spec['image']['id']) self.assertEqual(instance_properties['uuid'], instance['uuid']) self.assertEqual(instance_properties['host'], 'host2') # Ensure the instance passed to us has been updated with |