openstack
diff --git a/‎doc/source/admin/hardware_managers.rst‎
Lines changed: 9 additions & 0 deletions b/‎doc/source/admin/hardware_managers.rst‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎ironic_python_agent/hardware.py‎
Lines changed: 189 additions & 55 deletions b/‎ironic_python_agent/hardware.py‎
Lines changed: 189 additions & 55 deletions
diff --git a/‎ironic_python_agent/raid_utils.py‎
Lines changed: 35 additions & 1 deletion b/‎ironic_python_agent/raid_utils.py‎
Lines changed: 35 additions & 1 deletion
diff --git a/‎ironic_python_agent/tests/unit/samples/hardware_samples.py‎
Lines changed: 55 additions & 0 deletions b/‎ironic_python_agent/tests/unit/samples/hardware_samples.py‎
Lines changed: 55 additions & 0 deletions
@@ -121,6 +121,15 @@ containing hints to identify the drives. For example::
     'skip_block_devices': [{'name': '/dev/vda', 'vendor': '0x1af4'}]
 
 
+To prevent software RAID devices from being deleted, put their volume name
+(defined in the ``target_raid_config``) to the list.
+
+Note: one dictionary with one value for each of the logical disks.
+For example::
+
+    'skip_block_devices': [{'volume_name': 'large'}, {'volume_name': 'temp'}]
+
+
 Shared Disk Cluster Filesystems
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
@@ -267,10 +267,44 @@ def get_next_free_raid_device():
         name = f'/dev/md{idx}'
         if name not in names:
             return name
-
     raise errors.SoftwareRAIDError("No free md (RAID) devices are left")
 
 
+def get_volume_name_of_raid_device(raid_device):
+    """Get the volume name of a RAID device
+
+    :param raid_device: A Software RAID block device name.
+    :returns: volume name of the device, or None
+    """
+    if not raid_device:
+        return None
+    try:
+        out, _ = utils.execute('mdadm', '--detail', raid_device,
+                               use_standard_locale=True)
+    except processutils.ProcessExecutionError as e:
+        LOG.warning('Could not retrieve the volume name of %(dev)s: %(err)s',
+                    {'dev': raid_device, 'err': e})
+        return None
+    lines = out.splitlines()
+    for line in lines:
+        if re.search(r'Name', line) is not None:
+            split_array = line.split(':')
+            # expecting format:
+            # Name : <host>:name (optional comment)
+            if len(split_array) == 3:
+                candidate = split_array[2]
+            else:
+                return None
+            # if name is followed by some other text
+            # such as (local to host <domain>) remove
+            # everything after " "
+            if " " in candidate:
+                candidate = candidate.split(" ")[0]
+            volume_name = candidate
+            return volume_name
+    return None
+
+
 # TODO(rg): handle PreP boot parts relocation as well
 def prepare_boot_partitions_for_softraid(device, holders, efi_part,
                                          target_boot_mode):
 
@@ -1031,6 +1031,61 @@
        1     259        3        1      active sync   /dev/nvme1n1p1
 """)
 
+MDADM_DETAIL_OUTPUT_VOLUME_NAME = ("""/dev/md0:
+           Version : 1.0
+     Creation Time : Fri Feb 15 12:37:44 2019
+        Raid Level : raid1
+        Array Size : 1048512 (1023.94 MiB 1073.68 MB)
+     Used Dev Size : 1048512 (1023.94 MiB 1073.68 MB)
+      Raid Devices : 2
+     Total Devices : 2
+       Persistence : Superblock is persistent
+
+       Update Time : Fri Feb 15 12:38:02 2019
+             State : clean
+    Active Devices : 2
+   Working Devices : 2
+    Failed Devices : 0
+     Spare Devices : 0
+
+Consistency Policy : resync
+
+              Name : abc.xyz.com:this_name  (local to host abc.xyz.com)
+              UUID : 83143055:2781ddf5:2c8f44c7:9b45d92e
+            Events : 17
+
+    Number   Major   Minor   RaidDevice State
+       0     253       64        0      active sync   /dev/vde1
+       1     253       80        1      active sync   /dev/vdf1
+""")
+
+MDADM_DETAIL_OUTPUT_VOLUME_NAME_INVALID = ("""/dev/md0:
+           Version : 1.0
+     Creation Time : Fri Feb 15 12:37:44 2019
+        Raid Level : raid1
+        Array Size : 1048512 (1023.94 MiB 1073.68 MB)
+     Used Dev Size : 1048512 (1023.94 MiB 1073.68 MB)
+      Raid Devices : 2
+     Total Devices : 2
+       Persistence : Superblock is persistent
+
+       Update Time : Fri Feb 15 12:38:02 2019
+             State : clean
+    Active Devices : 2
+   Working Devices : 2
+    Failed Devices : 0
+     Spare Devices : 0
+
+Consistency Policy : resync
+
+              UUID : 83143055:2781ddf5:2c8f44c7:9b45d92e
+            Events : 17
+
+    Number   Major   Minor   RaidDevice State
+       0     253       64        0      active sync   /dev/vde1
+       1     253       80        1      active sync   /dev/vdf1
+""")
+
 MDADM_DETAIL_OUTPUT_BROKEN_RAID0 = ("""/dev/md126:
            Version : 1.2
         Raid Level : raid0