Merge lp:~cbehrens/nova/lp821720 into lp:~hudson-openstack/nova/trunk

[Chris Behrens]

ZoneAwareScheduler classes couldn't build local instances due to an additional argument ('image') being added to compute_api.create_db_entry_for_new_instance() at some point.

With this fix, 'image' is now being passed down to the scheduler and into the above call. Updated an existing test so that it didn't stub around the above failing call.

[Rick Harris (rconradharris)]

LGTM, nice.

review: Approve

[Josh Kearney (jk0)]

LGTM

review: Approve

=== modified file 'nova/compute/api.py'
--- nova/compute/api.py	2011-08-04 16:26:14 +0000
+++ nova/compute/api.py	2011-08-05 23:51:06 +0000
@@ -360,6 +360,7 @@
                                           instance_type, zone_blob,
                                           availability_zone, injected_files,
                                           admin_password,
+                                          image,
                                           instance_id=None, num_instances=1):
         """Send the run_instance request to the schedulers for processing."""
         pid = context.project_id
@@ -373,6 +374,7 @@
 
         filter_class = 'nova.scheduler.host_filter.InstanceTypeFilter'
         request_spec = {
+            'image': image,
             'instance_properties': base_options,
             'instance_type': instance_type,
             'filter': filter_class,
@@ -415,6 +417,7 @@
                                       instance_type, zone_blob,
                                       availability_zone, injected_files,
                                       admin_password,
+                                      image,
                                       num_instances=num_instances)
 
         return base_options['reservation_id']
@@ -463,6 +466,7 @@
                                           instance_type, zone_blob,
                                           availability_zone, injected_files,
                                           admin_password,
+                                          image,
                                           instance_id=instance_id)
 
         return [dict(x.iteritems()) for x in instances]

=== modified file 'nova/scheduler/zone_aware_scheduler.py'
--- nova/scheduler/zone_aware_scheduler.py	2011-07-28 00:55:10 +0000
+++ nova/scheduler/zone_aware_scheduler.py	2011-08-05 23:51:06 +0000
@@ -58,12 +58,13 @@
         """Create the requested resource in this Zone."""
         host = build_plan_item['hostname']
         base_options = request_spec['instance_properties']
+        image = request_spec['image']
 
         # TODO(sandy): I guess someone needs to add block_device_mapping
         # support at some point? Also, OS API has no concept of security
         # groups.
         instance = compute_api.API().create_db_entry_for_new_instance(context,
-            base_options, None, [])
+            image, base_options, None, [])
 
         instance_id = instance['id']
         kwargs['instance_id'] = instance_id

=== modified file 'nova/tests/scheduler/test_zone_aware_scheduler.py'
--- nova/tests/scheduler/test_zone_aware_scheduler.py	2011-07-29 18:58:49 +0000
+++ nova/tests/scheduler/test_zone_aware_scheduler.py	2011-08-05 23:51:06 +0000
@@ -21,7 +21,9 @@
 import nova.db
 
 from nova import exception
+from nova import rpc
 from nova import test
+from nova.compute import api as compute_api
 from nova.scheduler import driver
 from nova.scheduler import zone_aware_scheduler
 from nova.scheduler import zone_manager
@@ -114,7 +116,7 @@
 
 
 def fake_decrypt_blob_returns_local_info(blob):
-    return {'foo': True}  # values aren't important.
+    return {'hostname': 'foooooo'}  # values aren't important.
 
 
 def fake_decrypt_blob_returns_child_info(blob):
@@ -283,14 +285,29 @@
         global was_called
         sched = FakeZoneAwareScheduler()
         was_called = False
+
+        def fake_create_db_entry_for_new_instance(self, context,
+                image, base_options, security_group,
+                block_device_mapping, num=1):
+            global was_called
+            was_called = True
+            # return fake instances
+            return {'id': 1, 'uuid': 'f874093c-7b17-49c0-89c3-22a5348497f9'}
+
+        def fake_rpc_cast(*args, **kwargs):
+            pass
+
         self.stubs.Set(sched, '_decrypt_blob',
                        fake_decrypt_blob_returns_local_info)
-        self.stubs.Set(sched, '_provision_resource_locally',
-                       fake_provision_resource_locally)
-
-        request_spec = {'blob': "Non-None blob data"}
-
-        sched._provision_resource_from_blob(None, request_spec, 1,
+        self.stubs.Set(compute_api.API,
+                'create_db_entry_for_new_instance',
+                fake_create_db_entry_for_new_instance)
+        self.stubs.Set(rpc, 'cast', fake_rpc_cast)
+
+        build_plan_item = {'blob': "Non-None blob data"}
+        request_spec = {'image': {}, 'instance_properties': {}}
+
+        sched._provision_resource_from_blob(None, build_plan_item, 1,
                                             request_spec, {})
         self.assertTrue(was_called)