openstack/nova
Code Issues Proposed changes

Include list of attached volumes with instance info

Browse Source 
Fixes bug 1112998

Change-Id: I1c3eb578339aabbcfed107043f39e30daf633c4a
This commit is contained in:
Oleg Bondarev 2013-04-17 18:18:03 +04:00
parent d9be77ddd4
commit dd66f235ec
69 changed files with 329 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/api_samples/OS-DCF/list-servers-detail-get.json
View File

@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-02T02:11:56Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

3
doc/api_samples/OS-DCF/server-action-rebuild-resp.json
View File

@ -51,6 +51,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-02T02:11:56Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/OS-DCF/server-get-resp.json
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-02T02:11:55Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/OS-DCF/server-update-put-resp.json
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-02T02:11:58Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/OS-EXT-AZ/server-get-resp.json
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-01-30T13:38:49Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/OS-EXT-AZ/servers-detail-resp.json
View File

@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-01-30T13:26:52Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

3
doc/api_samples/OS-EXT-IPS-MAC/server-get-resp.json
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:46:29Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json
View File

@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:40:59Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

3
doc/api_samples/OS-EXT-IPS/server-get-resp.json
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:46:29Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/OS-EXT-IPS/servers-detail-resp.json
View File

@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:40:59Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

3
doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json
View File

@ -52,6 +52,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-11-15T19:27:04Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json
View File

@ -53,7 +53,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-11-15T19:27:05Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

3
doc/api_samples/OS-EXT-STS/server-get-resp.json
View File

@ -52,6 +52,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T19:35:10Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/OS-EXT-STS/servers-detail-resp.json
View File

@ -53,7 +53,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-05T07:34:10Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

3
doc/api_samples/all_extensions/server-action-rebuild-resp.json
View File

@ -51,6 +51,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-09-25T13:36:09Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

6
doc/api_samples/all_extensions/server-get-resp.json
View File

@ -66,6 +66,10 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:58:57Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
}

2
doc/api_samples/all_extensions/server-get-resp.xml
View File

@ -15,6 +15,8 @@
OS-EXT-IPS-MAC:mac_addr="00:0c:29:e1:42:90"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/6be39927-53b2-4aee-8593-1c72b3673168" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/6be39927-53b2-4aee-8593-1c72b3673168" rel="bookmark"/>
<security_groups>

6
doc/api_samples/all_extensions/servers-details-resp.json
View File

@ -67,7 +67,11 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:58:57Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
]
}

2
doc/api_samples/all_extensions/servers-details-resp.xml
View File

@ -15,6 +15,8 @@
<ip OS-EXT-IPS:type="fixed" version="4" addr="192.168.0.3" OS-EXT-IPS-MAC:mac_addr="00:0c:29:e1:42:90"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/b45edf9d-30f6-41e8-a00b-ef8962376586" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/b45edf9d-30f6-41e8-a00b-ef8962376586" rel="bookmark"/>
<security_groups>

3
doc/api_samples/os-config-drive/server-config-drive-get-resp.json
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-04T13:17:51Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/os-config-drive/servers-config-drive-details-resp.json
View File

@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-04T13:21:44Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

6
doc/api_samples/os-hide-server-addresses/server-get-resp.json
View File

@ -49,6 +49,10 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-19T20:32:42Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
}

2
doc/api_samples/os-hide-server-addresses/server-get-resp.xml
View File

@ -14,6 +14,8 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/b8b02dd4-b2bb-441d-b52a-ee5c89c832d2" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/b8b02dd4-b2bb-441d-b52a-ee5c89c832d2" rel="bookmark"/>
</server>

6
doc/api_samples/os-hide-server-addresses/servers-details-resp.json
View File

@ -50,7 +50,11 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-19T20:32:39Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
]
}

2
doc/api_samples/os-hide-server-addresses/servers-details-resp.xml
View File

@ -15,6 +15,8 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/55db7849-8ec4-46dd-8897-492d82282f29" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/55db7849-8ec4-46dd-8897-492d82282f29" rel="bookmark"/>
</server>

3
doc/api_samples/os-rescue/server-get-resp-rescue.json
View File

