Fix inband disk erase using agent_ilo driver

ramineni · ramineni · commit efba46a8a26a · 2015-05-07T09:51:11.000+05:30
In-band disk erase using shred fails for agent_ilo driver as it tries to
erase the virtual floppy device attached.This fix is to skip the virtual
media devices and continue with other disks.

Change-Id: I26745985382d440f7d4b3fbfffb14545067fcca6
Closes-Bug:#1450298
diff --git a/ironic_python_agent/hardware.py b/ironic_python_agent/hardware.py
@@ -427,6 +427,13 @@ def match(hint, current_value, device):
                     "deployment using these hints %s" % root_device_hints)
 
     def erase_block_device(self, block_device):
+
+        # Check if the block device is virtual media and skip the device.
+        if self._is_virtual_media_device(block_device):
+            LOG.info("Skipping the erase of virtual media device %s",
+                     block_device.name)
+            return
+
         if self._ata_erase(block_device):
             return
 
@@ -452,6 +459,21 @@ def _shred_block_device(self, block_device):
 
         return True
 
+    def _is_virtual_media_device(self, block_device):
+        """Check if the block device corresponds to Virtual Media device.
+
+        :param block_device: a BlockDevice object
+        :returns: True if it's a virtual media device, else False
+        """
+        vm_device_label = '/dev/disk/by-label/ir-vfd-dev'
+        if os.path.exists(vm_device_label):
+            link = os.readlink(vm_device_label)
+            device = os.path.normpath(os.path.join(os.path.dirname(
+                                                  vm_device_label), link))
+            if block_device.name == device:
+                return True
+        return False
+
     def _get_ata_security_lines(self, block_device):
         output = utils.execute('hdparm', '-I', block_device.name)[0]
 
diff --git a/ironic_python_agent/tests/hardware.py b/ironic_python_agent/tests/hardware.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import mock
+import os
 from oslotest import base as test_base
 import pyudev
 import six
@@ -454,6 +455,53 @@ def test_erase_block_device_notsupported_shred(self, mocked_execute):
                       '--iterations', '1', '/dev/sda')
         ])
 
+    @mock.patch.object(hardware.GenericHardwareManager,
+                       '_is_virtual_media_device', autospec=True)
+    def test_erase_block_device_virtual_media(self, vm_mock):
+        vm_mock.return_value = True
+        block_device = hardware.BlockDevice('/dev/sda', 'big', 1073741824,
+                                            True)
+        self.hardware.erase_block_device(block_device)
+        vm_mock.assert_called_once_with(self.hardware, block_device)
+
+    @mock.patch.object(os, 'readlink', autospec=True)
+    @mock.patch.object(os.path, 'exists', autospec=True)
+    def test__is_virtual_media_device_exists(self, mocked_exists,
+                                             mocked_link):
+        mocked_exists.return_value = True
+        mocked_link.return_value = '../../sda'
+        block_device = hardware.BlockDevice('/dev/sda', 'big', 1073741824,
+                                            True)
+        res = self.hardware._is_virtual_media_device(block_device)
+        self.assertTrue(res)
+        mocked_exists.assert_called_once_with('/dev/disk/by-label/ir-vfd-dev')
+        mocked_link.assert_called_once_with('/dev/disk/by-label/ir-vfd-dev')
+
+    @mock.patch.object(os, 'readlink', autospec=True)
+    @mock.patch.object(os.path, 'exists', autospec=True)
+    def test__is_virtual_media_device_exists_no_match(self, mocked_exists,
+                                                      mocked_link):
+        mocked_exists.return_value = True
+        mocked_link.return_value = '../../sdb'
+        block_device = hardware.BlockDevice('/dev/sda', 'big', 1073741824,
+                                            True)
+        res = self.hardware._is_virtual_media_device(block_device)
+        self.assertFalse(res)
+        mocked_exists.assert_called_once_with('/dev/disk/by-label/ir-vfd-dev')
+        mocked_link.assert_called_once_with('/dev/disk/by-label/ir-vfd-dev')
+
+    @mock.patch.object(os, 'readlink', autospec=True)
+    @mock.patch.object(os.path, 'exists', autospec=True)
+    def test__is_virtual_media_device_path_doesnt_exist(self, mocked_exists,
+                                             mocked_link):
+        mocked_exists.return_value = False
+        block_device = hardware.BlockDevice('/dev/sda', 'big', 1073741824,
+                                            True)
+        res = self.hardware._is_virtual_media_device(block_device)
+        self.assertFalse(res)
+        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_ata_security_enabled(self, mocked_execute):
         hdparm_output = HDPARM_INFO_TEMPLATE % {
