Fix error in in-band disk erase using shred

ramineni · ramineni · commit 8cef029d0d05 · 2015-05-08T15:02:36.000+05:30
in-band disk erase using shred fails with error "'module' object has no
attribute 'ProcessExecutionError'". This commit is to fix the issue.

Change-Id: Ia0c426074b2f0e9d534ed96a3e213933160edc61
Closes-Bug:#144799
diff --git a/ironic_python_agent/hardware.py b/ironic_python_agent/hardware.py
@@ -18,6 +18,7 @@
 import shlex
 
 import netifaces
+from oslo_concurrency import processutils
 from oslo_log import log
 from oslo_utils import units
 import psutil
@@ -454,7 +455,10 @@ def _shred_block_device(self, block_device):
         try:
             utils.execute('shred', '--force', '--zero', '--verbose',
                           '--iterations', '1', block_device.name)
-        except errors.ProcessExecutionError:
+        except (processutils.ProcessExecutionError, OSError) as e:
+            msg = ("Erasing block device %(dev)s failed with error %(err)s ",
+                  {'dev': block_device.name, 'err': e})
+            LOG.error(msg)
             return False
 
         return True
diff --git a/ironic_python_agent/tests/hardware.py b/ironic_python_agent/tests/hardware.py
@@ -14,6 +14,7 @@
 
 import mock
 import os
+from oslo_concurrency import processutils
 from oslotest import base as test_base
 import pyudev
 import six
@@ -502,6 +503,26 @@ def test__is_virtual_media_device_path_doesnt_exist(self, mocked_exists,
         mocked_exists.assert_called_once_with('/dev/disk/by-label/ir-vfd-dev')
         self.assertFalse(mocked_link.called)
 
+    @mock.patch.object(utils, 'execute')
+    def test_erase_block_device_shred_fail_oserror(self, mocked_execute):
+        mocked_execute.side_effect = OSError
+        block_device = hardware.BlockDevice('/dev/sda', 'big', 1073741824,
+                                            True)
+        res = self.hardware._shred_block_device(block_device)
+        self.assertFalse(res)
+        mocked_execute.assert_called_once_with('shred', '--force', '--zero',
+            '--verbose', '--iterations', '1', '/dev/sda')
+
+    @mock.patch.object(utils, 'execute')
+    def test_erase_block_device_shred_fail_processerror(self, mocked_execute):
+        mocked_execute.side_effect = processutils.ProcessExecutionError
+        block_device = hardware.BlockDevice('/dev/sda', 'big', 1073741824,
+                                            True)
+        res = self.hardware._shred_block_device(block_device)
+        self.assertFalse(res)
+        mocked_execute.assert_called_once_with('shred', '--force', '--zero',
+            '--verbose', '--iterations', '1', '/dev/sda')
+
     @mock.patch.object(utils, 'execute')
     def test_erase_block_device_ata_security_enabled(self, mocked_execute):
         hdparm_output = HDPARM_INFO_TEMPLATE % {