@ -48,6 +48,7 @@
"status": "RESCUE",
"tenant_id": "openstack",
"updated": "2012-09-19T09:22:27Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/os-rescue/server-get-resp-unrescue.json
View File

@ -49,6 +49,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-09-19T09:22:28Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
doc/api_samples/server-action-rebuild-resp.json
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-09-12T17:20:37Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

6
doc/api_samples/server-get-resp.json
View File

@ -49,6 +49,10 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-08-20T21:11:09Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
}

2
doc/api_samples/server-get-resp.xml
View File

@ -14,6 +14,8 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/3f9f7d18-aaf3-4703-b368-ea9b4d609c95" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/3f9f7d18-aaf3-4703-b368-ea9b4d609c95" rel="bookmark"/>
</server>

6
doc/api_samples/servers-details-resp.json
View File

@ -50,7 +50,11 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-09-07T16:56:37Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
]
}

2
doc/api_samples/servers-details-resp.xml
View File

@ -15,6 +15,8 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/7c3c0f79-343e-4b99-93bc-2ade47641e64" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/7c3c0f79-343e-4b99-93bc-2ade47641e64" rel="bookmark"/>
</server>

14
nova/api/openstack/compute/servers.py
View File

@ -97,6 +97,11 @@ def make_server(elem, detailed=False):
# Attach addresses node
elem.append(ips.AddressesTemplate())
# Attach volumes_attached node
volumes = xmlutil.SubTemplateElement(elem, 'volume_attached',
selector='volumes_attached')
volumes.set('id')
xmlutil.make_links(elem, 'links')
@ -493,6 +498,13 @@ class Controller(wsgi.Controller):
return instances
def _add_instance_volumes(self, context, instances):
for instance in instances:
bdms = self.compute_api.get_instance_bdms(context, instance)
volumes = [bdm['volume_id'] for bdm in bdms if bdm['volume_id']]
if volumes:
instance['volumes_attached'] = volumes
def _get_servers(self, req, is_detail):
"""Returns a list of servers, based on any search options specified."""
@ -560,6 +572,7 @@ class Controller(wsgi.Controller):
if is_detail:
self._add_instance_faults(context, instance_list)
self._add_instance_volumes(context, instance_list)
response = self._view_builder.detail(req, instance_list)
else:
response = self._view_builder.index(req, instance_list)
@ -736,6 +749,7 @@ class Controller(wsgi.Controller):
instance = self.compute_api.get(context, id)
req.cache_db_instance(instance)
self._add_instance_faults(context, [instance])
self._add_instance_volumes(context, [instance])
return self._view_builder.show(req, instance)
except exception.NotFound:
msg = _("Instance could not be found")

2
nova/api/openstack/compute/views/servers.py
View File

@ -108,6 +108,8 @@ class ViewBuilder(common.ViewBuilder):
"links": self._get_links(request,
instance["uuid"],
self._collection_name),
"volumes_attached": [{'id': vol_id} for vol_id in
instance.get("volumes_attached", [])],
},
}
_inst_fault = self._get_fault(request, instance)

141
nova/tests/api/openstack/compute/test_servers.py
View File

