diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-31 22:41:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-31 22:41:51 +0000 |
| commit | b85641e1bc8d5dd6472d1ba4d450b7babe516a49 (patch) | |
| tree | 89c43bdd3a53015cd1c0a40a8339fa189dead61c /nova/tests | |
| parent | 4270a5ca49f014b735c2579845bbf93499135412 (diff) | |
| parent | 6a6fe2f6bf736583d9e2cde0733c6568877b7979 (diff) | |
Merge "Send a full instance in unrescue_instance."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 12 | ||||
| -rw-r--r-- | nova/tests/compute/test_rpcapi.py | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 46f06e7b3..d8bf703ea 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -444,10 +444,20 @@ class ComputeTestCase(BaseTestCase): instance = jsonutils.to_primitive(self._create_fake_instance()) instance_uuid = instance['uuid'] self.compute.run_instance(self.context, instance_uuid) + + # Make sure these methods work with both instance and instance_uuid + self.compute.rescue_instance(self.context, instance=instance) self.assertTrue(called['rescued']) - self.compute.unrescue_instance(self.context, instance_uuid) + self.compute.unrescue_instance(self.context, instance=instance) + self.assertTrue(called['unrescued']) + + self.compute.rescue_instance(self.context, instance_uuid=instance_uuid) + self.assertTrue(called['rescued']) + self.compute.unrescue_instance(self.context, + instance_uuid=instance_uuid) self.assertTrue(called['unrescued']) + self.compute.terminate_instance(self.context, instance_uuid) def test_power_on(self): diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py index cafd7fd55..3c9806b57 100644 --- a/nova/tests/compute/test_rpcapi.py +++ b/nova/tests/compute/test_rpcapi.py @@ -62,7 +62,7 @@ class ComputeRpcAPITestCase(test.TestCase): 'resize_instance', 'resume_instance', 'revert_resize', 'rollback_live_migration_at_destination', 'set_admin_password', 'snapshot_instance', 'start_instance', 'stop_instance', - 'suspend_instance', 'unpause_instance' + 'suspend_instance', 'unpause_instance', 'unrescue_instance' ] if 'rpcapi_class' in kwargs: @@ -336,7 +336,7 @@ class ComputeRpcAPITestCase(test.TestCase): def test_unrescue_instance(self): self._test_compute_api('unrescue_instance', 'cast', - instance=self.fake_instance) + instance=self.fake_instance, version='1.35') def test_change_instance_metadata(self): self._test_compute_api('change_instance_metadata', 'cast', |