Merge "Send a full instance via rpc for finish_resize."

2 files changed, 17 insertions, 13 deletions

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index dd8efc974..90493b977 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -1088,13 +1088,14 @@ class ComputeTestCase(BaseTestCase):
         self.stubs.Set(self.compute.driver, 'finish_migration', fake)
 
         context = self.context.elevated()
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         self.compute.prep_resize(context, instance['uuid'], 1, {},
                                  filter_properties={})
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance['uuid'], 'pre-migrating')
-        self.compute.finish_resize(context, instance['uuid'],
-                                   int(migration_ref['id']), {}, {})
+        self.compute.finish_resize(context,
+                migration_id=int(migration_ref['id']),
+                disk_info={}, image={}, instance=instance)
         self.compute.terminate_instance(self.context, instance['uuid'])
 
     def test_finish_resize_handles_error(self):
@@ -1109,15 +1110,15 @@ class ComputeTestCase(BaseTestCase):
         self.stubs.Set(self.compute.driver, 'finish_migration', throw_up)
 
         context = self.context.elevated()
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         self.compute.prep_resize(context, instance['uuid'], 1, {},
                                  filter_properties={})
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance['uuid'], 'pre-migrating')
 
         self.assertRaises(test.TestingException, self.compute.finish_resize,
-                          context, instance['uuid'],
-                          int(migration_ref['id']), {}, {})
+                          context, migration_id=int(migration_ref['id']),
+                          disk_info={}, image={}, instance=instance)
 
         instance = db.instance_get_by_uuid(context, instance['uuid'])
         self.assertEqual(instance['vm_state'], vm_states.ERROR)
@@ -1184,7 +1185,7 @@ class ComputeTestCase(BaseTestCase):
         old_time = datetime.datetime(2012, 4, 1)
         cur_time = datetime.datetime(2012, 12, 21, 12, 21)
         timeutils.set_time_override(old_time)
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         context = self.context.elevated()
         old_type_id = instance_types.get_instance_type_by_name(
                                                 'm1.tiny')['id']
@@ -1203,8 +1204,9 @@ class ComputeTestCase(BaseTestCase):
         timeutils.set_time_override(cur_time)
         test_notifier.NOTIFICATIONS = []
 
-        self.compute.finish_resize(context, instance['uuid'],
-                                   int(migration_ref['id']), {}, {})
+        self.compute.finish_resize(context,
+                migration_id=int(migration_ref['id']), disk_info={}, image={},
+                instance=instance)
 
         self.assertEquals(len(test_notifier.NOTIFICATIONS), 2)
         msg = test_notifier.NOTIFICATIONS[0]
@@ -1361,8 +1363,9 @@ class ComputeTestCase(BaseTestCase):
 
         self.compute.resize_instance(context, inst_ref['uuid'],
                 migration_ref['id'], {})
-        self.compute.finish_resize(context, inst_ref['uuid'],
-                    int(migration_ref['id']), {}, {})
+        self.compute.finish_resize(context,
+                    migration_id=int(migration_ref['id']), disk_info={},
+                    image={}, instance=jsonutils.to_primitive(inst_ref))
 
         # Prove that the instance size is now the new size
         inst_ref = db.instance_get_by_uuid(context, instance['uuid'])
diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py
index 48aa60b98..6bac3c99f 100644
--- a/nova/tests/compute/test_rpcapi.py
+++ b/nova/tests/compute/test_rpcapi.py
@@ -52,7 +52,7 @@ class ComputeRpcAPITestCase(test.TestCase):
             'add_fixed_ip_to_instance', 'attach_volume',
             'check_can_live_migrate_destination',
             'check_can_live_migrate_source', 'confirm_resize',
-            'detach_volume', 'get_console_output',
+            'detach_volume', 'finish_resize', 'get_console_output',
             'pause_instance', 'reboot_instance', 'suspend_instance',
             'unpause_instance'
         ]
@@ -161,7 +161,8 @@ class ComputeRpcAPITestCase(test.TestCase):
     def test_finish_resize(self):
         self._test_compute_api('finish_resize', 'cast',
                 instance=self.fake_instance, migration_id='id',
-                image='image', disk_info='disk_info', host='host')
+                image='image', disk_info='disk_info', host='host',
+                version='1.14')
 
     def test_finish_revert_resize(self):
         self._test_compute_api('finish_revert_resize', 'cast',