From 64fcd4de113dea91cd36e0fb8ed74f001089a3a9 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 7 Feb 2013 09:55:33 -0800 Subject: Add an extension to show the type of an ip. There is currently no way to differentiate a fixed ip from a floating ip in the servers list. This extension adds the OS-EXT-IPS:type param so that users can determine if it is a fixed address or a floating address. Fixes bug 1117784 DocImpact Change-Id: I8709a4f2f6792faa3d8e0cdcd330d751ef6633ae --- nova/api/openstack/compute/contrib/extended_ips.py | 111 ++++++++++++++ .../openstack/compute/contrib/test_extended_ips.py | 168 +++++++++++++++++++++ .../tests/api/openstack/compute/test_extensions.py | 1 + nova/tests/fake_policy.py | 1 + .../OS-EXT-IPS/server-get-resp.json.tpl | 55 +++++++ .../api_samples/OS-EXT-IPS/server-get-resp.xml.tpl | 19 +++ .../OS-EXT-IPS/server-post-req.json.tpl | 16 ++ .../api_samples/OS-EXT-IPS/server-post-req.xml.tpl | 19 +++ .../OS-EXT-IPS/server-post-resp.json.tpl | 16 ++ .../OS-EXT-IPS/server-post-resp.xml.tpl | 6 + .../OS-EXT-IPS/servers-detail-resp.json.tpl | 56 +++++++ .../OS-EXT-IPS/servers-detail-resp.xml.tpl | 21 +++ .../all_extensions/extensions-get-resp.json.tpl | 8 + .../all_extensions/extensions-get-resp.xml.tpl | 3 + .../all_extensions/server-get-resp.json.tpl | 1 + .../all_extensions/server-get-resp.xml.tpl | 4 +- .../all_extensions/servers-details-resp.json.tpl | 1 + .../all_extensions/servers-details-resp.xml.tpl | 6 +- nova/tests/integrated/test_api_samples.py | 28 ++++ 19 files changed, 535 insertions(+), 5 deletions(-) create mode 100644 nova/api/openstack/compute/contrib/extended_ips.py create mode 100644 nova/tests/api/openstack/compute/contrib/test_extended_ips.py create mode 100644 nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.json.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.xml.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.json.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl (limited to 'nova') diff --git a/nova/api/openstack/compute/contrib/extended_ips.py b/nova/api/openstack/compute/contrib/extended_ips.py new file mode 100644 index 000000000..0a3432a46 --- /dev/null +++ b/nova/api/openstack/compute/contrib/extended_ips.py @@ -0,0 +1,111 @@ +# Copyright 2013 Nebula, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +"""The Extended Ips API extension.""" + +import itertools + +from nova.api.openstack import common +from nova.api.openstack.compute import ips +from nova.api.openstack import extensions +from nova.api.openstack import wsgi +from nova.api.openstack import xmlutil +from nova import compute +from nova.openstack.common import log as logging + +LOG = logging.getLogger(__name__) +authorize = extensions.soft_extension_authorizer('compute', 'extended_ips') + + +class ExtendedIpsController(wsgi.Controller): + def __init__(self, *args, **kwargs): + super(ExtendedIpsController, self).__init__(*args, **kwargs) + self.compute_api = compute.API() + + def _extend_server(self, context, server, instance): + key = "%s:type" % Extended_ips.alias + networks = common.get_networks_for_instance(context, instance) + for label, network in networks.items(): + # NOTE(vish): ips are hidden in some states via the + # hide_server_addresses extension. + if label in server['addresses']: + all_ips = itertools.chain(network["ips"], + network["floating_ips"]) + for i, ip in enumerate(all_ips): + server['addresses'][label][i][key] = ip['type'] + + @wsgi.extends + def show(self, req, resp_obj, id): + context = req.environ['nova.context'] + if authorize(context): + # Attach our slave template to the response object + resp_obj.attach(xml=ExtendedIpsServerTemplate()) + server = resp_obj.obj['server'] + db_instance = req.get_db_instance(server['id']) + # server['id'] is guaranteed to be in the cache due to + # the core API adding it in its 'show' method. + self._extend_server(context, server, db_instance) + + @wsgi.extends + def detail(self, req, resp_obj): + context = req.environ['nova.context'] + if authorize(context): + # Attach our slave template to the response object + resp_obj.attach(xml=ExtendedIpsServersTemplate()) + servers = list(resp_obj.obj['servers']) + for server in servers: + db_instance = req.get_db_instance(server['id']) + # server['id'] is guaranteed to be in the cache due to + # the core API adding it in its 'detail' method. + self._extend_server(context, server, db_instance) + + +class Extended_ips(extensions.ExtensionDescriptor): + """Adds type parameter to the ip list.""" + + name = "ExtendedIps" + alias = "OS-EXT-IPS" + namespace = ("http://docs.openstack.org/compute/ext/" + "extended_ips/api/v1.1") + updated = "2013-01-06T00:00:00+00:00" + + def get_controller_extensions(self): + controller = ExtendedIpsController() + extension = extensions.ControllerExtension(self, 'servers', controller) + return [extension] + + +def make_server(elem): + elem.append(ips.AddressesTemplate()) + ip = elem['addresses']['network']['ip'] + ip.set('{%s}type' % Extended_ips.namespace, + '%s:type' % Extended_ips.alias) + + +class ExtendedIpsServerTemplate(xmlutil.TemplateBuilder): + def construct(self): + root = xmlutil.TemplateElement('server', selector='server') + elem = xmlutil.SubTemplateElement(root, 'server', selector='servers') + make_server(root) + return xmlutil.SlaveTemplate(root, 1, nsmap={ + Extended_ips.alias: Extended_ips.namespace}) + + +class ExtendedIpsServersTemplate(xmlutil.TemplateBuilder): + def construct(self): + root = xmlutil.TemplateElement('servers') + elem = xmlutil.SubTemplateElement(root, 'server', selector='servers') + make_server(elem) + return xmlutil.SlaveTemplate(root, 1, nsmap={ + Extended_ips.alias: Extended_ips.namespace}) diff --git a/nova/tests/api/openstack/compute/contrib/test_extended_ips.py b/nova/tests/api/openstack/compute/contrib/test_extended_ips.py new file mode 100644 index 000000000..9fd646b91 --- /dev/null +++ b/nova/tests/api/openstack/compute/contrib/test_extended_ips.py @@ -0,0 +1,168 @@ +# Copyright 2013 Nebula, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from lxml import etree +import webob + +from nova.api.openstack.compute.contrib import extended_ips +from nova.api.openstack import xmlutil +from nova import compute +from nova.openstack.common import jsonutils +from nova import test +from nova.tests.api.openstack import fakes + +UUID1 = '00000000-0000-0000-0000-000000000001' +UUID2 = '00000000-0000-0000-0000-000000000002' +UUID3 = '00000000-0000-0000-0000-000000000003' +NW_CACHE = [ + { + 'address': 'aa:aa:aa:aa:aa:aa', + 'id': 1, + 'network': { + 'bridge': 'br0', + 'id': 1, + 'label': 'private', + 'subnets': [ + { + 'cidr': '192.168.1.0/24', + 'ips': [ + { + 'address': '192.168.1.100', + 'type': 'fixed', + 'floating_ips': [ + {'address': '5.0.0.1', 'type': 'floating'}, + ], + }, + ], + }, + ] + } + }, + { + 'address': 'bb:bb:bb:bb:bb:bb', + 'id': 2, + 'network': { + 'bridge': 'br1', + 'id': 2, + 'label': 'public', + 'subnets': [ + { + 'cidr': '10.0.0.0/24', + 'ips': [ + { + 'address': '10.0.0.100', + 'type': 'fixed', + 'floating_ips': [ + {'address': '5.0.0.2', 'type': 'floating'}, + ], + } + ], + }, + ] + } + } +] +ALL_IPS = [] +for cache in NW_CACHE: + for subnet in cache['network']['subnets']: + for fixed in subnet['ips']: + sanitized = dict(fixed) + sanitized.pop('floating_ips') + ALL_IPS.append(sanitized) + for floating in fixed['floating_ips']: + ALL_IPS.append(floating) +ALL_IPS.sort() + + +def fake_compute_get(*args, **kwargs): + return fakes.stub_instance(1, uuid=UUID3, nw_cache=NW_CACHE) + + +def fake_compute_get_all(*args, **kwargs): + return [ + fakes.stub_instance(1, uuid=UUID1, nw_cache=NW_CACHE), + fakes.stub_instance(2, uuid=UUID2, nw_cache=NW_CACHE), + ] + + +class ExtendedIpsTest(test.TestCase): + content_type = 'application/json' + prefix = 'OS-EXT-IPS:' + + def setUp(self): + super(ExtendedIpsTest, self).setUp() + fakes.stub_out_nw_api(self.stubs) + self.stubs.Set(compute.api.API, 'get', fake_compute_get) + self.stubs.Set(compute.api.API, 'get_all', fake_compute_get_all) + self.flags( + osapi_compute_extension=[ + 'nova.api.openstack.compute.contrib.select_extensions'], + osapi_compute_ext_list=['Extended_ips']) + + def _make_request(self, url): + req = webob.Request.blank(url) + req.headers['Accept'] = self.content_type + res = req.get_response(fakes.wsgi_app(init_only=('servers',))) + return res + + def _get_server(self, body): + return jsonutils.loads(body).get('server') + + def _get_servers(self, body): + return jsonutils.loads(body).get('servers') + + def _get_ips(self, server): + for network in server['addresses'].itervalues(): + for ip in network: + yield ip + + def assertServerStates(self, server): + results = [] + for ip in self._get_ips(server): + results.append({'address': ip.get('addr'), + 'type': ip.get('%stype' % self.prefix)}) + + self.assertEqual(ALL_IPS, sorted(results)) + + def test_show(self): + url = '/v2/fake/servers/%s' % UUID3 + res = self._make_request(url) + + self.assertEqual(res.status_int, 200) + self.assertServerStates(self._get_server(res.body)) + + def test_detail(self): + url = '/v2/fake/servers/detail' + res = self._make_request(url) + + self.assertEqual(res.status_int, 200) + for i, server in enumerate(self._get_servers(res.body)): + self.assertServerStates(server) + + +class ExtendedIpsXmlTest(ExtendedIpsTest): + content_type = 'application/xml' + prefix = '{%s}' % extended_ips.Extended_ips.namespace + + def _get_server(self, body): + return etree.XML(body) + + def _get_servers(self, body): + return etree.XML(body).getchildren() + + def _get_ips(self, server): + for network in server.find('{%s}addresses' % xmlutil.XMLNS_V11): + for ip in network: + yield ip diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py index a52b0e0fc..97be7376e 100644 --- a/nova/tests/api/openstack/compute/test_extensions.py +++ b/nova/tests/api/openstack/compute/test_extensions.py @@ -167,6 +167,7 @@ class ExtensionControllerTest(ExtensionTestCase): "DeferredDelete", "DiskConfig", "ExtendedAvailabilityZone", + "ExtendedIps", "Evacuate", "ExtendedStatus", "ExtendedServerAttributes", diff --git a/nova/tests/fake_policy.py b/nova/tests/fake_policy.py index 92ce0815a..a3718b877 100644 --- a/nova/tests/fake_policy.py +++ b/nova/tests/fake_policy.py @@ -121,6 +121,7 @@ policy_data = """ "compute_extension:extended_server_attributes": "", "compute_extension:extended_status": "", "compute_extension:extended_availability_zone": "", + "compute_extension:extended_ips": "", "compute_extension:fixed_ips": "", "compute_extension:flavor_access": "", "compute_extension:flavor_disabled": "", diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl new file mode 100644 index 000000000..bea96d4f6 --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl @@ -0,0 +1,55 @@ +{ + "server": { + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "OS-EXT-IPS:type": "fixed", + "addr": "%(ip)s", + "version": 4 + } + ] + }, + "created": "%(timestamp)s", + "flavor": { + "id": "1", + "links": [ + { + "href": "%(host)s/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "%(hostid)s", + "id": "%(id)s", + "image": { + "id": "%(uuid)s", + "links": [ + { + "href": "%(host)s/openstack/images/%(uuid)s", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "%(host)s/v2/openstack/servers/%(id)s", + "rel": "self" + }, + { + "href": "%(host)s/openstack/servers/%(id)s", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "%(timestamp)s", + "user_id": "fake" + } +} diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl new file mode 100644 index 000000000..d3f14f6ed --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl @@ -0,0 +1,19 @@ + + + + + + + + + + Apache1 + + + + + + + + + diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.json.tpl new file mode 100644 index 000000000..d3916d1aa --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.json.tpl @@ -0,0 +1,16 @@ +{ + "server" : { + "name" : "new-server-test", + "imageRef" : "%(host)s/openstack/images/%(image_id)s", + "flavorRef" : "%(host)s/openstack/flavors/1", + "metadata" : { + "My Server Name" : "Apache1" + }, + "personality" : [ + { + "path" : "/etc/banner.txt", + "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] + } +} diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.xml.tpl new file mode 100644 index 000000000..f92614984 --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-req.xml.tpl @@ -0,0 +1,19 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.json.tpl new file mode 100644 index 000000000..d5f030c87 --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.json.tpl @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "%(password)s", + "id": "%(id)s", + "links": [ + { + "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "rel": "self" + }, + { + "href": "%(host)s/openstack/servers/%(uuid)s", + "rel": "bookmark" + } + ] + } +} diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl new file mode 100644 index 000000000..3bb13e69b --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-post-resp.xml.tpl @@ -0,0 +1,6 @@ + + + + + + diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl new file mode 100644 index 000000000..37487e49f --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl @@ -0,0 +1,56 @@ +{ + "servers": [ + { + "status": "ACTIVE", + "updated": "%(timestamp)s", + "user_id": "fake", + "addresses": { + "private": [ + { + "OS-EXT-IPS:type": "fixed", + "addr": "%(ip)s", + "version": 4 + } + ] + }, + "links": [ + { + "href": "%(host)s/v2/openstack/servers/%(id)s", + "rel": "self" + }, + { + "href": "%(host)s/openstack/servers/%(id)s", + "rel": "bookmark" + } + ], + "created": "%(timestamp)s", + "name": "new-server-test", + "image": { + "id": "%(uuid)s", + "links": [ + { + "href": "%(host)s/openstack/images/%(uuid)s", + "rel": "bookmark" + } + ] + }, + "id": "%(uuid)s", + "accessIPv4": "", + "accessIPv6": "", + "tenant_id": "openstack", + "progress": 0, + "flavor": { + "id": "1", + "links": [ + { + "href": "%(host)s/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "%(hostid)s", + "metadata": { + "My Server Name": "Apache1" + } + }] +} diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl new file mode 100644 index 000000000..5fc5c1f93 --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl @@ -0,0 +1,21 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + diff --git a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl index 35d50d025..4b5160410 100644 --- a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.json.tpl @@ -24,6 +24,14 @@ "namespace": "http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2", "updated": "%(timestamp)s" }, + { + "alias": "OS-EXT-IPS", + "description": "%(text)s", + "links": [], + "name": "ExtendedIps", + "namespace": "http://docs.openstack.org/compute/ext/extended_ips/api/v1.1", + "updated": "%(timestamp)s" + }, { "alias": "OS-EXT-SRV-ATTR", "description": "%(text)s", diff --git a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl index 2adc5988c..4066858e7 100644 --- a/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/extensions-get-resp.xml.tpl @@ -9,6 +9,9 @@ %(text)s + + %(text)s + %(text)s diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl index 85fc6f605..fefa37b4d 100644 --- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl @@ -14,6 +14,7 @@ "addresses": { "private": [ { + "OS-EXT-IPS:type": "fixed", "addr": "%(ip)s", "version": 4 } diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl index bd73accda..4ba06b42e 100644 --- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl index a4918203b..667ef6471 100644 --- a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl @@ -15,6 +15,7 @@ "addresses": { "private": [ { + "OS-EXT-IPS:type": "fixed", "addr": "%(ip)s", "version": 4 } diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl index d26eb38ef..104c82bc5 100644 --- a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl @@ -1,6 +1,6 @@ - - + + @@ -12,7 +12,7 @@ - + diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 02fbdd48a..3822ba109 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -2217,6 +2217,34 @@ class QuotasSampleXmlTests(QuotasSampleJsonTests): ctype = "xml" +class ExtendedIpsSampleJsonTests(ServersSampleBase): + extension_name = ("nova.api.openstack.compute.contrib" + ".extended_ips.Extended_ips") + + def test_show(self): + uuid = self._post_server() + response = self._do_get('servers/%s' % uuid) + self.assertEqual(response.status, 200) + subs = self._get_regexes() + subs['hostid'] = '[a-f0-9]+' + subs['id'] = uuid + subs['hypervisor_hostname'] = r'[\w\.\-]+' + return self._verify_response('server-get-resp', subs, response) + + def test_detail(self): + uuid = self._post_server() + response = self._do_get('servers/detail') + self.assertEqual(response.status, 200) + subs = self._get_regexes() + subs['id'] = uuid + subs['hostid'] = '[a-f0-9]+' + return self._verify_response('servers-detail-resp', subs, response) + + +class ExtendedIpsSampleXmlTests(ExtendedIpsSampleJsonTests): + ctype = 'xml' + + class ExtendedStatusSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" ".extended_status.Extended_status") -- cgit