Merge pull request #22 from shibutd/fix-partition-table-parsing

CLOS-2786: Fix detection when a bootable partition in on RAID

Author: prilr

repos/system_upgrade/el7toel8/actors/scangrubdevpartitionlayout/libraries/scan_layout.py

@@ -65,7 +65,6 @@ def get_partition_layout(device):
         if not line.startswith('Device'):
             continue
 
-        part_all_attrs = split_on_space_segments(line)
         break
 
     partitions = []
@@ -76,7 +75,7 @@ def get_partition_layout(device):
 
         # If the partition is not bootable, the Boot column might be empty
         part_device = part_info[0]
-        part_start = int(part_info[2]) if len(part_info) == len(part_all_attrs) else int(part_info[1])
+        part_start = int(part_info[2]) if part_info[1] == '*' else int(part_info[1])
         partitions.append(PartitionInfo(part_device=part_device, start_offset=part_start*unit))
 
     return GRUBDevicePartitionLayout(device=device, partitions=partitions)

repos/system_upgrade/el7toel8/actors/scangrubdevpartitionlayout/tests/test_scan_partition_layout.py

@@ -31,7 +31,8 @@
         )
     ]
 )
-def test_get_partition_layout(monkeypatch, devices):
+@pytest.mark.parametrize('fs', ('Linux', 'Linux raid autodetect'))
+def test_get_partition_layout(monkeypatch, devices, fs):
     device_to_fdisk_output = {}
     for device in devices:
         fdisk_output = [
@@ -45,7 +46,7 @@ def test_get_partition_layout(monkeypatch, devices):
             '   Device Boot      Start         End      Blocks   Id  System',
         ]
         for part in device.partitions:
-            part_line = '{0}   *     {1}     2099199     1048576   83  Linux'.format(part.name, part.start_offset)
+            part_line = '{0}   *     {1}     2099199     1048576   83  {2}'.format(part.name, part.start_offset, fs)
             fdisk_output.append(part_line)
 
         device_to_fdisk_output[device.name] = fdisk_output