diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-07-14 14:01:04 -0400 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-07-14 14:01:04 -0400 |
| commit | 7044080daf2e487a92bba2a9f9b99e3cdb874e88 (patch) | |
| tree | 569a0112f586efdf556de325f5c5e8730638f9a8 /nova/api | |
| parent | 3041f2e9eb90e447adbb48827c2c85ca27d436e6 (diff) | |
updated image entity for servers requests
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/views/servers.py | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index 3f13e469a..968a904d9 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -143,21 +143,28 @@ class ViewBuilderV11(ViewBuilder): def _build_image(self, response, inst): if 'image_ref' in dict(inst): image_href = inst['image_ref'] - if str(image_href).isdigit(): - image_href = int(image_href) - response['image'] = { - "id": common.get_uuid_from_href(image_href), - "links": [ - { - "rel": "self", - "href": image_href, - }, - { - "rel": "bookmark", - "href": common.remove_version_from_href(image_href), - }, - ] - } + #if id is a uuid do: + if image_href == common.get_uuid_from_href(image_href): + image_id = image_href + _bookmark = self.image_builder.generate_bookmark(image_href) + response['image'] = { + "id": image_id, + "links": [ + { + "rel": "bookmark", + "href": _bookmark, + }, + ] + } + else: + response['image'] = { + "links": [ + { + "rel": "bookmark", + "href": image_href, + }, + ] + } def _build_flavor(self, response, inst): if "instance_type" in dict(inst): |