Send a full instance in resize_instance.

Change the resize_instance method of the compute
rpc API to take a full instance over rpc instead of just
the instance UUID.  This cuts down on database access needed
by nova-compute.

Part of blueprint no-db-messaging.

Change-Id: I5ed8707b2d018559ab4e983f8528dac8377783c7

4 files changed, 35 insertions, 30 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index e56d0c0c4..9ce1e1c47 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -272,7 +272,7 @@ def _get_image_meta(context, image_ref):
 class ComputeManager(manager.SchedulerDependentManager):
     """Manages the running instances from creation to destruction."""
 
-    RPC_API_VERSION = '1.28'
+    RPC_API_VERSION = '1.29'
 
     def __init__(self, compute_driver=None, *args, **kwargs):
         """Load configuration options and connect to the hypervisor."""
@@ -1532,53 +1532,55 @@ class ComputeManager(manager.SchedulerDependentManager):
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     @checks_instance_lock
     @wrap_instance_fault
-    def resize_instance(self, context, instance_uuid, migration_id, image):
+    def resize_instance(self, context, migration_id, image, instance=None,
+                        instance_uuid=None):
         """Starts the migration of a running instance to another host."""
         migration_ref = self.db.migration_get(context, migration_id)
-        instance_ref = self.db.instance_get_by_uuid(context,
-                migration_ref.instance_uuid)
+        if not instance:
+            instance = self.db.instance_get_by_uuid(context,
+                    migration_ref.instance_uuid)
         instance_type_ref = self.db.instance_type_get(context,
                 migration_ref.new_instance_type_id)
 
         try:
-            network_info = self._get_instance_nw_info(context, instance_ref)
+            network_info = self._get_instance_nw_info(context, instance)
         except Exception, error:
             with excutils.save_and_reraise_exception():
                 msg = _('%s. Setting instance vm_state to ERROR')
                 LOG.error(msg % error)
-                self._set_instance_error_state(context, instance_uuid)
+                self._set_instance_error_state(context, instance['uuid'])
 
         self.db.migration_update(context,
                                  migration_id,
                                  {'status': 'migrating'})
 
-        self._instance_update(context, instance_uuid,
+        self._instance_update(context, instance['uuid'],
                               task_state=task_states.RESIZE_MIGRATING)
 
         self._notify_about_instance_usage(
-            context, instance_ref, "resize.start", network_info=network_info)
+            context, instance, "resize.start", network_info=network_info)
 
         try:
             disk_info = self.driver.migrate_disk_and_power_off(
-                    context, instance_ref, migration_ref['dest_host'],
+                    context, instance, migration_ref['dest_host'],
                     instance_type_ref, self._legacy_nw_info(network_info))
         except Exception, error:
             with excutils.save_and_reraise_exception():
                 LOG.error(_('%s. Setting instance vm_state to ERROR') % error,
-                          instance=instance_ref)
-                self._set_instance_error_state(context, instance_uuid)
+                          instance=instance)
+                self._set_instance_error_state(context, instance['uuid'])
 
         self.db.migration_update(context,
                                  migration_id,
                                  {'status': 'post-migrating'})
 
