From 6a6fe2f6bf736583d9e2cde0733c6568877b7979 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 31 Jul 2012 15:26:31 -0400 Subject: Send a full instance in unrescue_instance. Change the unrescue_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: I9a693b347ce583aa350f4c10531b53e0f9813577 --- nova/tests/compute/test_compute.py | 12 +++++++++++- nova/tests/compute/test_rpcapi.py | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'nova/tests') 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', -- cgit