openstack
/
nova
Code Issues Proposed changes

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
This commit is contained in:
Fei Long Wang 2013-03-24 12:36:47 +08:00
parent 11a925ca74
commit c5097ab668
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/api_samples/os-hosts/hosts-list-resp.xml
View File

@ -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>

1
nova/api/openstack/compute/contrib/hosts.py
View File

@ -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)

2
nova/tests/api/openstack/compute/contrib/test_hosts.py
View File

@ -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')

12
nova/tests/integrated/api_samples/os-hosts/hosts-list-resp.xml.tpl
View File

@ -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>