x/python-ganttclient
Code Issues Proposed changes

Merge "Updating set_admin_password in compute.api and compute.manager to use instance uuids instead of instance ids. Blueprint internal-uuids"

Browse Source
This commit is contained in:
Jenkins
2011-11-25 20:37:50 +00:00
committed by Gerrit Code Review
parent d547a7daa8 d9d744ff16
commit 6c7b8f1341
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/test_compute.py
View File

@@ -300,7 +300,9 @@ class ComputeTestCase(BaseTestCase):
def test_set_admin_password(self): def test_set_admin_password(self):
"""Ensure instance can have its admin password set""" """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) self.compute.run_instance(self.context, instance_id)
db.instance_update(self.context, instance_id, db.instance_update(self.context, instance_id,
{'task_state': task_states.UPDATING_PASSWORD}) {'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['vm_state'], vm_states.ACTIVE)
self.assertEqual(inst_ref['task_state'], task_states.UPDATING_PASSWORD) 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) inst_ref = db.instance_get(self.context, instance_id)
self.assertEqual(inst_ref['vm_state'], vm_states.ACTIVE) self.assertEqual(inst_ref['vm_state'], vm_states.ACTIVE)