update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try

[osm/SO.git] / rwcal / plugins / vala / rwcal_openstack / rift / rwcal / openstack / cinder / cinder_drv.py

diff --git a/rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/cinder/cinder_drv.py b/rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/cinder/cinder_drv.py
index 5bb5cc4..9c4bdb2 100644 (file)
--- a/rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/cinder/cinder_drv.py
+++ b/rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/cinder/cinder_drv.py
@@ -155,6 +155,8 @@ class CinderDriver(object):
           """
           try:
               vol = self._ci_drv.volumes.get(volume_id)
+          except ciclient.exceptions.NotFound:
+              return None
           except Exception as e:
               self.log.error("Get volume operation failed. Exception: %s", str(e))
               raise