summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-06-23 10:53:09 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-06-23 10:53:09 -0400
commit9044733fb0aff698875080caf1ffd9e44470ec0e (patch)
tree7a04374d21bbe5614b41c957e9e858740b6c70f2 /nova/api
parent6d6720e9b7e52461238ece684c9acc7183673bb8 (diff)
downloadnova-9044733fb0aff698875080caf1ffd9e44470ec0e.tar.gz
nova-9044733fb0aff698875080caf1ffd9e44470ec0e.tar.xz
nova-9044733fb0aff698875080caf1ffd9e44470ec0e.zip
adding metadata container to /images/detail and /images/<id> calls
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/views/images.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py
index 2773c9c13..e7472b5cd 100644
--- a/nova/api/openstack/views/images.py
+++ b/nova/api/openstack/views/images.py
@@ -109,6 +109,9 @@ class ViewBuilderV11(ViewBuilder):
image = ViewBuilder.build(self, image_obj, detail)
href = self.generate_href(image_obj["id"])
+ if detail:
+ image["metadata"] = image_obj.get("properties", {})
+
image["links"] = [{
"rel": "self",
"href": href,