summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJohn Tran <jtran@attinteractive.com>2011-07-18 03:03:57 +0000
committerJohn Tran <jtran@attinteractive.com>2011-07-18 03:03:57 +0000
commit3fd9b0dbfcb42422a88c9b21f5353fdb9eea1fc1 (patch)
treedf6f16aa43153f8d8e110ff120e184a02f5975d7 /nova/api
parentb0a02feb7bd25380a75b83344e0ac3210a168387 (diff)
parentcf25ab33cb7d6b5e233a767ad96b3c45b1387b5e (diff)
merged from trunk
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/views/images.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py
index 5c0510377..873ce212a 100644
--- a/nova/api/openstack/views/images.py
+++ b/nova/api/openstack/views/images.py
@@ -121,16 +121,20 @@ class ViewBuilderV11(ViewBuilder):
href = self.generate_href(image_obj["id"])
bookmark = self.generate_bookmark(image_obj["id"])
- image["links"] = [{
- "rel": "self",
- "href": href,
- }]
+ image["links"] = [
+ {
+ "rel": "self",
+ "href": href,
+ },
+ {
+ "rel": "bookmark",
+ "href": bookmark,
+ },
+
+ ]
if detail:
image["metadata"] = image_obj.get("properties", {})
- image["links"].append({"rel": "bookmark",
- "href": bookmark,
- })
return image