From a9738fe5196cc1ed0715c3d96c692e782e77fec6 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Wed, 18 May 2011 10:10:10 -0400
Subject: made ImageControllerWithGlanceServiceTests pass

---
 nova/api/openstack/images.py  | 2 +-
 nova/api/openstack/servers.py | 7 +++----
 nova/utils.py                 | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 8a90b4c4d..6d3e50b56 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -88,7 +88,7 @@ class Controller(common.OpenstackController):
                 image_id)
             image = image_service.show(context, service_image_id)
         except exception.NotFound:
-            explanation = _("Image '%d' not found.") % (image_id)
+            explanation = _("Image not found.")
             raise faults.Fault(webob.exc.HTTPNotFound(explanation=explanation))
 
         return dict(image=self.get_builder(req).build(image, detail=True))
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 4e8574994..ca13a8669 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -141,7 +141,9 @@ class Controller(common.OpenstackController):
 
         image_ref = self._image_ref_from_req_data(env)
         try:
-            (image_service, image_id) = utils.get_image_service( image_ref)
+            (image_service, image_id) = utils.get_image_service(image_ref)
+            kernel_id, ramdisk_id = self._get_kernel_ramdisk_from_image(
+                req, image_id)
 
             #TODO: need to assert image exists a better way
             #image_id = common.get_image_id_from_image_hash(image_service,
@@ -150,9 +152,6 @@ class Controller(common.OpenstackController):
             msg = _("Can not find requested image")
             return faults.Fault(exc.HTTPBadRequest(msg))
 
-        kernel_id, ramdisk_id = self._get_kernel_ramdisk_from_image(
-            req, image_id)
-
         personality = env['server'].get('personality')
         injected_files = []
         if personality:
diff --git a/nova/utils.py b/nova/utils.py
index 46dfc82e9..04acfc417 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -752,7 +752,8 @@ def parse_image_ref(image_ref):
     if is_int(image_id):
         image_id = int(image_id)
     else:
-        raise Exception(_('image_ref [%s] is missing a proper id') % image_ref)
+        raise exception.ImageNotFound(
+            _('image_ref [%s] is missing a proper id') % image_ref)
 
     return (image_id, host, port)
 
-- 
cgit