From 7044080daf2e487a92bba2a9f9b99e3cdb874e88 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 14 Jul 2011 14:01:04 -0400
Subject: updated image entity for servers requests

---
 nova/api/openstack/views/servers.py | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'nova/api')

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):
-- 
cgit