From c5097ab6682ee1b3021bb628e5083108e3b368d0 Mon Sep 17 00:00:00 2001
From: Fei Long Wang <flwang@cn.ibm.com>
Date: Sun, 24 Mar 2013 12:36:47 +0800
Subject: Fixes Nova API /os-hosts missing element "zone"

Now the HostIndexTemplate of Nova /os-hosts API is missing element "zone",
which will cause the XML output of list hosts missing the zone attribute.

Fixes bug: 1159055

Change-Id: I9940efcfd364c35b00cde4398d531d7ff56dc2b9
---
 doc/api_samples/os-hosts/hosts-list-resp.xml               | 14 +++++++-------
 nova/api/openstack/compute/contrib/hosts.py                |  1 +
 nova/tests/api/openstack/compute/contrib/test_hosts.py     |  2 ++
 .../api_samples/os-hosts/hosts-list-resp.xml.tpl           | 12 ++++++------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/doc/api_samples/os-hosts/hosts-list-resp.xml b/doc/api_samples/os-hosts/hosts-list-resp.xml
index 9a99c577a..1ba444328 100644
--- a/doc/api_samples/os-hosts/hosts-list-resp.xml
+++ b/doc/api_samples/os-hosts/hosts-list-resp.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <hosts>
-  <host host_name="461697a871354212908d82bbb0f9f5ee" service="compute"/>
-  <host host_name="272ab5d262994ebdaf228935c8ecf57e" service="cert"/>
-  <host host_name="2d1bdd671b5d41fd89dec74be5770c63" service="network"/>
-  <host host_name="7c2dd5ecb7494dd1bf4240b7f7f9bf3a" service="scheduler"/>
-  <host host_name="f9c273d8e03141a2a01def0ad18e5be4" service="conductor"/>
-  <host host_name="2b893569cd824b979bd80a2c94570a1f" service="cells"/>
-</hosts>
+  <host zone="internal" host_name="02ff30050a0d4ce486e60e946a97d28f" service="conductor"/>
+  <host zone="nova" host_name="69dd365b9eae459883a50d1fe7b3c40b" service="compute"/>
+  <host zone="internal" host_name="059ca4da76cf49e8a3d08d2303542157" service="cert"/>
+  <host zone="internal" host_name="ea70b9f0c530497fba8571deb4835ab0" service="network"/>
+  <host zone="internal" host_name="7d52ad3988504fb18b0cdfd94dbd267b" service="scheduler"/>
+  <host zone="internal" host_name="dc36bce962cc49c2ab916287bcf6c9d3" service="cells"/>
+</hosts>
\ No newline at end of file
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py
index 3727f35d9..925ded736 100644
--- a/nova/api/openstack/compute/contrib/hosts.py
+++ b/nova/api/openstack/compute/contrib/hosts.py
@@ -34,6 +34,7 @@ class HostIndexTemplate(xmlutil.TemplateBuilder):
         elem = xmlutil.SubTemplateElement(root, 'host', selector='hosts')
         elem.set('host_name')
         elem.set('service')
+        elem.set('zone')
 
         return xmlutil.MasterTemplate(root, 1)
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py
index d10f97d28..60e8f6e1f 100644
--- a/nova/tests/api/openstack/compute/contrib/test_hosts.py
+++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py
@@ -370,6 +370,8 @@ class HostSerializerTest(test.TestCase):
                              tree[i].get('host_name'))
             self.assertEqual(fake_hosts.HOST_LIST[i]['service'],
                              tree[i].get('service'))
+            self.assertEqual(fake_hosts.HOST_LIST[i]['zone'],
+                             tree[i].get('zone'))
 
     def test_update_serializer_with_status(self):
         exemplar = dict(host='host_c1', status='enabled')
diff --git a/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl
index 4e9d3195d..b5971738c 100644
--- a/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <hosts>
-  <host host_name="%(host_name)s" service="compute"/>
-  <host host_name="%(host_name)s" service="cert"/>
-  <host host_name="%(host_name)s" service="network"/>
-  <host host_name="%(host_name)s" service="scheduler"/>
-  <host host_name="%(host_name)s" service="conductor"/>
-  <host host_name="%(host_name)s" service="cells"/>
+  <host host_name="%(host_name)s" service="compute" zone="nova"/>
+  <host host_name="%(host_name)s" service="cert" zone="internal"/>
+  <host host_name="%(host_name)s" service="network" zone="internal"/>
+  <host host_name="%(host_name)s" service="scheduler" zone="internal"/>
+  <host host_name="%(host_name)s" service="conductor" zone="internal"/>
+  <host host_name="%(host_name)s" service="cells" zone="internal"/>
 </hosts>
-- 
cgit