Merge pull request #1427 from vojtechtrefny/main_iscsi-lun-fix

iSCSI: don't crash when LUN ID >= 256

Author: vojtechtrefny

blivet/devices/disk.py

@@ -28,6 +28,7 @@
 from gi.repository import GLib
 
 import os
+import re
 from collections import namedtuple
 
 from .. import errors
@@ -354,8 +355,17 @@ def __init__(self, device, **kwargs):
         self.offload = kwargs.pop("offload")
         name = kwargs.pop("name")
         self.target = kwargs.pop("target")
+        lun = kwargs.pop("lun")
         try:
-            self.lun = int(kwargs.pop("lun"))
+            self.lun = int(lun)
+        except ValueError:
+            # See systemd udev function format_lun_number()
+            m = re.fullmatch('0x([0-9a-fA-F]{4})([0-9a-fA-F]{4})00000000', lun)
+            if m is None:
+                log.warning("Failed to extract hex from lun '%s'", lun)
+                self.lun = None
+            else:
+                self.lun = int(m.group(1), 16) + (1 << 16) * int(m.group(2), 16)
         except TypeError as e:
             log.warning("Failed to set lun attribute of iscsi disk: %s", e)
             self.lun = None

tests/unit_tests/devices_test/disk_test.py

@@ -1,7 +1,7 @@
 import unittest
 from unittest.mock import patch
 
-from blivet.devices import DiskDevice
+from blivet.devices import DiskDevice, iScsiDiskDevice
 from blivet.devicelibs import disk as disklib
 from blivet.devicelibs import raid
 from blivet.size import Size
@@ -47,3 +47,16 @@ def test_disk_raid_properties(self):
             self.assertIsNone(test3.raid_level)
             self.assertIsNone(test3.raid_stripe_size)
             self.assertIsNone(test3.raid_disk_count)
+
+
+class iScsiDiskDeviceTestCase(unittest.TestCase):
+    def test_iscsi_lun(self):
+        kwargs = {"node": "", "ibft": "", "nic": "", "initiator": "",
+                  "offload": False, "name": "", "target": "",
+                  "address": "", "port": "", "iface": "", "id_path": ""}
+
+        disk1 = iScsiDiskDevice("test1", lun="1", **kwargs)
+        self.assertEqual(disk1.lun, 1)
+
+        disk2 = iScsiDiskDevice("test1", lun="0x0101000000000000", **kwargs)
+        self.assertEqual(disk2.lun, 257)