From 5c22794cce7a2147625bfb6486ff4308658386d6 Mon Sep 17 00:00:00 2001
From: Hans Lindgren <hanlind@kth.se>
Date: Fri, 15 Feb 2013 14:43:41 +0100
Subject: Add image to request_spec during resize

Image is needed by ImagePropertiesFilter during scheduling.

Resolves bug 1117882.

Change-Id: Icfbba85e2fdeb609d5fdabb6a7c3167505fe23b0
---
 nova/compute/api.py                | 3 ++-
 nova/tests/compute/test_compute.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 658673e50..26a26efb4 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 5afaa8e3c..db3297090 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -4845,6 +4845,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
-- 
cgit