Ensure volume exists before deleting.

fixes bug 1130744 Change-Id: I39152dd1caa5ab1b2cfbae56eaec8c8fa309669c
openstack · Feb 20, 2013 · 34284b7 · 34284b7
1 parent d5ac3cb
commit 34284b7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/cinder/volume/drivers/san/hp_lefthand.py b/cinder/volume/drivers/san/hp_lefthand.py
@@ -220,8 +220,11 @@ def delete_volume(self, volume):
         cliq_args = {}
         cliq_args['volumeName'] = volume['name']
         cliq_args['prompt'] = 'false'  # Don't confirm
-
-        self._cliq_run_xml("deleteVolume", cliq_args)
+        try:
+            volume_info = self._cliq_get_volume_info(volume['name'])
+            self._cliq_run_xml("deleteVolume", cliq_args)
+        except Exception:
+            LOG.exception("Volume did not exist. It will not be deleted")
 
     def local_path(self, volume):
         msg = _("local_path not supported")