Merge "Translate cinder NotFound exception"

2 files changed, 24 insertions, 1 deletions

diff --git a/nova/tests/volume/test_cinder.py b/nova/tests/volume/test_cinder.py
index 78d2602cc..420fa2373 100644
--- a/nova/tests/volume/test_cinder.py
+++ b/nova/tests/volume/test_cinder.py
@@ -229,6 +229,14 @@ class CinderApiTestCase(test.TestCase):
 
         self.api.get_snapshot(self.ctx, snapshot_id)
 
+    def test_get_snapshot_failed(self):
+        snapshot_id = 'snapshot_id'
+        cinder.cinderclient(self.ctx).AndRaise(cinder_exception.NotFound(''))
+        self.mox.ReplayAll()
+
+        self.assertRaises(exception.SnapshotNotFound,
+                          self.api.get_snapshot, self.ctx, snapshot_id)
+
     def test_get_all_snapshots(self):
         cinder.cinderclient(self.ctx).AndReturn(self.cinderclient)
         cinder._untranslate_snapshot_summary_view(self.ctx,
diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py
index 98e548332..0d2666038 100644
--- a/nova/volume/cinder.py
+++ b/nova/volume/cinder.py
@@ -185,6 +185,18 @@ class API(base.Base):
             return exception.InvalidInput(reason=exc_value.message)
         return exc_value
 
+    def _reraise_translated_snapshot_exception(self, snapshot_id=None):
+        """Transform the exception for the snapshot but keep its traceback
+        intact."""
+        exc_type, exc_value, exc_trace = sys.exc_info()
+        new_exc = self._translate_snapshot_exception(snapshot_id, exc_value)
+        raise new_exc, None, exc_trace
+
+    def _translate_snapshot_exception(self, snapshot_id, exc_value):
+        if isinstance(exc_value, cinder_exception.NotFound):
+            return exception.SnapshotNotFound(snapshot_id=snapshot_id)
+        return exc_value
+
     def get(self, context, volume_id):
         try:
             item = cinderclient(context).volumes.get(volume_id)
@@ -280,7 +292,10 @@ class API(base.Base):
         raise NotImplementedError()
 
     def get_snapshot(self, context, snapshot_id):
-        item = cinderclient(context).volume_snapshots.get(snapshot_id)
+        try:
+            item = cinderclient(context).volume_snapshots.get(snapshot_id)
+        except Exception:
+            self._reraise_translated_snapshot_exception(snapshot_id)
         return _untranslate_snapshot_summary_view(context, item)
 
     def get_all_snapshots(self, context):