diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-07-12 12:46:15 -0400 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-07-12 12:46:15 -0400 |
| commit | 3c8de7e99e7cd8868f63fb0d15845b2462b77b3e (patch) | |
| tree | 8436c48db8ebda855384bd2cda564ef62b0a2153 | |
| parent | 5ab2fd27ea930669c01f309dbbfb794fd7c37ad6 (diff) | |
| download | nova-3c8de7e99e7cd8868f63fb0d15845b2462b77b3e.tar.gz nova-3c8de7e99e7cd8868f63fb0d15845b2462b77b3e.tar.xz nova-3c8de7e99e7cd8868f63fb0d15845b2462b77b3e.zip | |
Updated images viewbuilder to return links in server entity
| -rw-r--r-- | nova/api/openstack/views/images.py | 10 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_images.py | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py index d1f89a785..5c0510377 100644 --- a/nova/api/openstack/views/images.py +++ b/nova/api/openstack/views/images.py @@ -101,6 +101,16 @@ class ViewBuilderV11(ViewBuilder): serverRef = image_obj['properties']['instance_ref'] image['server'] = { "id": common.get_id_from_href(serverRef), + "links": [ + { + "rel": "self", + "href": serverRef, + }, + { + "rel": "bookmark", + "href": common.remove_version_from_href(serverRef), + }, + ] } except KeyError: return diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py index 696493d4f..c1ead6e28 100644 --- a/nova/tests/api/openstack/test_images.py +++ b/nova/tests/api/openstack/test_images.py @@ -1096,7 +1096,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): self.assertEqual(200, response.status_int) result = json.loads(response.body) expected = { - 'id': '1', + 'id': 1, 'links': [ { 'rel': 'self', @@ -1123,7 +1123,7 @@ class ImageControllerWithGlanceServiceTest(test.TestCase): self.assertEqual(200, response.status_int) result = json.loads(response.body) expected = { - 'id': '1', + 'id': 1, 'links': [ { 'rel': 'self', |