Merge "Use uuids for compute manager agent update."

1 files changed, 4 insertions, 5 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 1ca2b3d7e..04503dd56 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -921,17 +921,16 @@ class ComputeManager(manager.SchedulerDependentManager):
         self.driver.inject_file(instance_ref, path, file_contents)
 
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
-    @checks_instance_lock
-    def agent_update(self, context, instance_id, url, md5hash):
+    @checks_instance_lock_uuid
+    def agent_update(self, context, instance_uuid, url, md5hash):
         """Update agent running on an instance on this host."""
         context = context.elevated()
-        instance_ref = self.db.instance_get(context, instance_id)
-        instance_id = instance_ref['id']
+        instance_ref = self.db.instance_get_by_uuid(context, instance_uuid)
         instance_state = instance_ref['power_state']
         expected_state = power_state.RUNNING
         if instance_state != expected_state:
             LOG.warn(_('trying to update agent on a non-running '
-                    'instance: %(instance_id)s (state: %(instance_state)s '
+                    'instance: %(instance_uuid)s (state: %(instance_state)s '
                     'expected: %(expected_state)s)') % locals())
         nm = instance_ref['name']
         msg = _('instance %(nm)s: updating agent to %(url)s') % locals()