Addressing exception.NotFound across the project

3 files changed, 20 insertions, 20 deletions

diff --git a/nova/image/fake.py b/nova/image/fake.py
index e02b4127e..c0b98d68f 100644
--- a/nova/image/fake.py
+++ b/nova/image/fake.py
@@ -71,7 +71,7 @@ class FakeImageService(service.BaseImageService):
             return copy.deepcopy(image)
         LOG.warn("Unable to find image id %s.  Have images: %s",
                  image_id, self.images)
-        raise exception.NotFound
+        raise exception.ImageNotFound(image_id=image_id)
 
     def create(self, context, data):
         """Store the image data and return the new image id.
@@ -88,24 +88,24 @@ class FakeImageService(service.BaseImageService):
     def update(self, context, image_id, data):
         """Replace the contents of the given image with the new data.
 
-        :raises NotFound if the image does not exist.
+        :raises ImageNotFound if the image does not exist.
 
         """
         image_id = int(image_id)
         if not self.images.get(image_id):
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
         self.images[image_id] = copy.deepcopy(data)
 
     def delete(self, context, image_id):
         """Delete the given image.
 
-        :raises NotFound if the image does not exist.
+        :raises ImageNotFound if the image does not exist.
 
         """
         image_id = int(image_id)
         removed = self.images.pop(image_id, None)
         if not removed:
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
 
     def delete_all(self):
         """Clears out all images."""
diff --git a/nova/image/glance.py b/nova/image/glance.py
index 1a80bb2af..2f1716239 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -89,10 +89,10 @@ class GlanceImageService(service.BaseImageService):
         try:
             image_meta = self.client.get_image_meta(image_id)
         except glance_exception.NotFound:
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
 
         if not self._is_image_available(context, image_meta):
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
 
         base_image_meta = self._translate_to_base(image_meta)
         return base_image_meta
@@ -107,7 +107,7 @@ class GlanceImageService(service.BaseImageService):
         for image_meta in image_metas:
             if name == image_meta.get('name'):
                 return image_meta
-        raise exception.NotFound
+        raise exception.ImageNotFound(image_id=name)
 
     def get(self, context, image_id, data):
         """
@@ -116,7 +116,7 @@ class GlanceImageService(service.BaseImageService):
         try:
             image_meta, image_chunks = self.client.get_image(image_id)
         except glance_exception.NotFound:
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
 
         for chunk in image_chunks:
             data.write(chunk)
@@ -149,14 +149,14 @@ class GlanceImageService(service.BaseImageService):
     def update(self, context, image_id, image_meta, data=None):
         """Replace the contents of the given image with the new data.
 
-        :raises NotFound if the image does not exist.
+        :raises ImageNotFound if the image does not exist.
         """
         # NOTE(vish): show is to check if image is available
         self.show(context, image_id)
         try:
             image_meta = self.client.update_image(image_id, image_meta, data)
         except glance_exception.NotFound:
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
 
         base_image_meta = self._translate_to_base(image_meta)
         return base_image_meta
@@ -165,14 +165,14 @@ class GlanceImageService(service.BaseImageService):
         """
         Delete the given image.
 
-        :raises NotFound if the image does not exist.
+        :raises ImageNotFound if the image does not exist.
         """
         # NOTE(vish): show is to check if image is available
         self.show(context, image_id)
         try:
             result = self.client.delete_image(image_id)
         except glance_exception.NotFound:
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
         return result
 
     def delete_all(self):
diff --git a/nova/image/local.py b/nova/image/local.py
index fa5e93346..5d1ff6b3e 100644
--- a/nova/image/local.py
+++ b/nova/image/local.py
@@ -86,10 +86,10 @@ class LocalImageService(service.BaseImageService):
             with open(self._path_to(image_id)) as metadata_file:
                 image_meta = json.load(metadata_file)
                 if not self._is_image_available(context, image_meta):
-                    raise exception.NotFound
+                    raise exception.ImageNotFound(image_id=image_id)
                 return image_meta
         except (IOError, ValueError):
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
 
     def show_by_name(self, context, name):
         """Returns a dict containing image data for the given name."""
@@ -102,7 +102,7 @@ class LocalImageService(service.BaseImageService):
                 image = cantidate
                 break
         if image is None:
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
         return image
 
     def get(self, context, image_id, data):
@@ -113,7 +113,7 @@ class LocalImageService(service.BaseImageService):
             with open(self._path_to(image_id, 'image')) as image_file:
                 shutil.copyfileobj(image_file, data)
         except (IOError, ValueError):
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
         return metadata
 
     def create(self, context, metadata, data=None):
@@ -143,12 +143,12 @@ class LocalImageService(service.BaseImageService):
             with open(self._path_to(image_id), 'w') as metadata_file:
                 json.dump(metadata, metadata_file)
         except (IOError, ValueError):
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
         return metadata
 
     def delete(self, context, image_id):
         """Delete the given image.
-        Raises NotFound if the image does not exist.
+        Raises ImageNotFound if the image does not exist.
 
         """
         # NOTE(vish): show is to check if image is available
@@ -156,7 +156,7 @@ class LocalImageService(service.BaseImageService):
         try:
             shutil.rmtree(self._path_to(image_id, None))
         except (IOError, ValueError):
-            raise exception.NotFound
+            raise exception.ImageNotFound(image_id=image_id)
 
     def delete_all(self):
         """Clears out all images in local directory."""