summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-11-22 17:24:30 -0500
committerMark Washenberger <mark.washenberger@rackspace.com>2011-11-28 15:33:58 -0500
commitfc8d1339eef1a51269a099cc69ba059976b1f85e (patch)
treebbc1c89cc0a9fc5f0d2a93035145b84967e5ac9e /nova/tests
parentbc1f16b4f3384ddae13098a466a2a1d921bd0b79 (diff)
start/stop in compute manager to use uuids
Related to blueprint internal-uuids. Changes stop_instance and start_instance in compute manager to expect uuids. Change-Id: Ic7bdd694a4ecfb64abf5cc40a290a2a2a42465f0
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_compute.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 8b1507a56..733ee2def 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -233,17 +233,21 @@ class ComputeTestCase(BaseTestCase):
def test_stop(self):
"""Ensure instance can be stopped"""
- instance_id = self._create_instance()
+ instance = self._create_fake_instance()
+ instance_id = instance['id']
+ instance_uuid = instance['uuid']
self.compute.run_instance(self.context, instance_id)
- self.compute.stop_instance(self.context, instance_id)
+ self.compute.stop_instance(self.context, instance_uuid)
self.compute.terminate_instance(self.context, instance_id)
def test_start(self):
"""Ensure instance can be started"""
- instance_id = self._create_instance()
+ instance = self._create_fake_instance()
+ instance_id = instance['id']
+ instance_uuid = instance['uuid']
self.compute.run_instance(self.context, instance_id)
- self.compute.stop_instance(self.context, instance_id)
- self.compute.start_instance(self.context, instance_id)
+ self.compute.stop_instance(self.context, instance_uuid)
+ self.compute.start_instance(self.context, instance_uuid)
self.compute.terminate_instance(self.context, instance_id)
def test_rescue(self):