Makes sure all instance and volume commands that raise not found are changed to show the ec2_id instead of the internal id.

1 files changed, 12 insertions, 1 deletions

diff --git a/nova/exception.py b/nova/exception.py
index f604fd63a..7d65bd6a5 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -46,7 +46,6 @@ class Error(Exception):
 
 
 class ApiError(Error):
-
     def __init__(self, message='Unknown', code='Unknown'):
         self.message = message
         self.code = code
@@ -57,6 +56,18 @@ class NotFound(Error):
     pass
 
 
+class InstanceNotFound(NotFound):
+    def __init__(self, message, instance_id):
+        self.instance_id = instance_id
+        super(InstanceNotFound, self).__init__(message)
+
+
+class VolumeNotFound(NotFound):
+    def __init__(self, message, volume_id):
+        self.volume_id = volume_id
+        super(VolumeNotFound, self).__init__(message)
+
+
 class Duplicate(Error):
     pass