diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-27 14:54:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-27 14:54:20 +0000 |
| commit | ef5d5951d891171d385eefee7562383ef59cb6d3 (patch) | |
| tree | c7f4fc92fe835e7f6535995bb5a17d3fdbb82ef8 /nova/tests | |
| parent | bf58f027bf98fc811580c47b8d1c80bc5732f6ef (diff) | |
| parent | bc1947d2e9c21c19735a9470a498234b94b8d9c4 (diff) | |
Merge "Send a full instance in power_on_instance and start_instance."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 6 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 82357a365..54e588f92 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -422,7 +422,7 @@ class ComputeTestCase(BaseTestCase): instance_uuid = instance['uuid'] self.compute.run_instance(self.context, instance_uuid) self.compute.stop_instance(self.context, instance=instance) - self.compute.start_instance(self.context, instance_uuid) + self.compute.start_instance(self.context, instance=instance) self.compute.terminate_instance(self.context, instance_uuid) def test_rescue(self): @@ -462,10 +462,10 @@ class ComputeTestCase(BaseTestCase): self.stubs.Set(nova.virt.fake.FakeDriver, 'power_on', fake_driver_power_on) - 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_on_instance(self.context, instance_uuid) + self.compute.power_on_instance(self.context, instance=instance) self.assertTrue(called['power_on']) self.compute.terminate_instance(self.context, instance_uuid) diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index 0dcc22d1b..7f8d02871 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -56,8 +56,8 @@ class ComputeRpcAPITestCase(test.TestCase): 'get_console_output', 'get_diagnostics', 'get_vnc_console', 'inject_file', 'inject_network_info', 'pause_instance', 'post_live_migration_at_destination', 'power_off_instance', - 'reboot_instance', 'stop_instance', 'suspend_instance', - 'unpause_instance' + 'power_on_instance', 'reboot_instance', 'start_instance', + 'stop_instance', 'suspend_instance', 'unpause_instance' ] if 'rpcapi_class' in kwargs: @@ -219,7 +219,7 @@ class ComputeRpcAPITestCase(test.TestCase): def test_power_on_instance(self): self._test_compute_api('power_on_instance', 'cast', - instance=self.fake_instance) + instance=self.fake_instance, version='1.22') def test_pre_live_migration(self): self._test_compute_api('pre_live_migration', 'call', @@ -305,7 +305,7 @@ class ComputeRpcAPITestCase(test.TestCase): def test_start_instance(self): self._test_compute_api('start_instance', 'cast', - instance=self.fake_instance) + instance=self.fake_instance, version='1.22') def test_stop_instance_cast(self): self._test_compute_api('stop_instance', 'cast', |