From 8d495ec52b93aadf47e62eccfc1184b2832924c5 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Jan 18 2024 12:29:28 +0000 Subject: add udev-builtin-path_id property to zfcp-attached SCSI disks Resolves: RHEL-22007 --- diff --git a/0022-add-udev-builtin-path_id-property-to-zfcp-attached-S.patch b/0022-add-udev-builtin-path_id-property-to-zfcp-attached-S.patch new file mode 100644 index 0000000..71f352a --- /dev/null +++ b/0022-add-udev-builtin-path_id-property-to-zfcp-attached-S.patch @@ -0,0 +1,60 @@ +From d7708bca72f4a7d0bfa732912e2087bd6aa8f379 Mon Sep 17 00:00:00 2001 +From: Steffen Maier +Date: Thu, 23 Feb 2023 13:28:50 +0100 +Subject: [PATCH] add udev-builtin-path_id property to zfcp-attached SCSI disks + +so anaconda can use it to display path_id information for multipath +members + +Signed-off-by: Steffen Maier +--- + blivet/devices/disk.py | 2 ++ + blivet/populator/helpers/disk.py | 1 + + tests/unit_tests/tags_test.py | 2 +- + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/blivet/devices/disk.py b/blivet/devices/disk.py +index 8842b4dc..746f6d58 100644 +--- a/blivet/devices/disk.py ++++ b/blivet/devices/disk.py +@@ -556,10 +556,12 @@ class ZFCPDiskDevice(DiskDevice): + :keyword hba_id: ??? + :keyword wwpn: ??? + :keyword fcp_lun: ??? ++ :keyword id_path: string from udev-builtin-path_id + """ + self.hba_id = kwargs.pop("hba_id") + self.wwpn = kwargs.pop("wwpn") + self.fcp_lun = kwargs.pop("fcp_lun") ++ self.id_path = kwargs.pop("id_path") + DiskDevice.__init__(self, device, **kwargs) + self._clear_local_tags() + self.tags.add(Tags.remote) +diff --git a/blivet/populator/helpers/disk.py b/blivet/populator/helpers/disk.py +index cf20d302..92e85688 100644 +--- a/blivet/populator/helpers/disk.py ++++ b/blivet/populator/helpers/disk.py +@@ -223,6 +223,7 @@ class ZFCPDevicePopulator(DiskDevicePopulator): + def _get_kwargs(self): + kwargs = super(ZFCPDevicePopulator, self)._get_kwargs() + ++ kwargs["id_path"] = udev.device_get_path(self.data) + for attr in ['hba_id', 'wwpn', 'fcp_lun']: + kwargs[attr] = udev.device_get_zfcp_attribute(self.data, attr=attr) + +diff --git a/tests/unit_tests/tags_test.py b/tests/unit_tests/tags_test.py +index 49a2d72e..15fa2a40 100644 +--- a/tests/unit_tests/tags_test.py ++++ b/tests/unit_tests/tags_test.py +@@ -72,7 +72,7 @@ class DeviceTagsTest(unittest.TestCase): + fcoe_device = FcoeDiskDevice('test6', nic=None, identifier=None, id_path=None) + self.assertIn(Tags.remote, fcoe_device.tags) + self.assertNotIn(Tags.local, fcoe_device.tags) +- zfcp_device = ZFCPDiskDevice('test7', hba_id=None, wwpn=None, fcp_lun=None) ++ zfcp_device = ZFCPDiskDevice('test7', hba_id=None, wwpn=None, fcp_lun=None, id_path=None) + self.assertIn(Tags.remote, zfcp_device.tags) + self.assertNotIn(Tags.local, zfcp_device.tags) + +-- +2.43.0 + diff --git a/python-blivet.spec b/python-blivet.spec index 02a1410..80d2878 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -23,7 +23,7 @@ Version: 3.6.0 #%%global prerelease .b2 # prerelease, if defined, should be something like .a1, .b1, .b2.dev1, or .c2 -Release: 12%{?prerelease}%{?dist} +Release: 13%{?prerelease}%{?dist} Epoch: 1 License: LGPLv2+ %global realname blivet @@ -51,6 +51,7 @@ Patch17: 0018-nvme-TP4126-fixes-1.patch Patch18: 0019-nvme-hostnqn_from_active_fabrics_connection.patch Patch19: 0020-nvme-add_unit_tests.patch Patch20: 0021-Add-support-for-creating-shared-LVM-setups.patch +Patch21: 0022-add-udev-builtin-path_id-property-to-zfcp-attached-S.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -214,6 +215,10 @@ configuration. %endif %changelog +* Thu Jan 18 2024 Vojtech Trefny - 3.6.0-13 +- add udev-builtin-path_id property to zfcp-attached SCSI disks + Resolves: RHEL-22007 + * Wed Dec 13 2023 Vojtech Trefny - 3.6.0-12 - Add support for creating shared LVM setups Resolves: RHEL-324