From 386e2a28f2d92dea30a726722b49e97e1c7ebba7 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 30 Jun 2011 11:29:45 -0400
Subject: updated images

---
 nova/api/openstack/views/images.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py
index d6a054102..175bcb109 100644
--- a/nova/api/openstack/views/images.py
+++ b/nova/api/openstack/views/images.py
@@ -104,6 +104,7 @@ class ViewBuilderV11(ViewBuilder):
         """Return a standardized image structure for display by the API."""
         image = ViewBuilder.build(self, image_obj, detail)
         href = self.generate_href(image_obj["id"])
+        bookmark = self.generate_bookmark(image_obj["id"])
 
         image["links"] = [{
             "rel": "self",
@@ -111,13 +112,15 @@ class ViewBuilderV11(ViewBuilder):
         },
         {
             "rel": "bookmark",
-            "type": "application/json",
-            "href": href,
-        },
-        {
-            "rel": "bookmark",
-            "type": "application/xml",
-            "href": href,
+            "href": bookmark,
         }]
 
         return image
+
+    def generate_bookmark(self, image_id):
+        """Create an url that refers to a specific flavor id."""
+        return os.path.join(self._remove_version(self._url),
+            "images", str(image_id))
+
+    def _remove_version(self, base_url):
+        return base_url.rsplit('/', 1).pop(0)
-- 
cgit