From 9302771de4324ac86aad4a8ec0dfe13d4ec3a0cc Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Fri, 27 Jul 2012 16:14:00 -0400
Subject: 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
---
 nova/tests/compute/test_compute.py | 22 +++++++++++-----------
 nova/tests/compute/test_rpcapi.py  |  7 ++++---
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'nova/tests')

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',
-- 
cgit