summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/hosts.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index 95a80f3f6..67fc897fb 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -98,13 +98,18 @@ def _list_hosts(req, service=None):
"""
context = req.environ['nova.context']
services = db.service_get_all(context, False)
-
+ zone = ''
+ if 'zone' in req.GET:
+ zone = req.GET['zone']
+ if zone:
+ services = [s for s in services if s['availability_zone'] == zone]
hosts = []
for host in services:
- hosts.append({"host_name": host['host'], 'service': host['topic']})
+ hosts.append({"host_name": host['host'], 'service': host['topic'],
+ 'zone': host['availability_zone']})
if service:
hosts = [host for host in hosts
- if host["service"] == service]
+ if host["service"] == service]
return hosts