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

When LUN ID >= 256, systemd udev function format_lun_number() generates
an address of the form "lun-0x...".
Due to this, using int(lun) fails with a backtrace.

Signed-off-by: Renaud Métrich <[email protected]>

Author: rmetrich

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