From 8684eb3aa638883ea82bbaf8eb59076f1d7e6a05 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 18 Feb 2011 17:17:51 -0800
Subject: ObjectStore doesn't use properties collection; kernel_id and
 ramdisk_id aren't required anyway

---
 nova/api/openstack/servers.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 486eca508..11a84687d 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -144,13 +144,11 @@ class Controller(wsgi.Controller):
         metadata stored in Glance as 'image_properties'
         """
         def lookup(param):
-            _image_id = image_id
-            try:
-                return image['properties'][param]
-            except KeyError:
-                raise exception.NotFound(
-                    _("%(param)s property not found for image %(_image_id)s") %
-                      locals())
+            properties = image.get('properties')
+            if properties:
+                return properties.get(param)
+            else:
+                return image.get(param)
 
         image_id = str(image_id)
         image = self._image_service.show(req.environ['nova.context'], image_id)
-- 
cgit 


From 9f169fdef93898097e33b5e1c0318f543ced672e Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 22 Feb 2011 18:41:41 -0800
Subject: Reverted change to focus on the core bug - kernel_id and ramdisk_id
 are optional

---
 nova/api/openstack/servers.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 11a84687d..41b05cbb4 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -144,11 +144,13 @@ class Controller(wsgi.Controller):
         metadata stored in Glance as 'image_properties'
         """
         def lookup(param):
-            properties = image.get('properties')
-            if properties:
-                return properties.get(param)
-            else:
-                return image.get(param)
+            _image_id = image_id
+            try:
+                return image['properties'][param]
+            except KeyError:
+                LOG.debug(
+                    _("%(param)s property not found for image %(_image_id)s") %
+                      locals())
 
         image_id = str(image_id)
         image = self._image_service.show(req.environ['nova.context'], image_id)
-- 
cgit 


From 3ef3dfc2f6c8b9cc14119793df4990432ff74ea2 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 22 Feb 2011 18:42:23 -0800
Subject: Return null if no kernel_id / ramdisk_id

---
 nova/api/openstack/servers.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 41b05cbb4..d83bd34ab 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -151,6 +151,7 @@ class Controller(wsgi.Controller):
                 LOG.debug(
                     _("%(param)s property not found for image %(_image_id)s") %
                       locals())
+            return None
 
         image_id = str(image_id)
         image = self._image_service.show(req.environ['nova.context'], image_id)
-- 
cgit