From 112dd3c1b824097acf5f89cd3afa8785623e4f9e Mon Sep 17 00:00:00 2001 From: Michael Still Date: Wed, 22 Feb 2012 12:30:37 +1100 Subject: Move get_info to taking an instance. This is a first step towards using uuids in this interface instead of instance names (which are synonyms for instance ids). Change-Id: I54b32a5020b0dbc21ba7156ed38ed188c483086b --- nova/compute/manager.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index f31a0d2e4..e49d594d1 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -252,7 +252,7 @@ class ComputeManager(manager.SchedulerDependentManager): """Retrieve the power state for the given instance.""" LOG.debug(_('Checking state'), instance=instance) try: - return self.driver.get_info(instance['name'])["state"] + return self.driver.get_info(instance)["state"] except exception.NotFound: return power_state.FAILED @@ -2170,16 +2170,14 @@ class ComputeManager(manager.SchedulerDependentManager): for db_instance in db_instances: # Allow other periodic tasks to do some work... greenthread.sleep(0) - name = db_instance["name"] db_power_state = db_instance['power_state'] try: - vm_instance = self.driver.get_info(name) + vm_instance = self.driver.get_info(db_instance) vm_power_state = vm_instance.state except exception.InstanceNotFound: - msg = _("Instance %(name)s found in database but " - "not known by hypervisor. Setting power " - "state to NOSTATE") % locals() - LOG.warn(msg) + LOG.warn(_("Instance found in database but not known by " + "hypervisor. Setting power state to NOSTATE"), + locals(), instance=db_instance) vm_power_state = power_state.NOSTATE if vm_power_state == db_power_state: -- cgit