Merge "Send a full instance in power_off_instance and stop_instance."

2 files changed, 14 insertions, 13 deletions

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 75df22f8a..82357a365 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -410,18 +410,18 @@ class ComputeTestCase(BaseTestCase):
 
     def test_stop(self):
         """Ensure instance can be stopped"""
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         instance_uuid = instance['uuid']
         self.compute.run_instance(self.context, instance_uuid)
-        self.compute.stop_instance(self.context, instance_uuid)
+        self.compute.stop_instance(self.context, instance=instance)
         self.compute.terminate_instance(self.context, instance_uuid)
 
     def test_start(self):
         """Ensure instance can be started"""
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         instance_uuid = instance['uuid']
         self.compute.run_instance(self.context, instance_uuid)
-        self.compute.stop_instance(self.context, instance_uuid)
+        self.compute.stop_instance(self.context, instance=instance)
         self.compute.start_instance(self.context, instance_uuid)
         self.compute.terminate_instance(self.context, instance_uuid)
 
@@ -480,10 +480,10 @@ class ComputeTestCase(BaseTestCase):
         self.stubs.Set(nova.virt.fake.FakeDriver, 'power_off',
                        fake_driver_power_off)
 
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         instance_uuid = instance['uuid']
         self.compute.run_instance(self.context, instance_uuid)
-        self.compute.power_off_instance(self.context, instance_uuid)
+        self.compute.power_off_instance(self.context, instance=instance)
         self.assertTrue(called['power_off'])
         self.compute.terminate_instance(self.context, instance_uuid)
 
@@ -2376,11 +2376,11 @@ class ComputeAPITestCase(BaseTestCase):
             db.instance_destroy(self.context, ref[0]['uuid'])
 
     def test_start(self):
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         instance_uuid = instance['uuid']
         self.compute.run_instance(self.context, instance_uuid)
 
-        self.compute.stop_instance(self.context, instance_uuid)
+        self.compute.stop_instance(self.context, instance=instance)
 
         instance = db.instance_get_by_uuid(self.context, instance_uuid)
         self.assertEqual(instance['task_state'], None)
diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py
index 9644ce8d8..0dcc22d1b 100644
--- a/nova/tests/compute/test_rpcapi.py
+++ b/nova/tests/compute/test_rpcapi.py
@@ -55,8 +55,9 @@ class ComputeRpcAPITestCase(test.TestCase):
             'detach_volume', 'finish_resize', 'finish_revert_resize',
             'get_console_output', 'get_diagnostics', 'get_vnc_console',
             'inject_file', 'inject_network_info', 'pause_instance',
-            'post_live_migration_at_destination', 'reboot_instance',
-            'suspend_instance', 'unpause_instance'
+            'post_live_migration_at_destination', 'power_off_instance',
+            'reboot_instance', 'stop_instance', 'suspend_instance',
+            'unpause_instance'
         ]
 
         if 'rpcapi_class' in kwargs:
@@ -214,7 +215,7 @@ class ComputeRpcAPITestCase(test.TestCase):
 
     def test_power_off_instance(self):
         self._test_compute_api('power_off_instance', 'cast',
-                instance=self.fake_instance)
+                instance=self.fake_instance, version='1.21')
 
     def test_power_on_instance(self):
         self._test_compute_api('power_on_instance', 'cast',
@@ -308,11 +309,11 @@ class ComputeRpcAPITestCase(test.TestCase):
 
     def test_stop_instance_cast(self):
         self._test_compute_api('stop_instance', 'cast',
-                instance=self.fake_instance)
+                instance=self.fake_instance, version='1.21')
 
     def test_stop_instance_call(self):
         self._test_compute_api('stop_instance', 'call',
-                instance=self.fake_instance)
+                instance=self.fake_instance, version='1.21')
 
     def test_suspend_instance(self):
         self._test_compute_api('suspend_instance', 'cast',