From da003c175a8211d6070fa9b171e67c4cf012e9cc Mon Sep 17 00:00:00 2001 From: Alex Meade Date: Wed, 23 Nov 2011 11:43:30 -0500 Subject: power_on/power_off in compute manager to use uuids Related to blueprint internal-uuids. Changes power_on and power_off of instances to use uuids. Also, fixes a test for get_actions to be more accurate. Later a migration will need to be written for instance_get_actions to use uuids instead of ids. Change-Id: Id0896f4bf3f0c64a77ac9c421bad702073f2fc50 --- nova/tests/test_compute.py | 58 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index f03665d57..47f2fb83d 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -277,6 +277,44 @@ class ComputeTestCase(BaseTestCase): self.assertTrue(called['unrescued']) self.compute.terminate_instance(self.context, instance_id) + def test_power_on(self): + """Ensure instance can be powered on""" + + called = {'power_on': False} + + def fake_driver_power_on(self, instance): + called['power_on'] = True + + self.stubs.Set(nova.virt.driver.ComputeDriver, 'power_on', + fake_driver_power_on) + + instance = self._create_fake_instance() + instance_id = instance['id'] + instance_uuid = instance['uuid'] + self.compute.run_instance(self.context, instance_id) + self.compute.power_on_instance(self.context, instance_uuid) + self.assertTrue(called['power_on']) + self.compute.terminate_instance(self.context, instance_id) + + def test_power_off(self): + """Ensure instance can be powered off""" + + called = {'power_off': False} + + def fake_driver_power_off(self, instance): + called['power_off'] = True + + self.stubs.Set(nova.virt.driver.ComputeDriver, 'power_off', + fake_driver_power_off) + + instance = self._create_fake_instance() + instance_id = instance['id'] + instance_uuid = instance['uuid'] + self.compute.run_instance(self.context, instance_id) + self.compute.power_off_instance(self.context, instance_uuid) + self.assertTrue(called['power_off']) + self.compute.terminate_instance(self.context, instance_id) + def test_pause(self): """Ensure instance can be paused and unpaused""" instance = self._create_fake_instance() @@ -2266,10 +2304,24 @@ class ComputeAPITestCase(BaseTestCase): self.compute_api.delete(self.context, instance) def test_get_actions(self): + + expected = [{'id': 1, + 'instance_id': 5, + 'action': 'rebuild', + 'error': '', + }] + + def fake_get_actions(context, instance): + return expected + + self.stubs.Set(nova.db, 'instance_get_actions', + fake_get_actions) + + instance = self._create_fake_instance() context = self.context.elevated() - instance_id = self._create_instance() - instance = self.compute_api.get(self.context, instance_id) - self.compute_api.get_actions(context, instance) + actual = self.compute_api.get_actions(context, instance) + self.assertEqual(expected, actual) + self.compute_api.delete(self.context, instance) def test_inject_file(self): -- cgit