import python-blivet-3.6.0-4.el8
This commit is contained in:
parent
1e883b6d67
commit
3d132c95da
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
SOURCES/blivet-3.4.0-tests.tar.gz
|
||||
SOURCES/blivet-3.4.0.tar.gz
|
||||
SOURCES/blivet-3.6.0-tests.tar.gz
|
||||
SOURCES/blivet-3.6.0.tar.gz
|
||||
|
@ -1,2 +1,2 @@
|
||||
d0a86df7bbaeda7be9990b7f7b15ec36b325ec7a SOURCES/blivet-3.4.0-tests.tar.gz
|
||||
aafc429e224dfd204cb1c284bb70de52920f7b20 SOURCES/blivet-3.4.0.tar.gz
|
||||
8393baa22cb433d1012e3923ad0bc232401116c6 SOURCES/blivet-3.6.0-tests.tar.gz
|
||||
e9d95c1165703fed3da1f35a9199197bfff68f98 SOURCES/blivet-3.6.0.tar.gz
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 2f90040ff66eacc9715e370cd49ffb72d8d1f36f Mon Sep 17 00:00:00 2001
|
||||
From 83ccc9f9f14845fcce7a5ba5fa21fbb97b1dbbb7 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Wed, 11 Jul 2018 15:36:24 +0200
|
||||
Subject: [PATCH] Force command line based libblockdev LVM plugin
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH] Force command line based libblockdev LVM plugin
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/blivet/__init__.py b/blivet/__init__.py
|
||||
index c5a75bb..cb75917 100644
|
||||
index dd8d0f54..62cc539a 100644
|
||||
--- a/blivet/__init__.py
|
||||
+++ b/blivet/__init__.py
|
||||
@@ -63,11 +63,16 @@ gi.require_version("BlockDev", "2.0")
|
||||
@ -31,5 +31,5 @@ index c5a75bb..cb75917 100644
|
||||
# do not check for dependencies during libblockdev initializtion, do runtime
|
||||
# checks instead
|
||||
--
|
||||
1.8.3.1
|
||||
2.38.1
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6bf3378d3d2a1b6a4338df0c4dd36a783a641633 Mon Sep 17 00:00:00 2001
|
||||
From c098d4112635b3ea55d5bd7e1817edbd519735fc Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Mon, 16 Jul 2018 14:26:11 +0200
|
||||
Subject: [PATCH] Remove btrfs from requested libblockdev plugins
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH] Remove btrfs from requested libblockdev plugins
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/blivet/__init__.py b/blivet/__init__.py
|
||||
index cb75917..09f8b1c 100644
|
||||
index 62cc539a..bbc7ea3a 100644
|
||||
--- a/blivet/__init__.py
|
||||
+++ b/blivet/__init__.py
|
||||
@@ -63,9 +63,9 @@ gi.require_version("BlockDev", "2.0")
|
||||
@ -24,5 +24,5 @@ index cb75917..09f8b1c 100644
|
||||
_requested_plugins = blockdev.plugin_specs_from_names(_REQUESTED_PLUGIN_NAMES)
|
||||
# XXX force non-dbus LVM plugin
|
||||
--
|
||||
1.8.3.1
|
||||
2.38.1
|
||||
|
||||
|
@ -1,19 +1,19 @@
|
||||
From 3a42d9e2afdf04dbbfd2c507f5b2392193fda25b Mon Sep 17 00:00:00 2001
|
||||
From f6f90805020d7c6ac46f17a13a00f319fc4351f6 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Wed, 26 May 2021 12:15:54 +0200
|
||||
Subject: [PATCH] Revert "More consistent lvm errors (API break)"
|
||||
|
||||
This reverts commit 49ec071c6d0673224a0774d613904387c52c7381.
|
||||
---
|
||||
blivet/devices/lvm.py | 72 +++++++++++++++++-----------------
|
||||
tests/devices_test/lvm_test.py | 14 +++----
|
||||
blivet/devices/lvm.py | 72 +++++++++++------------
|
||||
tests/unit_tests/devices_test/lvm_test.py | 14 ++---
|
||||
2 files changed, 43 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py
|
||||
index a55515fc..6d23bfba 100644
|
||||
index 38e49e18..b8595d63 100644
|
||||
--- a/blivet/devices/lvm.py
|
||||
+++ b/blivet/devices/lvm.py
|
||||
@@ -307,7 +307,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
|
||||
@@ -304,7 +304,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
|
||||
def _add_log_vol(self, lv):
|
||||
""" Add an LV to this VG. """
|
||||
if lv in self._lvs:
|
||||
@ -22,7 +22,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
# verify we have the space, then add it
|
||||
# do not verify for growing vg (because of ks)
|
||||
@@ -340,7 +340,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
|
||||
@@ -337,7 +337,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
|
||||
def _remove_log_vol(self, lv):
|
||||
""" Remove an LV from this VG. """
|
||||
if lv not in self.lvs:
|
||||
@ -31,7 +31,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
self._lvs.remove(lv)
|
||||
|
||||
@@ -415,7 +415,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
|
||||
@@ -430,7 +430,7 @@ class LVMVolumeGroupDevice(ContainerDevice):
|
||||
@thpool_reserve.setter
|
||||
def thpool_reserve(self, value):
|
||||
if value is not None and not isinstance(value, ThPoolReserveSpec):
|
||||
@ -40,8 +40,8 @@ index a55515fc..6d23bfba 100644
|
||||
self._thpool_reserve = value
|
||||
|
||||
@property
|
||||
@@ -646,14 +646,14 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
|
||||
if seg_type not in [None, "linear", "thin", "thin-pool", "cache", "vdo-pool", "vdo"] + lvm.raid_seg_types:
|
||||
@@ -665,14 +665,14 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
|
||||
if seg_type not in [None, "linear", "thin", "thin-pool", "cache", "vdo-pool", "vdo", "cache-pool"] + lvm.raid_seg_types:
|
||||
raise ValueError("Invalid or unsupported segment type: %s" % seg_type)
|
||||
if seg_type and seg_type in lvm.raid_seg_types and not pvs:
|
||||
- raise errors.DeviceError("List of PVs has to be given for every non-linear LV")
|
||||
@ -60,7 +60,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
# When this device's format is set in the superclass constructor it will
|
||||
# try to access self.snapshots.
|
||||
@@ -702,13 +702,13 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
|
||||
@@ -721,13 +721,13 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
|
||||
self._from_lvs = from_lvs
|
||||
if self._from_lvs:
|
||||
if exists:
|
||||
@ -78,7 +78,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
self._cache = None
|
||||
if cache_request and not self.exists:
|
||||
@@ -723,13 +723,13 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
|
||||
@@ -746,13 +746,13 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
|
||||
elif isinstance(pv_spec, StorageDevice):
|
||||
self._pv_specs.append(LVPVSpec(pv_spec, Size(0)))
|
||||
else:
|
||||
@ -94,7 +94,7 @@ index a55515fc..6d23bfba 100644
|
||||
if self._pv_specs:
|
||||
self._assign_pv_space()
|
||||
|
||||
@@ -1072,7 +1072,7 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
|
||||
@@ -1130,7 +1130,7 @@ class LVMLogicalVolumeBase(DMDevice, RaidDevice):
|
||||
else:
|
||||
msg = "the specified internal LV '%s' doesn't belong to this LV ('%s')" % (int_lv.lv_name,
|
||||
self.name)
|
||||
@ -103,7 +103,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
def populate_ksdata(self, data):
|
||||
super(LVMLogicalVolumeBase, self).populate_ksdata(data)
|
||||
@@ -1171,7 +1171,7 @@ class LVMInternalLogicalVolumeMixin(object):
|
||||
@@ -1229,7 +1229,7 @@ class LVMInternalLogicalVolumeMixin(object):
|
||||
def _init_check(self):
|
||||
# an internal LV should have no parents
|
||||
if self._parent_lv and self._parents:
|
||||
@ -112,7 +112,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
@property
|
||||
def is_internal_lv(self):
|
||||
@@ -1231,7 +1231,7 @@ class LVMInternalLogicalVolumeMixin(object):
|
||||
@@ -1289,7 +1289,7 @@ class LVMInternalLogicalVolumeMixin(object):
|
||||
|
||||
@readonly.setter
|
||||
def readonly(self, value): # pylint: disable=unused-argument
|
||||
@ -121,7 +121,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
@property
|
||||
def type(self):
|
||||
@@ -1267,7 +1267,7 @@ class LVMInternalLogicalVolumeMixin(object):
|
||||
@@ -1325,7 +1325,7 @@ class LVMInternalLogicalVolumeMixin(object):
|
||||
def _check_parents(self):
|
||||
# an internal LV should have no parents
|
||||
if self._parents:
|
||||
@ -130,7 +130,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
def _add_to_parents(self):
|
||||
# nothing to do here, an internal LV has no parents (in the DeviceTree's
|
||||
@@ -1277,13 +1277,13 @@ class LVMInternalLogicalVolumeMixin(object):
|
||||
@@ -1335,13 +1335,13 @@ class LVMInternalLogicalVolumeMixin(object):
|
||||
# internal LVs follow different rules limitting size
|
||||
def _set_size(self, newsize):
|
||||
if not isinstance(newsize, Size):
|
||||
@ -146,7 +146,7 @@ index a55515fc..6d23bfba 100644
|
||||
else:
|
||||
# same rules apply as for any other LV
|
||||
raise NotTypeSpecific()
|
||||
@@ -1361,18 +1361,18 @@ class LVMSnapshotMixin(object):
|
||||
@@ -1419,18 +1419,18 @@ class LVMSnapshotMixin(object):
|
||||
return
|
||||
|
||||
if self.origin and not isinstance(self.origin, LVMLogicalVolumeDevice):
|
||||
@ -169,7 +169,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
@property
|
||||
def is_snapshot_lv(self):
|
||||
@@ -1544,7 +1544,7 @@ class LVMThinPoolMixin(object):
|
||||
@@ -1606,7 +1606,7 @@ class LVMThinPoolMixin(object):
|
||||
def _check_from_lvs(self):
|
||||
if self._from_lvs:
|
||||
if len(self._from_lvs) != 2:
|
||||
@ -178,7 +178,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
def _convert_from_lvs(self):
|
||||
data_lv, metadata_lv = self._from_lvs
|
||||
@@ -1590,7 +1590,7 @@ class LVMThinPoolMixin(object):
|
||||
@@ -1652,7 +1652,7 @@ class LVMThinPoolMixin(object):
|
||||
def _add_log_vol(self, lv):
|
||||
""" Add an LV to this pool. """
|
||||
if lv in self._lvs:
|
||||
@ -187,7 +187,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
# TODO: add some checking to prevent overcommit for preexisting
|
||||
self.vg._add_log_vol(lv)
|
||||
@@ -1601,7 +1601,7 @@ class LVMThinPoolMixin(object):
|
||||
@@ -1663,7 +1663,7 @@ class LVMThinPoolMixin(object):
|
||||
def _remove_log_vol(self, lv):
|
||||
""" Remove an LV from this pool. """
|
||||
if lv not in self._lvs:
|
||||
@ -196,7 +196,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
self._lvs.remove(lv)
|
||||
self.vg._remove_log_vol(lv)
|
||||
@@ -1711,14 +1711,14 @@ class LVMThinLogicalVolumeMixin(object):
|
||||
@@ -1772,14 +1772,14 @@ class LVMThinLogicalVolumeMixin(object):
|
||||
"""Check that this device has parents as expected"""
|
||||
if isinstance(self.parents, (list, ParentList)):
|
||||
if len(self.parents) != 1:
|
||||
@ -213,7 +213,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
@property
|
||||
def is_thin_lv(self):
|
||||
@@ -1755,7 +1755,7 @@ class LVMThinLogicalVolumeMixin(object):
|
||||
@@ -1816,7 +1816,7 @@ class LVMThinLogicalVolumeMixin(object):
|
||||
|
||||
def _set_size(self, newsize):
|
||||
if not isinstance(newsize, Size):
|
||||
@ -222,7 +222,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
newsize = self.vg.align(newsize)
|
||||
newsize = self.vg.align(util.numeric_type(newsize))
|
||||
@@ -2229,7 +2229,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
|
||||
@@ -2499,7 +2499,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
|
||||
container = self.parents
|
||||
|
||||
if not isinstance(container, LVMVolumeGroupDevice):
|
||||
@ -231,7 +231,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
@type_specific
|
||||
def _add_to_parents(self):
|
||||
@@ -2240,12 +2240,12 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
|
||||
@@ -2510,12 +2510,12 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
|
||||
@type_specific
|
||||
def _check_from_lvs(self):
|
||||
"""Check the LVs to create this LV from"""
|
||||
@ -246,7 +246,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
@property
|
||||
def external_dependencies(self):
|
||||
@@ -2265,7 +2265,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
|
||||
@@ -2535,7 +2535,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
|
||||
@type_specific
|
||||
def _set_size(self, newsize):
|
||||
if not isinstance(newsize, Size):
|
||||
@ -255,7 +255,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
newsize = self.vg.align(newsize)
|
||||
log.debug("trying to set lv %s size to %s", self.name, newsize)
|
||||
@@ -2274,7 +2274,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
|
||||
@@ -2544,7 +2544,7 @@ class LVMLogicalVolumeDevice(LVMLogicalVolumeBase, LVMInternalLogicalVolumeMixin
|
||||
# space for it. A similar reasoning applies to shrinking the LV.
|
||||
if not self.exists and newsize > self.size and newsize > self.vg.free_space + self.vg_space_used:
|
||||
log.error("failed to set size: %s short", newsize - (self.vg.free_space + self.vg_space_used))
|
||||
@ -264,7 +264,7 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
LVMLogicalVolumeBase._set_size(self, newsize)
|
||||
|
||||
@@ -2622,7 +2622,7 @@ class LVMCache(Cache):
|
||||
@@ -2910,7 +2910,7 @@ class LVMCache(Cache):
|
||||
spec.size = spec.pv.format.free
|
||||
space_to_assign -= spec.pv.format.free
|
||||
if space_to_assign > 0:
|
||||
@ -273,11 +273,11 @@ index a55515fc..6d23bfba 100644
|
||||
|
||||
@property
|
||||
def size(self):
|
||||
diff --git a/tests/devices_test/lvm_test.py b/tests/devices_test/lvm_test.py
|
||||
index 670c91c9..4156d0bf 100644
|
||||
--- a/tests/devices_test/lvm_test.py
|
||||
+++ b/tests/devices_test/lvm_test.py
|
||||
@@ -36,10 +36,10 @@ class LVMDeviceTest(unittest.TestCase):
|
||||
diff --git a/tests/unit_tests/devices_test/lvm_test.py b/tests/unit_tests/devices_test/lvm_test.py
|
||||
index 47613fdc..995c2da4 100644
|
||||
--- a/tests/unit_tests/devices_test/lvm_test.py
|
||||
+++ b/tests/unit_tests/devices_test/lvm_test.py
|
||||
@@ -32,10 +32,10 @@ class LVMDeviceTest(unittest.TestCase):
|
||||
lv = LVMLogicalVolumeDevice("testlv", parents=[vg],
|
||||
fmt=blivet.formats.get_format("xfs"))
|
||||
|
||||
@ -290,7 +290,7 @@ index 670c91c9..4156d0bf 100644
|
||||
LVMLogicalVolumeDevice("snap1", parents=[vg], vorigin=True)
|
||||
|
||||
lv.exists = True
|
||||
@@ -64,7 +64,7 @@ class LVMDeviceTest(unittest.TestCase):
|
||||
@@ -60,7 +60,7 @@ class LVMDeviceTest(unittest.TestCase):
|
||||
pool = LVMLogicalVolumeDevice("pool1", parents=[vg], size=Size("500 MiB"), seg_type="thin-pool")
|
||||
thinlv = LVMLogicalVolumeDevice("thinlv", parents=[pool], size=Size("200 MiB"), seg_type="thin")
|
||||
|
||||
@ -299,7 +299,7 @@ index 670c91c9..4156d0bf 100644
|
||||
LVMLogicalVolumeDevice("snap1", parents=[pool], origin=pv, seg_type="thin")
|
||||
|
||||
# now make the constructor succeed so we can test some properties
|
||||
@@ -258,21 +258,21 @@ class LVMDeviceTest(unittest.TestCase):
|
||||
@@ -310,21 +310,21 @@ class LVMDeviceTest(unittest.TestCase):
|
||||
vg = LVMVolumeGroupDevice("testvg", parents=[pv, pv2])
|
||||
|
||||
# pvs have to be specified for non-linear LVs
|
||||
@ -326,5 +326,5 @@ index 670c91c9..4156d0bf 100644
|
||||
pv_spec2 = LVPVSpec(pv2, Size("250 MiB"))
|
||||
lv = LVMLogicalVolumeDevice("testlv", parents=[vg], size=Size("512 MiB"),
|
||||
--
|
||||
2.31.1
|
||||
2.38.1
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 42042e7fb6177d3cfe5568e358a38278925a2624 Mon Sep 17 00:00:00 2001
|
||||
From d8a8d96450bf0d3458671b9b7d23d972aa540396 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Wed, 26 May 2021 12:27:34 +0200
|
||||
Subject: [PATCH] Revert "Terminology cleanups"
|
||||
@ -8,32 +8,32 @@ This reverts following commits:
|
||||
- 63c9c7165e5cdfa4a47dcf0ed9d717b71e7921f2
|
||||
- 8956b9af8a785ae25e0e7153d2ef0702ce2f567c
|
||||
---
|
||||
blivet/devicefactory.py | 24 +++++-----
|
||||
blivet/devices/dm.py | 9 +++-
|
||||
blivet/devices/loop.py | 20 ++++----
|
||||
blivet/devices/luks.py | 26 +++++-----
|
||||
blivet/errors.py | 2 +-
|
||||
blivet/partitioning.py | 22 +++++++--
|
||||
blivet/populator/helpers/dm.py | 4 +-
|
||||
blivet/populator/helpers/luks.py | 4 +-
|
||||
blivet/populator/helpers/lvm.py | 2 +-
|
||||
blivet/populator/helpers/mdraid.py | 14 +++---
|
||||
blivet/populator/helpers/multipath.py | 8 ++--
|
||||
blivet/populator/populator.py | 69 ++++++++++++++-------------
|
||||
blivet/threads.py | 3 +-
|
||||
blivet/udev.py | 34 ++++++-------
|
||||
tests/devicefactory_test.py | 10 ++--
|
||||
tests/devices_test/size_test.py | 6 +--
|
||||
tests/populator_test.py | 34 ++++++-------
|
||||
tests/udev_test.py | 12 ++---
|
||||
tests/vmtests/vmbackedtestcase.py | 2 +-
|
||||
19 files changed, 168 insertions(+), 137 deletions(-)
|
||||
blivet/devicefactory.py | 24 +++----
|
||||
blivet/devices/dm.py | 9 ++-
|
||||
blivet/devices/loop.py | 20 +++---
|
||||
blivet/devices/luks.py | 26 ++++---
|
||||
blivet/errors.py | 2 +-
|
||||
blivet/partitioning.py | 22 +++++-
|
||||
blivet/populator/helpers/dm.py | 4 +-
|
||||
blivet/populator/helpers/luks.py | 4 +-
|
||||
blivet/populator/helpers/lvm.py | 2 +-
|
||||
blivet/populator/helpers/mdraid.py | 14 ++--
|
||||
blivet/populator/helpers/multipath.py | 8 +--
|
||||
blivet/populator/populator.py | 67 ++++++++++---------
|
||||
blivet/threads.py | 3 +-
|
||||
blivet/udev.py | 34 +++++-----
|
||||
tests/unit_tests/devicefactory_test.py | 10 +--
|
||||
.../devices_test/device_size_test.py | 6 +-
|
||||
tests/unit_tests/populator_test.py | 34 +++++-----
|
||||
tests/unit_tests/udev_test.py | 12 ++--
|
||||
tests/vmtests/vmbackedtestcase.py | 2 +-
|
||||
19 files changed, 167 insertions(+), 136 deletions(-)
|
||||
|
||||
diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
|
||||
index 0f7fdfa1..f56bd9a3 100644
|
||||
index 6f460f6d..90082c28 100644
|
||||
--- a/blivet/devicefactory.py
|
||||
+++ b/blivet/devicefactory.py
|
||||
@@ -849,12 +849,12 @@ class DeviceFactory(object):
|
||||
@@ -859,12 +859,12 @@ class DeviceFactory(object):
|
||||
parent_container.parents.remove(orig_device)
|
||||
|
||||
if self.encrypted and isinstance(self.device, LUKSDevice) and \
|
||||
@ -50,7 +50,7 @@ index 0f7fdfa1..f56bd9a3 100644
|
||||
|
||||
def _set_name(self):
|
||||
if not self.device_name:
|
||||
@@ -1173,11 +1173,11 @@ class PartitionSetFactory(PartitionFactory):
|
||||
@@ -1201,11 +1201,11 @@ class PartitionSetFactory(PartitionFactory):
|
||||
container.parents.remove(member)
|
||||
self.storage.destroy_device(member)
|
||||
members.remove(member)
|
||||
@ -65,7 +65,7 @@ index 0f7fdfa1..f56bd9a3 100644
|
||||
|
||||
continue
|
||||
|
||||
@@ -1199,10 +1199,10 @@ class PartitionSetFactory(PartitionFactory):
|
||||
@@ -1227,10 +1227,10 @@ class PartitionSetFactory(PartitionFactory):
|
||||
|
||||
continue
|
||||
|
||||
@ -80,7 +80,7 @@ index 0f7fdfa1..f56bd9a3 100644
|
||||
|
||||
##
|
||||
# Prepare previously allocated member partitions for reallocation.
|
||||
@@ -1262,7 +1262,7 @@ class PartitionSetFactory(PartitionFactory):
|
||||
@@ -1290,7 +1290,7 @@ class PartitionSetFactory(PartitionFactory):
|
||||
|
||||
if isinstance(member, LUKSDevice):
|
||||
self.storage.destroy_device(member)
|
||||
@ -90,7 +90,7 @@ index 0f7fdfa1..f56bd9a3 100644
|
||||
self.storage.destroy_device(member)
|
||||
|
||||
diff --git a/blivet/devices/dm.py b/blivet/devices/dm.py
|
||||
index 3529f61c..508a6f89 100644
|
||||
index 2f936170..ae25e8e6 100644
|
||||
--- a/blivet/devices/dm.py
|
||||
+++ b/blivet/devices/dm.py
|
||||
@@ -154,6 +154,11 @@ class DMDevice(StorageDevice):
|
||||
@ -178,7 +178,7 @@ index 0f4d7775..78f88d7d 100644
|
||||
+ def slave(self):
|
||||
+ return self.parents[0]
|
||||
diff --git a/blivet/devices/luks.py b/blivet/devices/luks.py
|
||||
index 5d6d6c65..555f1acd 100644
|
||||
index 2eb1f130..5ab840ea 100644
|
||||
--- a/blivet/devices/luks.py
|
||||
+++ b/blivet/devices/luks.py
|
||||
@@ -66,13 +66,17 @@ class LUKSDevice(DMCryptDevice):
|
||||
@ -270,10 +270,10 @@ index 5d6d6c65..555f1acd 100644
|
||||
super(LUKSDevice, self).populate_ksdata(data)
|
||||
|
||||
diff --git a/blivet/errors.py b/blivet/errors.py
|
||||
index fd51283f..f6bf853a 100644
|
||||
index b886ffec..30c9921a 100644
|
||||
--- a/blivet/errors.py
|
||||
+++ b/blivet/errors.py
|
||||
@@ -192,7 +192,7 @@ class DeviceTreeError(StorageError):
|
||||
@@ -201,7 +201,7 @@ class DeviceTreeError(StorageError):
|
||||
pass
|
||||
|
||||
|
||||
@ -283,7 +283,7 @@ index fd51283f..f6bf853a 100644
|
||||
|
||||
|
||||
diff --git a/blivet/partitioning.py b/blivet/partitioning.py
|
||||
index 53f9cc3f..ca0a55d1 100644
|
||||
index ce77e4eb..2cd6554c 100644
|
||||
--- a/blivet/partitioning.py
|
||||
+++ b/blivet/partitioning.py
|
||||
@@ -32,7 +32,7 @@ import _ped
|
||||
@ -295,7 +295,7 @@ index 53f9cc3f..ca0a55d1 100644
|
||||
from .size import Size
|
||||
from .i18n import _
|
||||
from .util import stringize, unicodeize, compare
|
||||
@@ -1632,7 +1632,15 @@ class TotalSizeSet(object):
|
||||
@@ -1635,7 +1635,15 @@ class TotalSizeSet(object):
|
||||
:param size: the target combined size
|
||||
:type size: :class:`~.size.Size`
|
||||
"""
|
||||
@ -312,7 +312,7 @@ index 53f9cc3f..ca0a55d1 100644
|
||||
self.size = size
|
||||
|
||||
self.requests = []
|
||||
@@ -1670,7 +1678,15 @@ class SameSizeSet(object):
|
||||
@@ -1673,7 +1681,15 @@ class SameSizeSet(object):
|
||||
:keyword max_size: the maximum size for growable devices
|
||||
:type max_size: :class:`~.size.Size`
|
||||
"""
|
||||
@ -330,10 +330,10 @@ index 53f9cc3f..ca0a55d1 100644
|
||||
self.grow = grow
|
||||
self.max_size = max_size
|
||||
diff --git a/blivet/populator/helpers/dm.py b/blivet/populator/helpers/dm.py
|
||||
index 30e99aa1..770736b0 100644
|
||||
index 4721390e..0ad065e2 100644
|
||||
--- a/blivet/populator/helpers/dm.py
|
||||
+++ b/blivet/populator/helpers/dm.py
|
||||
@@ -46,13 +46,13 @@ class DMDevicePopulator(DevicePopulator):
|
||||
@@ -47,13 +47,13 @@ class DMDevicePopulator(DevicePopulator):
|
||||
name = udev.device_get_name(self.data)
|
||||
log_method_call(self, name=name)
|
||||
sysfs_path = udev.device_get_sysfs_path(self.data)
|
||||
@ -350,7 +350,7 @@ index 30e99aa1..770736b0 100644
|
||||
device.controllable = False
|
||||
self._devicetree._add_device(device)
|
||||
diff --git a/blivet/populator/helpers/luks.py b/blivet/populator/helpers/luks.py
|
||||
index 52795a98..51488691 100644
|
||||
index 3221122a..9b5023f8 100644
|
||||
--- a/blivet/populator/helpers/luks.py
|
||||
+++ b/blivet/populator/helpers/luks.py
|
||||
@@ -43,7 +43,7 @@ class LUKSDevicePopulator(DevicePopulator):
|
||||
@ -368,14 +368,14 @@ index 52795a98..51488691 100644
|
||||
def run(self):
|
||||
- parents = self._devicetree._add_parent_devices(self.data)
|
||||
+ parents = self._devicetree._add_slave_devices(self.data)
|
||||
device = IntegrityDevice(udev.device_get_name(self.data),
|
||||
sysfs_path=udev.device_get_sysfs_path(self.data),
|
||||
parents=parents,
|
||||
name = udev.device_get_name(self.data)
|
||||
|
||||
try:
|
||||
diff --git a/blivet/populator/helpers/lvm.py b/blivet/populator/helpers/lvm.py
|
||||
index c7adfa4e..b1626306 100644
|
||||
index 6ef2f417..b549e8d3 100644
|
||||
--- a/blivet/populator/helpers/lvm.py
|
||||
+++ b/blivet/populator/helpers/lvm.py
|
||||
@@ -57,7 +57,7 @@ class LVMDevicePopulator(DevicePopulator):
|
||||
@@ -58,7 +58,7 @@ class LVMDevicePopulator(DevicePopulator):
|
||||
log.warning("found non-vg device with name %s", vg_name)
|
||||
device = None
|
||||
|
||||
@ -385,7 +385,7 @@ index c7adfa4e..b1626306 100644
|
||||
# LVM provides no means to resolve conflicts caused by duplicated VG
|
||||
# names, so we're just being optimistic here. Woo!
|
||||
diff --git a/blivet/populator/helpers/mdraid.py b/blivet/populator/helpers/mdraid.py
|
||||
index 3479e3f7..76aebf25 100644
|
||||
index a7602d20..9bec11ef 100644
|
||||
--- a/blivet/populator/helpers/mdraid.py
|
||||
+++ b/blivet/populator/helpers/mdraid.py
|
||||
@@ -31,7 +31,7 @@ from ... import udev
|
||||
@ -448,7 +448,7 @@ index 96c0a9ad..10c745bf 100644
|
||||
|
||||
return device
|
||||
diff --git a/blivet/populator/populator.py b/blivet/populator/populator.py
|
||||
index 75bb1741..d252281d 100644
|
||||
index 3a419418..068270b2 100644
|
||||
--- a/blivet/populator/populator.py
|
||||
+++ b/blivet/populator/populator.py
|
||||
@@ -31,7 +31,7 @@ gi.require_version("BlockDev", "2.0")
|
||||
@ -549,17 +549,8 @@ index 75bb1741..d252281d 100644
|
||||
|
||||
def _add_name(self, name):
|
||||
if name not in self.names:
|
||||
@@ -317,7 +318,7 @@ class PopulatorMixin(object):
|
||||
continue
|
||||
|
||||
# Make sure lvm doesn't get confused by PVs that belong to
|
||||
- # incomplete VGs. We will remove the PVs from the reject list when/if
|
||||
+ # incomplete VGs. We will remove the PVs from the blacklist when/if
|
||||
# the time comes to remove the incomplete VG and its PVs.
|
||||
for pv in vg.pvs:
|
||||
lvm.lvm_cc_addFilterRejectRegexp(pv.name)
|
||||
diff --git a/blivet/threads.py b/blivet/threads.py
|
||||
index 7e6d3105..a70deb69 100644
|
||||
index 5e2dff3f..1a5cc6db 100644
|
||||
--- a/blivet/threads.py
|
||||
+++ b/blivet/threads.py
|
||||
@@ -63,11 +63,12 @@ class SynchronizedMeta(type):
|
||||
@ -577,7 +568,7 @@ index 7e6d3105..a70deb69 100644
|
||||
elif isinstance(obj, FunctionType):
|
||||
obj = exclusive(obj)
|
||||
diff --git a/blivet/udev.py b/blivet/udev.py
|
||||
index a8297f3f..e1b67845 100644
|
||||
index efbc53d6..ddc49a37 100644
|
||||
--- a/blivet/udev.py
|
||||
+++ b/blivet/udev.py
|
||||
@@ -39,7 +39,7 @@ from gi.repository import BlockDev as blockdev
|
||||
@ -615,16 +606,16 @@ index a8297f3f..e1b67845 100644
|
||||
return True
|
||||
|
||||
dev_path = "/sys/class/block/%s" % dev_name
|
||||
@@ -374,7 +374,7 @@ def device_is_disk(info):
|
||||
device_is_dm_lvm(info) or
|
||||
@@ -375,7 +375,7 @@ def device_is_disk(info):
|
||||
device_is_dm_crypt(info) or
|
||||
device_is_dm_stratis(info) or
|
||||
(device_is_md(info) and
|
||||
- (not device_get_md_container(info) and not all(device_is_disk(d) for d in device_get_parents(info))))))
|
||||
+ (not device_get_md_container(info) and not all(device_is_disk(d) for d in device_get_slaves(info))))))
|
||||
|
||||
|
||||
def device_is_partition(info):
|
||||
@@ -453,18 +453,18 @@ def device_get_devname(info):
|
||||
@@ -454,18 +454,18 @@ def device_get_devname(info):
|
||||
return info.get('DEVNAME')
|
||||
|
||||
|
||||
@ -651,7 +642,7 @@ index a8297f3f..e1b67845 100644
|
||||
|
||||
|
||||
def device_get_holders(info):
|
||||
@@ -736,7 +736,7 @@ def device_get_partition_disk(info):
|
||||
@@ -742,7 +742,7 @@ def device_get_partition_disk(info):
|
||||
disk = None
|
||||
majorminor = info.get("ID_PART_ENTRY_DISK")
|
||||
sysfs_path = device_get_sysfs_path(info)
|
||||
@ -660,7 +651,7 @@ index a8297f3f..e1b67845 100644
|
||||
if majorminor:
|
||||
major, minor = majorminor.split(":")
|
||||
for device in get_devices():
|
||||
@@ -744,8 +744,8 @@ def device_get_partition_disk(info):
|
||||
@@ -750,8 +750,8 @@ def device_get_partition_disk(info):
|
||||
disk = device_get_name(device)
|
||||
break
|
||||
elif device_is_dm_partition(info):
|
||||
@ -671,11 +662,11 @@ index a8297f3f..e1b67845 100644
|
||||
if len(parents) == 1:
|
||||
disk = resolve_devspec(parents[0].replace('!', '/'))
|
||||
else:
|
||||
diff --git a/tests/devicefactory_test.py b/tests/devicefactory_test.py
|
||||
index dc0d6408..dfd78a7a 100644
|
||||
--- a/tests/devicefactory_test.py
|
||||
+++ b/tests/devicefactory_test.py
|
||||
@@ -112,9 +112,9 @@ class DeviceFactoryTestCase(unittest.TestCase):
|
||||
diff --git a/tests/unit_tests/devicefactory_test.py b/tests/unit_tests/devicefactory_test.py
|
||||
index ff6bcb9e..552aadc1 100644
|
||||
--- a/tests/unit_tests/devicefactory_test.py
|
||||
+++ b/tests/unit_tests/devicefactory_test.py
|
||||
@@ -115,9 +115,9 @@ class DeviceFactoryTestCase(unittest.TestCase):
|
||||
kwargs.get("encrypted", False) or
|
||||
kwargs.get("container_encrypted", False))
|
||||
if kwargs.get("encrypted", False):
|
||||
@ -687,7 +678,7 @@ index dc0d6408..dfd78a7a 100644
|
||||
kwargs.get("luks_sector_size", 0))
|
||||
|
||||
self.assertTrue(set(device.disks).issubset(kwargs["disks"]))
|
||||
@@ -354,7 +354,7 @@ class LVMFactoryTestCase(DeviceFactoryTestCase):
|
||||
@@ -357,7 +357,7 @@ class LVMFactoryTestCase(DeviceFactoryTestCase):
|
||||
device = args[0]
|
||||
|
||||
if kwargs.get("encrypted"):
|
||||
@ -696,7 +687,7 @@ index dc0d6408..dfd78a7a 100644
|
||||
else:
|
||||
container = device.container
|
||||
|
||||
@@ -373,7 +373,7 @@ class LVMFactoryTestCase(DeviceFactoryTestCase):
|
||||
@@ -376,7 +376,7 @@ class LVMFactoryTestCase(DeviceFactoryTestCase):
|
||||
self.assertIsInstance(pv, member_class)
|
||||
|
||||
if pv.encrypted:
|
||||
@ -705,7 +696,7 @@ index dc0d6408..dfd78a7a 100644
|
||||
kwargs.get("luks_version", crypto.DEFAULT_LUKS_VERSION))
|
||||
|
||||
@patch("blivet.formats.lvmpv.LVMPhysicalVolume.formattable", return_value=True)
|
||||
@@ -589,7 +589,7 @@ class LVMThinPFactoryTestCase(LVMFactoryTestCase):
|
||||
@@ -592,7 +592,7 @@ class LVMThinPFactoryTestCase(LVMFactoryTestCase):
|
||||
device = args[0]
|
||||
|
||||
if kwargs.get("encrypted", False):
|
||||
@ -714,10 +705,10 @@ index dc0d6408..dfd78a7a 100644
|
||||
else:
|
||||
thinlv = device
|
||||
|
||||
diff --git a/tests/devices_test/size_test.py b/tests/devices_test/size_test.py
|
||||
diff --git a/tests/unit_tests/devices_test/device_size_test.py b/tests/unit_tests/devices_test/device_size_test.py
|
||||
index d0c0a3f4..a1efa86d 100644
|
||||
--- a/tests/devices_test/size_test.py
|
||||
+++ b/tests/devices_test/size_test.py
|
||||
--- a/tests/unit_tests/devices_test/device_size_test.py
|
||||
+++ b/tests/unit_tests/devices_test/device_size_test.py
|
||||
@@ -107,8 +107,8 @@ class LUKSDeviceSizeTest(StorageDeviceSizeTest):
|
||||
|
||||
def _get_device(self, *args, **kwargs):
|
||||
@ -735,11 +726,11 @@ index d0c0a3f4..a1efa86d 100644
|
||||
self.assertEqual(dev.size, initial_size)
|
||||
- self.assertEqual(dev.raw_device.size, initial_size + crypto.LUKS_METADATA_SIZE)
|
||||
+ self.assertEqual(dev.slave.size, initial_size + crypto.LUKS_METADATA_SIZE)
|
||||
diff --git a/tests/populator_test.py b/tests/populator_test.py
|
||||
index a7748a9d..531ec74b 100644
|
||||
--- a/tests/populator_test.py
|
||||
+++ b/tests/populator_test.py
|
||||
@@ -81,7 +81,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
diff --git a/tests/unit_tests/populator_test.py b/tests/unit_tests/populator_test.py
|
||||
index 369fe878..7ba04bac 100644
|
||||
--- a/tests/unit_tests/populator_test.py
|
||||
+++ b/tests/unit_tests/populator_test.py
|
||||
@@ -86,7 +86,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
@patch.object(DeviceTree, "get_device_by_name")
|
||||
@patch.object(DMDevice, "status", return_value=True)
|
||||
@patch.object(DMDevice, "update_sysfs_path")
|
||||
@ -748,7 +739,7 @@ index a7748a9d..531ec74b 100644
|
||||
@patch("blivet.udev.device_get_name")
|
||||
@patch("blivet.udev.device_get_sysfs_path", return_value=sentinel.sysfs_path)
|
||||
def test_run(self, *args):
|
||||
@@ -90,7 +90,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
@@ -95,7 +95,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
|
||||
devicetree = DeviceTree()
|
||||
|
||||
@ -756,17 +747,17 @@ index a7748a9d..531ec74b 100644
|
||||
+ # The general case for dm devices is that adding the slave/parent devices
|
||||
# will result in the dm device itself being in the tree.
|
||||
device = Mock()
|
||||
devicetree.get_device_by_name.return_value = device
|
||||
@@ -99,7 +99,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
|
||||
device.id = 0
|
||||
@@ -106,7 +106,7 @@ class DMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
parent = Mock()
|
||||
parent.id = 0
|
||||
parent.parents = []
|
||||
- devicetree._add_parent_devices.return_value = [parent]
|
||||
+ devicetree._add_slave_devices.return_value = [parent]
|
||||
devicetree._add_device(parent)
|
||||
devicetree.get_device_by_name.return_value = None
|
||||
device_name = "dmdevice"
|
||||
@@ -228,7 +228,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
@@ -235,7 +235,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
# could be the first helper class checked.
|
||||
|
||||
@patch.object(DeviceTree, "get_device_by_name")
|
||||
@ -775,7 +766,7 @@ index a7748a9d..531ec74b 100644
|
||||
@patch("blivet.udev.device_get_name")
|
||||
@patch("blivet.udev.device_get_lv_vg_name")
|
||||
def test_run(self, *args):
|
||||
@@ -240,7 +240,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
@@ -247,7 +247,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
devicetree = DeviceTree()
|
||||
data = Mock()
|
||||
|
||||
@ -784,7 +775,7 @@ index a7748a9d..531ec74b 100644
|
||||
device_get_name.return_value = sentinel.lv_name
|
||||
devicetree.get_device_by_name.return_value = None
|
||||
|
||||
@@ -260,7 +260,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
@@ -267,7 +267,7 @@ class LVMDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
call(sentinel.vg_name),
|
||||
call(sentinel.lv_name)])
|
||||
|
||||
@ -793,7 +784,7 @@ index a7748a9d..531ec74b 100644
|
||||
get_device_by_name.side_effect = None
|
||||
get_device_by_name.return_value = None
|
||||
self.assertEqual(helper.run(), None)
|
||||
@@ -625,7 +625,7 @@ class MDDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
@@ -639,7 +639,7 @@ class MDDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
# could be the first helper class checked.
|
||||
|
||||
@patch.object(DeviceTree, "get_device_by_name")
|
||||
@ -802,7 +793,7 @@ index a7748a9d..531ec74b 100644
|
||||
@patch("blivet.udev.device_get_name")
|
||||
@patch("blivet.udev.device_get_md_uuid")
|
||||
@patch("blivet.udev.device_get_md_name")
|
||||
@@ -636,7 +636,7 @@ class MDDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
@@ -650,7 +650,7 @@ class MDDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
|
||||
devicetree = DeviceTree()
|
||||
|
||||
@ -811,7 +802,7 @@ index a7748a9d..531ec74b 100644
|
||||
data = Mock()
|
||||
device = Mock()
|
||||
device.parents = []
|
||||
@@ -699,12 +699,12 @@ class MultipathDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
@@ -713,12 +713,12 @@ class MultipathDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
# could be the first helper class checked.
|
||||
|
||||
@patch("blivet.udev.device_get_sysfs_path")
|
||||
@ -826,20 +817,20 @@ index a7748a9d..531ec74b 100644
|
||||
|
||||
devicetree = DeviceTree()
|
||||
# set up some fake udev data to verify handling of specific entries
|
||||
@@ -719,13 +719,13 @@ class MultipathDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
@@ -733,13 +733,13 @@ class MultipathDevicePopulatorTestCase(PopulatorHelperTestCase):
|
||||
|
||||
device_name = "mpathtest"
|
||||
device_get_name.return_value = device_name
|
||||
- parent_1 = Mock(tags=set(), wwn=wwn[2:])
|
||||
- parent_1 = Mock(tags=set(), wwn=wwn[2:], id=0)
|
||||
- parent_1.parents = []
|
||||
- parent_2 = Mock(tags=set(), wwn=wwn[2:])
|
||||
- parent_2 = Mock(tags=set(), wwn=wwn[2:], id=0)
|
||||
- parent_2.parents = []
|
||||
- devicetree._add_device(parent_1)
|
||||
- devicetree._add_device(parent_2)
|
||||
- add_parent_devices.return_value = [parent_1, parent_2]
|
||||
+ slave_1 = Mock(tags=set(), wwn=wwn[2:])
|
||||
+ slave_1 = Mock(tags=set(), wwn=wwn[2:], id=0)
|
||||
+ slave_1.parents = []
|
||||
+ slave_2 = Mock(tags=set(), wwn=wwn[2:])
|
||||
+ slave_2 = Mock(tags=set(), wwn=wwn[2:], id=0)
|
||||
+ slave_2.parents = []
|
||||
+ devicetree._add_device(slave_1)
|
||||
+ devicetree._add_device(slave_2)
|
||||
@ -847,11 +838,11 @@ index a7748a9d..531ec74b 100644
|
||||
|
||||
helper = self.helper_class(devicetree, data)
|
||||
|
||||
diff --git a/tests/udev_test.py b/tests/udev_test.py
|
||||
index f9b10620..d30a647b 100644
|
||||
--- a/tests/udev_test.py
|
||||
+++ b/tests/udev_test.py
|
||||
@@ -45,11 +45,11 @@ class UdevTest(unittest.TestCase):
|
||||
diff --git a/tests/unit_tests/udev_test.py b/tests/unit_tests/udev_test.py
|
||||
index b208efa8..ebcd59e2 100644
|
||||
--- a/tests/unit_tests/udev_test.py
|
||||
+++ b/tests/unit_tests/udev_test.py
|
||||
@@ -49,11 +49,11 @@ class UdevTest(unittest.TestCase):
|
||||
@mock.patch('blivet.udev.device_is_dm_crypt', return_value=False)
|
||||
@mock.patch('blivet.udev.device_is_md')
|
||||
@mock.patch('blivet.udev.device_get_md_container')
|
||||
@ -865,7 +856,7 @@ index f9b10620..d30a647b 100644
|
||||
|
||||
disk_parents = [dict(DEVTYPE="disk", SYS_PATH='/fake/path/2'),
|
||||
dict(DEVTYPE="disk", SYS_PATH='/fake/path/3')]
|
||||
@@ -64,20 +64,20 @@ class UdevTest(unittest.TestCase):
|
||||
@@ -68,20 +68,20 @@ class UdevTest(unittest.TestCase):
|
||||
# Intel FW RAID (MD RAID w/ container layer)
|
||||
# device_get_container will return some mock value which will evaluate to True
|
||||
device_get_md_container.return_value = mock.sentinel.md_container
|
||||
@ -904,5 +895,5 @@ index 797bac85..6255104f 100644
|
||||
#
|
||||
# create disk images
|
||||
--
|
||||
2.31.1
|
||||
2.38.1
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 898178047ac4bc97ddccb193cb0e11f7fdf18196 Mon Sep 17 00:00:00 2001
|
||||
From f6490c469904f4808c63a170210e53acc908b018 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Wed, 17 Aug 2022 14:24:21 +0200
|
||||
Subject: [PATCH 1/3] Use MD populator instead of DM to handle DDF RAID format
|
||||
Subject: [PATCH 1/2] Use MD populator instead of DM to handle DDF RAID format
|
||||
|
||||
---
|
||||
blivet/formats/dmraid.py | 2 +-
|
||||
@ -9,7 +9,7 @@ Subject: [PATCH 1/3] Use MD populator instead of DM to handle DDF RAID format
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/blivet/formats/dmraid.py b/blivet/formats/dmraid.py
|
||||
index 2ba9dcfe5..ce15905dc 100644
|
||||
index 2ba9dcfe..ce15905d 100644
|
||||
--- a/blivet/formats/dmraid.py
|
||||
+++ b/blivet/formats/dmraid.py
|
||||
@@ -43,7 +43,7 @@ class DMRaidMember(DeviceFormat):
|
||||
@ -22,7 +22,7 @@ index 2ba9dcfe5..ce15905dc 100644
|
||||
"isw_raid_member",
|
||||
"jmicron_raid_member", "lsi_mega_raid_member",
|
||||
diff --git a/blivet/formats/mdraid.py b/blivet/formats/mdraid.py
|
||||
index 41ddef810..4aa3f3b07 100644
|
||||
index 41ddef81..4aa3f3b0 100644
|
||||
--- a/blivet/formats/mdraid.py
|
||||
+++ b/blivet/formats/mdraid.py
|
||||
@@ -41,7 +41,7 @@ class MDRaidMember(DeviceFormat):
|
||||
@ -34,11 +34,14 @@ index 41ddef810..4aa3f3b07 100644
|
||||
parted_flag = PARTITION_RAID
|
||||
_formattable = True # can be formatted
|
||||
_supported = True # is supported
|
||||
--
|
||||
2.38.1
|
||||
|
||||
From c487c6178ee9859163379946c1bdc3b2df1857b1 Mon Sep 17 00:00:00 2001
|
||||
|
||||
From 5fadd850aae217d7692a6c8a50b2dcd5e61a63cd Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Wed, 17 Aug 2022 14:24:58 +0200
|
||||
Subject: [PATCH 2/3] Do not read DDF RAID UUID from udev
|
||||
Subject: [PATCH 2/2] Do not read DDF RAID UUID from udev
|
||||
|
||||
The UUID we get from udev isn't the array UUID, we need to get
|
||||
that using libblockdev.
|
||||
@ -47,7 +50,7 @@ that using libblockdev.
|
||||
1 file changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/blivet/populator/helpers/mdraid.py b/blivet/populator/helpers/mdraid.py
|
||||
index 76aebf250..9bec11efb 100644
|
||||
index 3479e3f7..a7602d20 100644
|
||||
--- a/blivet/populator/helpers/mdraid.py
|
||||
+++ b/blivet/populator/helpers/mdraid.py
|
||||
@@ -98,17 +98,21 @@ class MDFormatPopulator(FormatPopulator):
|
||||
@ -78,30 +81,6 @@ index 76aebf250..9bec11efb 100644
|
||||
return kwargs
|
||||
|
||||
def run(self):
|
||||
--
|
||||
2.38.1
|
||||
|
||||
From 325681bcd40fc4f0e13a4d23c889e1f7cc043cc1 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Thu, 17 Mar 2022 15:48:25 +0100
|
||||
Subject: [PATCH 3/3] Do not crash when a disk populator doesn't return kwargs
|
||||
|
||||
This happens when trying to use Blivet on a system with a BIOS
|
||||
RAID without dmraid installed. Because we don't fully support
|
||||
BIOS RAIDs using MD the MDBiosRaidDevicePopulator helper fails
|
||||
to get kwargs for the BIOS RAID "disk" and populate fails.
|
||||
---
|
||||
blivet/populator/helpers/disk.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/blivet/populator/helpers/disk.py b/blivet/populator/helpers/disk.py
|
||||
index 2e5026f7e..9db7b810d 100644
|
||||
--- a/blivet/populator/helpers/disk.py
|
||||
+++ b/blivet/populator/helpers/disk.py
|
||||
@@ -68,6 +68,8 @@ def run(self):
|
||||
log_method_call(self, name=name)
|
||||
|
||||
kwargs = self._get_kwargs()
|
||||
+ if not kwargs:
|
||||
+ return
|
||||
device = self._device_class(name, **kwargs)
|
||||
self._devicetree._add_device(device)
|
||||
return device
|
@ -1,35 +0,0 @@
|
||||
From 8ece3da18b1abb89320d02f4475002e6a3ed7875 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Thu, 20 May 2021 13:40:26 +0200
|
||||
Subject: [PATCH] Fix activating old style LVM snapshots
|
||||
|
||||
The old style snapshots are activated together with the origin LV
|
||||
so we need to make sure it is activated to be able to remove the
|
||||
snapshot or its format.
|
||||
|
||||
Resolves: rhbz#1961739
|
||||
---
|
||||
blivet/devices/lvm.py | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/blivet/devices/lvm.py b/blivet/devices/lvm.py
|
||||
index a55515fcb..fb57804d9 100644
|
||||
--- a/blivet/devices/lvm.py
|
||||
+++ b/blivet/devices/lvm.py
|
||||
@@ -1461,9 +1461,13 @@ def _set_format(self, fmt): # pylint: disable=unused-argument
|
||||
self._update_format_from_origin()
|
||||
|
||||
@old_snapshot_specific
|
||||
- def setup(self, orig=False):
|
||||
- # the old snapshot cannot be setup and torn down
|
||||
- pass
|
||||
+ def setup(self, orig=False): # pylint: disable=unused-argument
|
||||
+ # the old snapshot is activated together with the origin
|
||||
+ if self.origin and not self.origin.status:
|
||||
+ try:
|
||||
+ self.origin.setup()
|
||||
+ except blockdev.LVMError as lvmerr:
|
||||
+ log.error("failed to activate origin LV: %s", lvmerr)
|
||||
|
||||
@old_snapshot_specific
|
||||
def teardown(self, recursive=False):
|
@ -1,75 +0,0 @@
|
||||
From 344e624f91010b6041c22ee8a24c9305b82af969 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Tue, 18 May 2021 12:54:02 +0200
|
||||
Subject: [PATCH] Fix resolving devices with names that look like BIOS drive
|
||||
number
|
||||
|
||||
A RAID array named "10" will not be resolved because we try to
|
||||
resolve it using EDD data and after this lookup fails, we don't
|
||||
try the name.
|
||||
|
||||
Resolves: rhbz#1960798
|
||||
---
|
||||
blivet/devicetree.py | 18 +++++++++---------
|
||||
tests/devicetree_test.py | 4 ++++
|
||||
2 files changed, 13 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
|
||||
index 88e9f0e5..f4ae1968 100644
|
||||
--- a/blivet/devicetree.py
|
||||
+++ b/blivet/devicetree.py
|
||||
@@ -634,20 +634,20 @@ class DeviceTreeBase(object):
|
||||
(label.startswith("'") and label.endswith("'"))):
|
||||
label = label[1:-1]
|
||||
device = self.labels.get(label)
|
||||
- elif re.match(r'(0x)?[A-Fa-f0-9]{2}(p\d+)?$', devspec):
|
||||
- # BIOS drive number
|
||||
- (drive, _p, partnum) = devspec.partition("p")
|
||||
- spec = int(drive, 16)
|
||||
- for (edd_name, edd_number) in self.edd_dict.items():
|
||||
- if edd_number == spec:
|
||||
- device = self.get_device_by_name(edd_name + partnum)
|
||||
- break
|
||||
elif options and "nodev" in options.split(","):
|
||||
device = self.get_device_by_name(devspec)
|
||||
if not device:
|
||||
device = self.get_device_by_path(devspec)
|
||||
else:
|
||||
- if not devspec.startswith("/dev/"):
|
||||
+ if re.match(r'(0x)?[A-Fa-f0-9]{2}(p\d+)?$', devspec):
|
||||
+ # BIOS drive number
|
||||
+ (drive, _p, partnum) = devspec.partition("p")
|
||||
+ spec = int(drive, 16)
|
||||
+ for (edd_name, edd_number) in self.edd_dict.items():
|
||||
+ if edd_number == spec:
|
||||
+ device = self.get_device_by_name(edd_name + partnum)
|
||||
+ break
|
||||
+ if not device and not devspec.startswith("/dev/"):
|
||||
device = self.get_device_by_name(devspec)
|
||||
if not device:
|
||||
devspec = "/dev/" + devspec
|
||||
diff --git a/tests/devicetree_test.py b/tests/devicetree_test.py
|
||||
index 11f8469d..b033343d 100644
|
||||
--- a/tests/devicetree_test.py
|
||||
+++ b/tests/devicetree_test.py
|
||||
@@ -49,6 +49,9 @@ class DeviceTreeTestCase(unittest.TestCase):
|
||||
dev3 = StorageDevice("sdp2", exists=True)
|
||||
dt._add_device(dev3)
|
||||
|
||||
+ dev4 = StorageDevice("10", exists=True)
|
||||
+ dt._add_device(dev4)
|
||||
+
|
||||
dt.edd_dict.update({"dev1": 0x81,
|
||||
"dev2": 0x82})
|
||||
|
||||
@@ -62,6 +65,7 @@ class DeviceTreeTestCase(unittest.TestCase):
|
||||
self.assertEqual(dt.resolve_device("0x82"), dev2)
|
||||
|
||||
self.assertEqual(dt.resolve_device(dev3.name), dev3)
|
||||
+ self.assertEqual(dt.resolve_device(dev4.name), dev4)
|
||||
|
||||
def test_device_name(self):
|
||||
# check that devicetree.names property contains all device's names
|
||||
--
|
||||
2.31.1
|
||||
|
77
SOURCES/0006-Revert-Remove-the-Blivet.roots-attribute.patch
Normal file
77
SOURCES/0006-Revert-Remove-the-Blivet.roots-attribute.patch
Normal file
@ -0,0 +1,77 @@
|
||||
From 62af1d7f96b8ed8eb8f2732787576161ae5da79f Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Thu, 13 Oct 2022 10:47:52 +0200
|
||||
Subject: [PATCH] Revert "Remove the Blivet.roots attribute"
|
||||
|
||||
This reverts commit 19a826073345ca6b57a8f9a95ec855892320300e.
|
||||
---
|
||||
blivet/blivet.py | 21 +++++++++++++++++++++
|
||||
blivet/devicefactory.py | 3 +++
|
||||
2 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/blivet/blivet.py b/blivet/blivet.py
|
||||
index bf72ee9c..dc066b03 100644
|
||||
--- a/blivet/blivet.py
|
||||
+++ b/blivet/blivet.py
|
||||
@@ -88,6 +88,7 @@ class Blivet(object):
|
||||
self.devicetree = DeviceTree(ignored_disks=self.ignored_disks,
|
||||
exclusive_disks=self.exclusive_disks,
|
||||
disk_images=self.disk_images)
|
||||
+ self.roots = []
|
||||
|
||||
@property
|
||||
def short_product_name(self):
|
||||
@@ -1314,5 +1315,25 @@ class Blivet(object):
|
||||
p = partition.disk.format.parted_disk.getPartitionByPath(partition.path)
|
||||
partition.parted_partition = p
|
||||
|
||||
+ for root in new.roots:
|
||||
+ root.swaps = [new.devicetree.get_device_by_id(d.id, hidden=True) for d in root.swaps]
|
||||
+ root.swaps = [s for s in root.swaps if s]
|
||||
+
|
||||
+ removed = set()
|
||||
+ for (mountpoint, old_dev) in root.mounts.items():
|
||||
+ if old_dev is None:
|
||||
+ continue
|
||||
+
|
||||
+ new_dev = new.devicetree.get_device_by_id(old_dev.id, hidden=True)
|
||||
+ if new_dev is None:
|
||||
+ # if the device has been removed don't include this
|
||||
+ # mountpoint at all
|
||||
+ removed.add(mountpoint)
|
||||
+ else:
|
||||
+ root.mounts[mountpoint] = new_dev
|
||||
+
|
||||
+ for mnt in removed:
|
||||
+ del root.mounts[mnt]
|
||||
+
|
||||
log.debug("finished Blivet copy")
|
||||
return new
|
||||
diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
|
||||
index 8105bfc7..6f460f6d 100644
|
||||
--- a/blivet/devicefactory.py
|
||||
+++ b/blivet/devicefactory.py
|
||||
@@ -383,6 +383,7 @@ class DeviceFactory(object):
|
||||
# used for error recovery
|
||||
self.__devices = []
|
||||
self.__actions = []
|
||||
+ self.__roots = []
|
||||
|
||||
def _is_container_encrypted(self):
|
||||
return all(isinstance(p, LUKSDevice) for p in self.device.container.parents)
|
||||
@@ -994,10 +995,12 @@ class DeviceFactory(object):
|
||||
_blivet_copy = self.storage.copy()
|
||||
self.__devices = _blivet_copy.devicetree._devices
|
||||
self.__actions = _blivet_copy.devicetree._actions
|
||||
+ self.__roots = _blivet_copy.roots
|
||||
|
||||
def _revert_devicetree(self):
|
||||
self.storage.devicetree._devices = self.__devices
|
||||
self.storage.devicetree._actions = self.__actions
|
||||
+ self.storage.roots = self.__roots
|
||||
|
||||
|
||||
class PartitionFactory(DeviceFactory):
|
||||
--
|
||||
2.38.1
|
||||
|
@ -1,151 +0,0 @@
|
||||
From dc1e2fe7783748528cac2f7aa516c89d1959b052 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Thu, 29 Jul 2021 14:44:22 +0200
|
||||
Subject: [PATCH] Do not set chunk size for RAID 1
|
||||
|
||||
Setting chunk size for RAID 1 doesn't make sense and latest
|
||||
mdadm started returning error instead of ignoring the --chunk
|
||||
option when creating an array.
|
||||
|
||||
Resolves: rhbz#1987170
|
||||
---
|
||||
blivet/devicelibs/raid.py | 12 ++++++++++
|
||||
blivet/devices/md.py | 15 ++++++++++---
|
||||
tests/devices_test/md_test.py | 41 +++++++++++++++++++++++++++++++++--
|
||||
3 files changed, 63 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/blivet/devicelibs/raid.py b/blivet/devicelibs/raid.py
|
||||
index 19c3fae98..a9e241c7a 100644
|
||||
--- a/blivet/devicelibs/raid.py
|
||||
+++ b/blivet/devicelibs/raid.py
|
||||
@@ -462,6 +462,18 @@ def _pad(self, size, chunk_size):
|
||||
def _get_recommended_stride(self, member_count):
|
||||
return None
|
||||
|
||||
+ def get_size(self, member_sizes, num_members=None, chunk_size=None, superblock_size_func=None):
|
||||
+ if not member_sizes:
|
||||
+ return Size(0)
|
||||
+
|
||||
+ if num_members is None:
|
||||
+ num_members = len(member_sizes)
|
||||
+
|
||||
+ min_size = min(member_sizes)
|
||||
+ superblock_size = superblock_size_func(min_size)
|
||||
+ min_data_size = self._trim(min_size - superblock_size, chunk_size)
|
||||
+ return self.get_net_array_size(num_members, min_data_size)
|
||||
+
|
||||
|
||||
RAID1 = RAID1()
|
||||
ALL_LEVELS.add_raid_level(RAID1)
|
||||
diff --git a/blivet/devices/md.py b/blivet/devices/md.py
|
||||
index 69eee93a5..d1a2faf1f 100644
|
||||
--- a/blivet/devices/md.py
|
||||
+++ b/blivet/devices/md.py
|
||||
@@ -138,7 +138,7 @@ def __init__(self, name, level=None, major=None, minor=None, size=None,
|
||||
if self.exists:
|
||||
self._chunk_size = self.read_chunk_size()
|
||||
else:
|
||||
- self._chunk_size = chunk_size or mdraid.MD_CHUNK_SIZE
|
||||
+ self.chunk_size = chunk_size or Size(0)
|
||||
|
||||
if not self.exists and not isinstance(metadata_version, str):
|
||||
self.metadata_version = "default"
|
||||
@@ -208,8 +208,14 @@ def sector_size(self):
|
||||
|
||||
@property
|
||||
def chunk_size(self):
|
||||
- if self.exists and self._chunk_size == Size(0):
|
||||
- self._chunk_size = self.read_chunk_size()
|
||||
+ if self._chunk_size == Size(0):
|
||||
+ if self.exists:
|
||||
+ return self.read_chunk_size()
|
||||
+ else:
|
||||
+ if self.level == raid.RAID1:
|
||||
+ return self._chunk_size
|
||||
+ else:
|
||||
+ return mdraid.MD_CHUNK_SIZE
|
||||
return self._chunk_size
|
||||
|
||||
@chunk_size.setter
|
||||
@@ -223,6 +229,9 @@ def chunk_size(self, newsize):
|
||||
if self.exists:
|
||||
raise ValueError("cannot set chunk size for an existing device")
|
||||
|
||||
+ if self.level == raid.RAID1 and newsize != Size(0):
|
||||
+ raise ValueError("specifying chunk size is not allowed for raid1")
|
||||
+
|
||||
self._chunk_size = newsize
|
||||
|
||||
def read_chunk_size(self):
|
||||
diff --git a/tests/devices_test/md_test.py b/tests/devices_test/md_test.py
|
||||
index 46df76d3d..47a0fa0cc 100644
|
||||
--- a/tests/devices_test/md_test.py
|
||||
+++ b/tests/devices_test/md_test.py
|
||||
@@ -1,6 +1,11 @@
|
||||
import six
|
||||
import unittest
|
||||
|
||||
+try:
|
||||
+ from unittest.mock import patch
|
||||
+except ImportError:
|
||||
+ from mock import patch
|
||||
+
|
||||
import blivet
|
||||
|
||||
from blivet.devices import StorageDevice
|
||||
@@ -27,9 +32,27 @@ def test_chunk_size1(self):
|
||||
raid_array = MDRaidArrayDevice(name="raid", level="raid0", member_devices=2,
|
||||
total_devices=2, parents=[member1, member2])
|
||||
|
||||
- # no chunk_size specified -- default value
|
||||
+ # no chunk_size specified and RAID0 -- default value
|
||||
self.assertEqual(raid_array.chunk_size, mdraid.MD_CHUNK_SIZE)
|
||||
|
||||
+ with patch("blivet.devices.md.blockdev.md.create") as md_create:
|
||||
+ raid_array._create()
|
||||
+ md_create.assert_called_with("/dev/md/raid", "raid0", ["/dev/member1", "/dev/member2"],
|
||||
+ 0, version="default", bitmap=False,
|
||||
+ chunk_size=mdraid.MD_CHUNK_SIZE)
|
||||
+
|
||||
+ raid_array = MDRaidArrayDevice(name="raid", level="raid1", member_devices=2,
|
||||
+ total_devices=2, parents=[member1, member2])
|
||||
+
|
||||
+ # no chunk_size specified and RAID1 -- no chunk size set (0)
|
||||
+ self.assertEqual(raid_array.chunk_size, Size(0))
|
||||
+
|
||||
+ with patch("blivet.devices.md.blockdev.md.create") as md_create:
|
||||
+ raid_array._create()
|
||||
+ md_create.assert_called_with("/dev/md/raid", "raid1", ["/dev/member1", "/dev/member2"],
|
||||
+ 0, version="default", bitmap=True,
|
||||
+ chunk_size=0)
|
||||
+
|
||||
def test_chunk_size2(self):
|
||||
|
||||
member1 = StorageDevice("member1", fmt=blivet.formats.get_format("mdmember"),
|
||||
@@ -40,11 +63,25 @@ def test_chunk_size2(self):
|
||||
raid_array = MDRaidArrayDevice(name="raid", level="raid0", member_devices=2,
|
||||
total_devices=2, parents=[member1, member2],
|
||||
chunk_size=Size("1024 KiB"))
|
||||
-
|
||||
self.assertEqual(raid_array.chunk_size, Size("1024 KiB"))
|
||||
|
||||
+ # for raid0 setting chunk_size = 0 means "default"
|
||||
+ raid_array.chunk_size = Size(0)
|
||||
+ self.assertEqual(raid_array.chunk_size, mdraid.MD_CHUNK_SIZE)
|
||||
+
|
||||
with six.assertRaisesRegex(self, ValueError, "new chunk size must be of type Size"):
|
||||
raid_array.chunk_size = 1
|
||||
|
||||
with six.assertRaisesRegex(self, ValueError, "new chunk size must be multiple of 4 KiB"):
|
||||
raid_array.chunk_size = Size("5 KiB")
|
||||
+
|
||||
+ with six.assertRaisesRegex(self, ValueError, "specifying chunk size is not allowed for raid1"):
|
||||
+ MDRaidArrayDevice(name="raid", level="raid1", member_devices=2,
|
||||
+ total_devices=2, parents=[member1, member2],
|
||||
+ chunk_size=Size("1024 KiB"))
|
||||
+
|
||||
+ raid_array = MDRaidArrayDevice(name="raid", level="raid1", member_devices=2,
|
||||
+ total_devices=2, parents=[member1, member2])
|
||||
+
|
||||
+ with six.assertRaisesRegex(self, ValueError, "specifying chunk size is not allowed for raid1"):
|
||||
+ raid_array.chunk_size = Size("512 KiB")
|
@ -0,0 +1,45 @@
|
||||
From 1561bfe8820118178bbb07021adc1cacd875c4c7 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Tue, 18 Oct 2022 12:28:37 +0200
|
||||
Subject: [PATCH] Fix potential AttributeError when getting stratis blockdev
|
||||
info
|
||||
|
||||
---
|
||||
blivet/static_data/stratis_info.py | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/blivet/static_data/stratis_info.py b/blivet/static_data/stratis_info.py
|
||||
index bd1c5a18..42f230ee 100644
|
||||
--- a/blivet/static_data/stratis_info.py
|
||||
+++ b/blivet/static_data/stratis_info.py
|
||||
@@ -124,20 +124,22 @@ class StratisInfo(object):
|
||||
log.error("Failed to get DBus properties of '%s'", blockdev_path)
|
||||
return None
|
||||
|
||||
+ blockdev_uuid = str(uuid.UUID(properties["Uuid"]))
|
||||
+
|
||||
pool_path = properties["Pool"]
|
||||
if pool_path == "/":
|
||||
pool_name = ""
|
||||
+ return StratisBlockdevInfo(path=properties["Devnode"], uuid=blockdev_uuid,
|
||||
+ pool_name="", pool_uuid="", object_path=blockdev_path)
|
||||
else:
|
||||
pool_info = self._get_pool_info(properties["Pool"])
|
||||
if not pool_info:
|
||||
return None
|
||||
pool_name = pool_info.name
|
||||
|
||||
- blockdev_uuid = str(uuid.UUID(properties["Uuid"]))
|
||||
-
|
||||
- return StratisBlockdevInfo(path=properties["Devnode"], uuid=blockdev_uuid,
|
||||
- pool_name=pool_name, pool_uuid=pool_info.uuid,
|
||||
- object_path=blockdev_path)
|
||||
+ return StratisBlockdevInfo(path=properties["Devnode"], uuid=blockdev_uuid,
|
||||
+ pool_name=pool_name, pool_uuid=pool_info.uuid,
|
||||
+ object_path=blockdev_path)
|
||||
|
||||
def _get_locked_pools_info(self):
|
||||
locked_pools = []
|
||||
--
|
||||
2.38.1
|
||||
|
@ -1,240 +0,0 @@
|
||||
From 3b9a781e138830a190d16c8dd970b800a086de46 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Wed, 4 Aug 2021 13:00:53 +0200
|
||||
Subject: [PATCH 1/3] edd_test: Locate the edd_data based on the test file
|
||||
location
|
||||
|
||||
We can't use the blivet.edd module location when running tests
|
||||
against installed version of blivet.
|
||||
---
|
||||
tests/devicelibs_test/edd_test.py | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tests/devicelibs_test/edd_test.py b/tests/devicelibs_test/edd_test.py
|
||||
index 23d736f4..7ec8d1e6 100644
|
||||
--- a/tests/devicelibs_test/edd_test.py
|
||||
+++ b/tests/devicelibs_test/edd_test.py
|
||||
@@ -1,7 +1,6 @@
|
||||
import unittest
|
||||
import mock
|
||||
import os
|
||||
-import inspect
|
||||
import logging
|
||||
import copy
|
||||
|
||||
@@ -110,9 +109,9 @@ class EddTestCase(unittest.TestCase):
|
||||
name = name[:-1]
|
||||
if name.startswith("/"):
|
||||
name = name[1:]
|
||||
- dirname = os.path.dirname(inspect.getfile(edd))
|
||||
+ dirname = os.path.abspath(os.path.dirname(__file__))
|
||||
return os.path.join(dirname,
|
||||
- "../../tests/devicelibs_test/edd_data/",
|
||||
+ "edd_data/",
|
||||
name)
|
||||
|
||||
def edd_debug(self, *args):
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
||||
From 7ad3824fceb98e2741820b76a9cfea5add338343 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Wed, 4 Aug 2021 13:02:08 +0200
|
||||
Subject: [PATCH 2/3] tests: Allow running tests without the tests directory in
|
||||
PYTHONPATH
|
||||
|
||||
When running the tests against installed version of blivet, the
|
||||
"tests" directory is not in PYTHONPATH so we need to import all
|
||||
helper modules using relative path.
|
||||
---
|
||||
tests/action_test.py | 2 +-
|
||||
tests/devicelibs_test/edd_test.py | 2 +-
|
||||
tests/{ => devicelibs_test}/lib.py | 0
|
||||
tests/formats_test/fs_test.py | 2 +-
|
||||
tests/formats_test/fslabeling.py | 2 +-
|
||||
tests/formats_test/fstesting.py | 2 +-
|
||||
tests/formats_test/fsuuid.py | 2 +-
|
||||
tests/formats_test/labeling_test.py | 2 +-
|
||||
tests/{ => formats_test}/loopbackedtestcase.py | 0
|
||||
tests/formats_test/luks_test.py | 2 +-
|
||||
tests/formats_test/lvmpv_test.py | 2 +-
|
||||
tests/partitioning_test.py | 2 +-
|
||||
12 files changed, 10 insertions(+), 10 deletions(-)
|
||||
rename tests/{ => devicelibs_test}/lib.py (100%)
|
||||
rename tests/{ => formats_test}/loopbackedtestcase.py (100%)
|
||||
|
||||
diff --git a/tests/action_test.py b/tests/action_test.py
|
||||
index 38a2e872..1e84c20b 100644
|
||||
--- a/tests/action_test.py
|
||||
+++ b/tests/action_test.py
|
||||
@@ -6,7 +6,7 @@ if PY3:
|
||||
else:
|
||||
from mock import Mock
|
||||
|
||||
-from tests.storagetestcase import StorageTestCase
|
||||
+from storagetestcase import StorageTestCase
|
||||
import blivet
|
||||
from blivet.formats import get_format
|
||||
from blivet.size import Size
|
||||
diff --git a/tests/devicelibs_test/edd_test.py b/tests/devicelibs_test/edd_test.py
|
||||
index 7ec8d1e6..379c7aeb 100644
|
||||
--- a/tests/devicelibs_test/edd_test.py
|
||||
+++ b/tests/devicelibs_test/edd_test.py
|
||||
@@ -6,7 +6,7 @@ import copy
|
||||
|
||||
from blivet import arch
|
||||
from blivet.devicelibs import edd
|
||||
-from tests import lib
|
||||
+from . import lib
|
||||
|
||||
|
||||
class FakeDevice(object):
|
||||
diff --git a/tests/lib.py b/tests/devicelibs_test/lib.py
|
||||
similarity index 100%
|
||||
rename from tests/lib.py
|
||||
rename to tests/devicelibs_test/lib.py
|
||||
diff --git a/tests/formats_test/fs_test.py b/tests/formats_test/fs_test.py
|
||||
index ab3499a7..bd643370 100644
|
||||
--- a/tests/formats_test/fs_test.py
|
||||
+++ b/tests/formats_test/fs_test.py
|
||||
@@ -10,7 +10,7 @@ from blivet.errors import DeviceFormatError
|
||||
from blivet.formats import get_format
|
||||
from blivet.devices import PartitionDevice, DiskDevice
|
||||
|
||||
-from tests import loopbackedtestcase
|
||||
+from . import loopbackedtestcase
|
||||
|
||||
from . import fstesting
|
||||
|
||||
diff --git a/tests/formats_test/fslabeling.py b/tests/formats_test/fslabeling.py
|
||||
index fbb28eee..0e0dc261 100644
|
||||
--- a/tests/formats_test/fslabeling.py
|
||||
+++ b/tests/formats_test/fslabeling.py
|
||||
@@ -2,7 +2,7 @@
|
||||
import abc
|
||||
import six
|
||||
|
||||
-from tests import loopbackedtestcase
|
||||
+from . import loopbackedtestcase
|
||||
from blivet.errors import FSError, FSReadLabelError
|
||||
from blivet.size import Size
|
||||
|
||||
diff --git a/tests/formats_test/fstesting.py b/tests/formats_test/fstesting.py
|
||||
index 86b2a116..e34584d8 100644
|
||||
--- a/tests/formats_test/fstesting.py
|
||||
+++ b/tests/formats_test/fstesting.py
|
||||
@@ -5,7 +5,7 @@ from six import add_metaclass
|
||||
import os
|
||||
import tempfile
|
||||
|
||||
-from tests import loopbackedtestcase
|
||||
+from . import loopbackedtestcase
|
||||
from blivet.errors import FSError, FSResizeError, DeviceFormatError
|
||||
from blivet.size import Size, ROUND_DOWN
|
||||
from blivet.formats import fs
|
||||
diff --git a/tests/formats_test/fsuuid.py b/tests/formats_test/fsuuid.py
|
||||
index c8003945..16aa19a6 100644
|
||||
--- a/tests/formats_test/fsuuid.py
|
||||
+++ b/tests/formats_test/fsuuid.py
|
||||
@@ -3,7 +3,7 @@ import abc
|
||||
import six
|
||||
from unittest import skipIf
|
||||
|
||||
-from tests import loopbackedtestcase
|
||||
+from . import loopbackedtestcase
|
||||
from blivet.errors import FSError, FSWriteUUIDError
|
||||
from blivet.size import Size
|
||||
from blivet.util import capture_output
|
||||
diff --git a/tests/formats_test/labeling_test.py b/tests/formats_test/labeling_test.py
|
||||
index e26cb7df..d24e6619 100644
|
||||
--- a/tests/formats_test/labeling_test.py
|
||||
+++ b/tests/formats_test/labeling_test.py
|
||||
@@ -1,10 +1,10 @@
|
||||
import unittest
|
||||
|
||||
-from tests import loopbackedtestcase
|
||||
from blivet.formats import device_formats
|
||||
import blivet.formats.fs as fs
|
||||
import blivet.formats.swap as swap
|
||||
|
||||
+from . import loopbackedtestcase
|
||||
from . import fslabeling
|
||||
|
||||
|
||||
diff --git a/tests/loopbackedtestcase.py b/tests/formats_test/loopbackedtestcase.py
|
||||
similarity index 100%
|
||||
rename from tests/loopbackedtestcase.py
|
||||
rename to tests/formats_test/loopbackedtestcase.py
|
||||
diff --git a/tests/formats_test/luks_test.py b/tests/formats_test/luks_test.py
|
||||
index be0d50b0..5423ebdf 100644
|
||||
--- a/tests/formats_test/luks_test.py
|
||||
+++ b/tests/formats_test/luks_test.py
|
||||
@@ -7,7 +7,7 @@ from blivet.formats.luks import LUKS
|
||||
|
||||
from blivet.size import Size
|
||||
|
||||
-from tests import loopbackedtestcase
|
||||
+from . import loopbackedtestcase
|
||||
|
||||
|
||||
class LUKSTestCase(loopbackedtestcase.LoopBackedTestCase):
|
||||
diff --git a/tests/formats_test/lvmpv_test.py b/tests/formats_test/lvmpv_test.py
|
||||
index 792a2f1d..da7270d9 100644
|
||||
--- a/tests/formats_test/lvmpv_test.py
|
||||
+++ b/tests/formats_test/lvmpv_test.py
|
||||
@@ -4,7 +4,7 @@ from blivet.formats.lvmpv import LVMPhysicalVolume
|
||||
|
||||
from blivet.size import Size
|
||||
|
||||
-from tests import loopbackedtestcase
|
||||
+from . import loopbackedtestcase
|
||||
|
||||
|
||||
class LVMPVTestCase(loopbackedtestcase.LoopBackedTestCase):
|
||||
diff --git a/tests/partitioning_test.py b/tests/partitioning_test.py
|
||||
index b7aa5045..a713aaa1 100644
|
||||
--- a/tests/partitioning_test.py
|
||||
+++ b/tests/partitioning_test.py
|
||||
@@ -29,7 +29,7 @@ from blivet.devices.lvm import LVMCacheRequest
|
||||
|
||||
from blivet.errors import PartitioningError
|
||||
|
||||
-from tests.imagebackedtestcase import ImageBackedTestCase
|
||||
+from imagebackedtestcase import ImageBackedTestCase
|
||||
from blivet.blivet import Blivet
|
||||
from blivet.util import sparsetmpfile
|
||||
from blivet.formats import get_format
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
||||
From 9ee41c8b60c56ce752e305be73001c7089f43011 Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Fri, 6 Aug 2021 14:51:01 +0200
|
||||
Subject: [PATCH 3/3] tests: Print version and blivet location when running
|
||||
tests
|
||||
|
||||
---
|
||||
tests/run_tests.py | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/tests/run_tests.py b/tests/run_tests.py
|
||||
index 32e3f2d3..8ad8b61a 100644
|
||||
--- a/tests/run_tests.py
|
||||
+++ b/tests/run_tests.py
|
||||
@@ -32,6 +32,11 @@ if __name__ == '__main__':
|
||||
|
||||
testdir = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
+ import blivet
|
||||
+ print("Running tests with Blivet %s from %s" % (blivet.__version__,
|
||||
+ os.path.abspath(os.path.dirname(blivet.__file__))),
|
||||
+ file=sys.stderr)
|
||||
+
|
||||
if args.testname:
|
||||
for n in args.testname:
|
||||
suite.addTests(unittest.TestLoader().loadTestsFromName(n))
|
||||
--
|
||||
2.31.1
|
||||
|
@ -0,0 +1,27 @@
|
||||
From b747c4ed07937f54a546ffb2f2c8c95e0797dd6c Mon Sep 17 00:00:00 2001
|
||||
From: Vojtech Trefny <vtrefny@redhat.com>
|
||||
Date: Thu, 20 Oct 2022 15:19:29 +0200
|
||||
Subject: [PATCH] tests: Skip XFS resize test on CentOS/RHEL 8
|
||||
|
||||
Partitions on loop devices are broken on CentOS/RHEL 8.
|
||||