-        self._instance_update(context, instance_uuid,
+        self._instance_update(context, instance['uuid'],
                               task_state=task_states.RESIZE_MIGRATED)
 
-        self.compute_rpcapi.finish_resize(context, instance_ref, migration_id,
+        self.compute_rpcapi.finish_resize(context, instance, migration_id,
                 image, disk_info, migration_ref['dest_compute'])
 
-        self._notify_about_instance_usage(context, instance_ref, "resize.end",
+        self._notify_about_instance_usage(context, instance, "resize.end",
                                           network_info=network_info)
 
     def _finish_resize(self, context, instance, migration_ref, disk_info,
diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py
index f10efc19a..4b982b6fb 100644
--- a/nova/compute/rpcapi.py
+++ b/nova/compute/rpcapi.py
@@ -99,6 +99,7 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy):
         1.27 - Remove instance_uuid, add instance argument to
                rescue_instance()
         1.28 - Remove instance_uuid, add instance argument to reset_network()
+        1.29 - Remove instance_uuid, add instance argument to resize_instance()
     '''
 
     BASE_RPC_API_VERSION = '1.0'
@@ -363,9 +364,10 @@ class ComputeAPI(nova.openstack.common.rpc.proxy.RpcProxy):
 
     def resize_instance(self, ctxt, instance, migration_id, image):
         topic = _compute_topic(self.topic, ctxt, None, instance)
+        instance_p = jsonutils.to_primitive(instance)
         self.cast(ctxt, self.make_msg('resize_instance',
-                instance_uuid=instance['uuid'], migration_id=migration_id,
-                image=image), topic)
+                instance=instance_p, migration_id=migration_id,
+                image=image), topic, version='1.29')
 
     def resume_instance(self, ctxt, instance):
         self.cast(ctxt, self.make_msg('resume_instance',
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index a6da5439c..831763f13 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -1206,8 +1206,8 @@ class ComputeTestCase(BaseTestCase):
         migration_ref = db.migration_get_by_instance_and_status(context,
                                                 instance['uuid'],
                                                 'pre-migrating')
-        self.compute.resize_instance(context, instance['uuid'],
-                                     migration_ref['id'], {})
+        self.compute.resize_instance(context, migration_ref['id'], {},
+                                     instance=instance)
         timeutils.set_time_override(cur_time)
         test_notifier.NOTIFICATIONS = []
 
@@ -1304,7 +1304,7 @@ class ComputeTestCase(BaseTestCase):
         self.stubs.Set(self.compute.driver, 'migrate_disk_and_power_off',
                        throw_up)
 
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         context = self.context.elevated()
 
         self.compute.run_instance(self.context, instance['uuid'])
@@ -1316,7 +1316,7 @@ class ComputeTestCase(BaseTestCase):
 
         #verify
         self.assertRaises(test.TestingException, self.compute.resize_instance,
-                          context, instance['uuid'], migration_ref['id'], {})
+                          context, migration_ref['id'], {}, instance=instance)
         instance = db.instance_get_by_uuid(context, instance['uuid'])
         self.assertEqual(instance['vm_state'], vm_states.ERROR)
 
@@ -1324,7 +1324,7 @@ class ComputeTestCase(BaseTestCase):
 
     def test_resize_instance(self):
         """Ensure instance can be migrated/resized"""
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         context = self.context.elevated()
 
         self.compute.run_instance(self.context, instance['uuid'])
@@ -1334,8 +1334,8 @@ class ComputeTestCase(BaseTestCase):
                                  filter_properties={})
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance['uuid'], 'pre-migrating')
-        self.compute.resize_instance(context, instance['uuid'],
-                migration_ref['id'], {})
+        self.compute.resize_instance(context, migration_ref['id'], {},
+                                     instance=instance)
         self.compute.terminate_instance(context, instance['uuid'])
 
     def test_finish_revert_resize(self):
@@ -1368,8 +1368,8 @@ class ComputeTestCase(BaseTestCase):
         migration_ref = db.migration_get_by_instance_and_status(context,
                 inst_ref['uuid'], 'pre-migrating')
 
-        self.compute.resize_instance(context, inst_ref['uuid'],
-                migration_ref['id'], {})
+        self.compute.resize_instance(context, migration_ref['id'], {},
+                instance=jsonutils.to_primitive(inst_ref))
         self.compute.finish_resize(context,
                     migration_id=int(migration_ref['id']), disk_info={},
                     image={}, instance=jsonutils.to_primitive(inst_ref))
@@ -1421,7 +1421,7 @@ class ComputeTestCase(BaseTestCase):
                 'migrate_disk_and_power_off',
                 raise_migration_failure)
 
-        inst_ref = self._create_fake_instance()
+        inst_ref = jsonutils.to_primitive(self._create_fake_instance())
         context = self.context.elevated()
 
         self.compute.run_instance(self.context, inst_ref['uuid'])
@@ -1431,7 +1431,7 @@ class ComputeTestCase(BaseTestCase):
         migration_ref = db.migration_get_by_instance_and_status(context,
                 inst_ref['uuid'], 'pre-migrating')
         self.assertRaises(test.TestingException, self.compute.resize_instance,
-                          context, inst_ref['uuid'], migration_ref['id'], {})
+                          context, migration_ref['id'], {}, instance=inst_ref)
         inst_ref = db.instance_get_by_uuid(context, inst_ref['uuid'])
         self.assertEqual(inst_ref['vm_state'], vm_states.ERROR)
         self.compute.terminate_instance(context, inst_ref['uuid'])
diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py
index 0ab62d76a..8defc7608 100644
--- a/nova/tests/compute/test_rpcapi.py
+++ b/nova/tests/compute/test_rpcapi.py
@@ -59,8 +59,8 @@ class ComputeRpcAPITestCase(test.TestCase):
             'power_on_instance', 'pre_live_migration', 'reboot_instance',
             'rebuild_instance', 'remove_fixed_ip_from_instance',
             'remove_volume_connection', 'rescue_instance', 'reset_network',
-            'start_instance', 'stop_instance', 'suspend_instance',
-            'unpause_instance'
+            'resize_instance', 'start_instance', 'stop_instance',
+            'suspend_instance', 'unpause_instance'
         ]
 
         if 'rpcapi_class' in kwargs:
@@ -276,7 +276,8 @@ class ComputeRpcAPITestCase(test.TestCase):
 
     def test_resize_instance(self):
         self._test_compute_api('resize_instance', 'cast',
-                instance=self.fake_instance, migration_id='id', image='image')
+                instance=self.fake_instance, migration_id='id', image='image',
+                version='1.29')
 
     def test_resume_instance(self):
         self._test_compute_api('resume_instance', 'cast',