@ -314,6 +314,7 @@ class ServersControllerTest(test.TestCase):
"href": "http://localhost/fake/servers/%s" % uuid,
},
],
"volumes_attached": [],
}
}
@ -380,6 +381,7 @@ class ServersControllerTest(test.TestCase):
"href": "http://localhost/fake/servers/%s" % uuid,
},
],
"volumes_attached": [],
}
}
@ -449,11 +451,79 @@ class ServersControllerTest(test.TestCase):
"href": "http://localhost/fake/servers/%s" % uuid,
},
],
"volumes_attached": [],
}
}
self.assertThat(res_dict, matchers.DictMatches(expected_server))
def test_get_server_with_volumes_attached(self):
image_bookmark = "http://localhost/fake/images/10"
flavor_bookmark = "http://localhost/fake/flavors/1"
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
fakes.stub_bdm_get_all_by_instance)
uuid = FAKE_UUID
req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % uuid)
res_dict = self.controller.show(req, uuid)
expected_server = {
"server": {
"id": uuid,
"user_id": "fake_user",
"tenant_id": "fake_project",
"updated": "2010-11-11T11:00:00Z",
"created": "2010-10-10T12:00:00Z",
"progress": 0,
"name": "server1",
"status": "BUILD",
"accessIPv4": "",
"accessIPv6": "",
"hostId": '',
"image": {
"id": "10",
"links": [
{
"rel": "bookmark",
"href": image_bookmark,
},
],
},
"flavor": {
"id": "1",
"links": [
{
"rel": "bookmark",
"href": flavor_bookmark,
},
],
},
"addresses": {
'test1': [
{'version': 4, 'addr': '192.168.1.100'},
{'version': 6, 'addr': '2001:db8:0:1::1'}
]
},
"metadata": {
"seq": "1",
},
"links": [
{
"rel": "self",
"href": "http://localhost/v2/fake/servers/%s" % uuid,
},
{
"rel": "bookmark",
"href": "http://localhost/fake/servers/%s" % uuid,
},
],
"volumes_attached": [{'id': 'volume_id1'},
{'id': 'volume_id2'}],
}
}
self.assertThat(res_dict, matchers.DictMatches(expected_server))
def test_get_server_addresses_from_cache(self):
pub0 = ('172.19.0.1', '172.19.0.2',)
pub1 = ('1.2.3.4',)
@ -4200,6 +4270,7 @@ class ServersViewBuilderTest(test.TestCase):
"href": bookmark_link,
},
],
"volumes_attached": [],
}
}
@ -4278,6 +4349,7 @@ class ServersViewBuilderTest(test.TestCase):
"message": "HTTPNotFound",
"details": "Stock details for test",
},
"volumes_attached": [],
}
}
@ -4418,6 +4490,7 @@ class ServersViewBuilderTest(test.TestCase):
"href": bookmark_link,
},
],
"volumes_attached": [],
}
}
@ -4480,6 +4553,7 @@ class ServersViewBuilderTest(test.TestCase):
"href": bookmark_link,
},
],
"volumes_attached": [],
}
}
@ -4542,6 +4616,7 @@ class ServersViewBuilderTest(test.TestCase):
"href": bookmark_link,
},
],
"volumes_attached": [],
}
}
@ -4606,12 +4681,78 @@ class ServersViewBuilderTest(test.TestCase):
"href": bookmark_link,
},
],
"volumes_attached": [],
}
}
output = self.view_builder.show(self.request, self.instance)
self.assertThat(output, matchers.DictMatches(expected_server))
def test_build_server_detail_with_volumes_attached(self):
volumes_attached = ['volume_id1', 'volume_id2']
self.instance['volumes_attached'] = volumes_attached
image_bookmark = "http://localhost/fake/images/5"
flavor_bookmark = "http://localhost/fake/flavors/1"
self_link = "http://localhost/v2/fake/servers/%s" % self.uuid
bookmark_link = "http://localhost/fake/servers/%s" % self.uuid
expected_server = {
"server": {
"id": self.uuid,
"user_id": "fake_user",
"tenant_id": "fake_project",
"updated": "2010-11-11T11:00:00Z",
"created": "2010-10-10T12:00:00Z",
"progress": 0,
"name": "test_server",
"status": "BUILD",
"accessIPv4": "",
"accessIPv6": "",
"hostId": '',
"image": {
"id": "5",
"links": [
{
"rel": "bookmark",
"href": image_bookmark,
},
],
},
"flavor": {
"id": "1",
"links": [
{
"rel": "bookmark",
"href": flavor_bookmark,
},
],
},
"addresses": {
'test1': [
{'version': 4, 'addr': '192.168.1.100'},
{'version': 6, 'addr': '2001:db8:0:1::1'}
]
},
"metadata": {},
"links": [
{
"rel": "self",
"href": self_link,
},
{
"rel": "bookmark",
"href": bookmark_link,
},
],
"volumes_attached": [{'id': vol_id} for vol_id in
volumes_attached],
}
}
output = self.view_builder.show(self.request, self.instance)
self.assertThat(output, matchers.DictMatches(expected_server))
class ServerXMLSerializationTest(test.TestCase):

4
nova/tests/api/openstack/fakes.py
View File

