From d9d744ff16e4d4443d6ed732be6041b1e8a1747a Mon Sep 17 00:00:00 2001 From: Naveed Massjouni Date: Wed, 23 Nov 2011 14:30:47 -0500 Subject: [PATCH] Updating set_admin_password in compute.api and compute.manager to use instance uuids instead of instance ids. Blueprint internal-uuids Change-Id: I4c06df9a7148f5223b2925272201c1bc67e4811d --- nova/tests/test_compute.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 20db94f4..36552722 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -300,7 +300,9 @@ class ComputeTestCase(BaseTestCase): def test_set_admin_password(self): """Ensure instance can have its admin password set""" - 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) db.instance_update(self.context, instance_id, {'task_state': task_states.UPDATING_PASSWORD}) @@ -309,7 +311,7 @@ class ComputeTestCase(BaseTestCase): self.assertEqual(inst_ref['vm_state'], vm_states.ACTIVE) self.assertEqual(inst_ref['task_state'], task_states.UPDATING_PASSWORD) - self.compute.set_admin_password(self.context, instance_id) + self.compute.set_admin_password(self.context, instance_uuid) inst_ref = db.instance_get(self.context, instance_id) self.assertEqual(inst_ref['vm_state'], vm_states.ACTIVE)