From 231f40af80c69f80aec4922f1261f4fdf5365a3c Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 10 Nov 2011 16:34:50 -0500 Subject: Converting set password to use instance objects Related to blueprint internal-uuids Change-Id: Ifd229c7b9a9b69040a04289d4a98385fc946c734 --- nova/tests/api/openstack/test_server_actions.py | 4 ++-- nova/tests/test_compute.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/test_server_actions.py b/nova/tests/api/openstack/test_server_actions.py index df0bfd968..9d50483b8 100644 --- a/nova/tests/api/openstack/test_server_actions.py +++ b/nova/tests/api/openstack/test_server_actions.py @@ -122,8 +122,8 @@ class MockSetAdminPassword(object): self.instance_id = None self.password = None - def __call__(self, context, instance_id, password): - self.instance_id = instance_id + def __call__(self, context, instance, password): + self.instance_id = instance['uuid'] self.password = password diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py index 0e8d53751..8fd70187f 100644 --- a/nova/tests/test_compute.py +++ b/nova/tests/test_compute.py @@ -1180,7 +1180,7 @@ class ComputeAPITestCase(BaseTestCase): self.assertEqual(inst_ref['vm_state'], vm_states.ACTIVE) self.assertEqual(inst_ref['task_state'], None) - self.compute_api.set_admin_password(self.context, instance_id) + self.compute_api.set_admin_password(self.context, inst_ref) inst_ref = db.instance_get(self.context, instance_id) self.assertEqual(inst_ref['vm_state'], vm_states.ACTIVE) -- cgit