@ -631,3 +631,7 @@ def stub_snapshot_get_all(self, context):
return [stub_snapshot(100, project_id='fake'),
stub_snapshot(101, project_id='superfake'),
stub_snapshot(102, project_id='superduperfake')]
def stub_bdm_get_all_by_instance(context, instance_uuid):
return [{'volume_id': 'volume_id1'}, {'volume_id': 'volume_id2'}]

3
nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl
View File

@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

3
nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl
View File

@ -51,6 +51,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl
View File

@ -50,6 +50,7 @@
"progress": 0,
"status": "ACTIVE",
"tenant_id": "openstack",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl
View File

@ -51,7 +51,8 @@
"progress": 0,
"status": "ACTIVE",
"tenant_id": "openstack",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

3
nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl
View File

@ -51,6 +51,7 @@
"hostId": "%(hostid)s",
"metadata": {
"My Server Name": "Apache1"
}
},
"volumes_attached": []
}]
}

3
nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl
View File

@ -51,6 +51,7 @@
"hostId": "%(hostid)s",
"metadata": {
"My Server Name": "Apache1"
}
},
"volumes_attached": []
}]
}

3
nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl
View File

@ -52,6 +52,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl
View File

@ -53,7 +53,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

3
nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl
View File

@ -52,6 +52,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl
View File

@ -53,6 +53,7 @@
"hostId": "%(hostid)s",
"metadata": {
"My Server Name": "Apache1"
}
},
"volumes_attached": []
}]
}

3
nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl
View File

@ -51,6 +51,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

6
nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl
View File

@ -66,6 +66,10 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
}

2
nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl
View File

@ -15,6 +15,8 @@
OS-EXT-IPS-MAC:mac_addr="%(mac_addr)s"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
<atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
<security_groups>

6
nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl
View File

@ -67,7 +67,11 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
]
}

2
nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl
View File

@ -16,6 +16,8 @@
OS-EXT-IPS-MAC:mac_addr="%(mac_addr)s"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
<atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
<security_groups>

3
nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl
View File

@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

6
nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl
View File

@ -49,6 +49,10 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
}

2
nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl
View File

@ -14,6 +14,8 @@
<ip version="4" addr="%(ip)s"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
<atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
</server>

6
nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl
View File

@ -50,7 +50,11 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
]
}

2
nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl
View File

@ -15,6 +15,8 @@
<ip version="4" addr="%(ip)s"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
<atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
</server>

3
nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl
View File

@ -48,6 +48,7 @@
"status": "%(status)s",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl
View File

@ -49,6 +49,7 @@
"status": "%(status)s",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

3
nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl
View File

@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

6
nova/tests/integrated/api_samples/server-get-resp.json.tpl
View File

@ -49,6 +49,10 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
}

2
nova/tests/integrated/api_samples/server-get-resp.xml.tpl
View File

@ -14,6 +14,8 @@
<ip version="4" addr="%(ip)s"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
<atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
</server>

6
nova/tests/integrated/api_samples/servers-details-resp.json.tpl
View File

@ -50,7 +50,11 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "%(timestamp)s",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
]
}

2
nova/tests/integrated/api_samples/servers-details-resp.xml.tpl
View File

@ -15,6 +15,8 @@
<ip version="4" addr="%(ip)s"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
<atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
</server>

4
nova/tests/integrated/test_api_samples.py
View File

@ -456,6 +456,8 @@ class ServersSampleJsonTest(ServersSampleBase):
def test_servers_get(self):
uuid = self.test_servers_post()
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
fakes.stub_bdm_get_all_by_instance)
response = self._do_get('servers/%s' % uuid)
subs = self._get_regexes()
subs['hostid'] = '[a-f0-9]+'
@ -473,6 +475,8 @@ class ServersSampleJsonTest(ServersSampleBase):
def test_servers_details(self):
uuid = self._post_server()
self.stubs.Set(db, 'block_device_mapping_get_all_by_instance',
fakes.stub_bdm_get_all_by_instance)
response = self._do_get('servers/detail')
subs = self._get_regexes()
subs['hostid'] = '[a-f0-9]+'