summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2012-08-09 22:56:25 -0400
committerDan Prince <dprince@redhat.com>2012-08-10 09:41:10 -0400
commitacb6d78c56cfc3e9e0392d1020ce72225ff1db65 (patch)
treed6a6360fe729dcb91766fedb1b412be49226b1ac /nova/api
parent55cf5c308508435eb40f3d45bbe9b4e4e0ff3ea5 (diff)
Send host not ComputeNode into uptime RPC call.
Updates the hypervisor uptime API extension to send the correct hostname to the get_host_uptime in the compute API. Fixes LP Bug #1035315. Change-Id: I4840f16bd3c60063e08e2de8313ef5ed3510555e
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/hypervisors.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/hypervisors.py b/nova/api/openstack/compute/contrib/hypervisors.py
index 33aaa014b..2760e6c19 100644
--- a/nova/api/openstack/compute/contrib/hypervisors.py
+++ b/nova/api/openstack/compute/contrib/hypervisors.py
@@ -197,7 +197,8 @@ class HypervisorsController(object):
# Get the uptime
try:
- uptime = self.api.get_host_uptime(context, hyp)
+ host = hyp['service']['host']
+ uptime = self.api.get_host_uptime(context, host)
except NotImplementedError:
msg = _("Virt driver does not implement uptime function.")
raise webob.exc.HTTPNotImplemented(explanation=msg)