fix show_by_name in s3.py and give a helpful error message if image lookup fails

2 files changed, 5 insertions, 2 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 5e81878c4..10b1d0ac5 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -908,7 +908,10 @@ class CloudController(object):
             internal_id = ec2utils.ec2_id_to_id(ec2_id)
             return self.image_service.show(context, internal_id)
         except exception.NotFound:
-            return self.image_service.show_by_name(context, ec2_id)
+            try:
+                return self.image_service.show_by_name(context, ec2_id)
+            except exception.NotFound:
+                raise exception.NotFound(_('Image %s not found') % ec2_id)
 
     def _format_image(self, image):
         """Convert from format defined by BaseImageService to S3 format."""
diff --git a/nova/image/s3.py b/nova/image/s3.py
index 554760d53..b1034d151 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -75,7 +75,7 @@ class S3ImageService(service.BaseImageService):
         return self.service.show(context, image_id)
 
     def show_by_name(self, context, name):
-        return self.service.show(context, name)
+        return self.service.show_by_name(context, name)
 
     @staticmethod
     def _conn(context):