fixed silly issue with variable needing to be named 'id' for the url mapper, also caught new exception type where needed

1 files changed, 5 insertions, 2 deletions

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index ac02d63c5..2a3f9e070 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -74,7 +74,7 @@ class Controller(common.OpenstackController):
         builder = self.get_builder(req).build
         return dict(images=[builder(image, detail=True) for image in images])
 
-    def show(self, req, image_id):
+    def show(self, req, id):
         """Return detailed information about a specific image.
 
         :param req: `wsgi.Request` object
@@ -84,11 +84,14 @@ class Controller(common.OpenstackController):
 
         try:
             (image_service, service_image_id) = utils.get_image_service(
-                image_id)
+                id)
             image = image_service.show(context, service_image_id)
         except exception.NotFound:
             explanation = _("Image not found.")
             raise faults.Fault(webob.exc.HTTPNotFound(explanation=explanation))
+        except exception.InvalidImageRef:
+            explanation = _("Image not found.")
+            raise faults.Fault(webob.exc.HTTPNotFound(explanation=explanation))
 
         return dict(image=self.get_builder(req).build(image, detail=True))