From 8e5fe75e4ee76eb62eb51001c28f1f1443f0a563 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Fri, 18 Oct 2024 07:13:42 +0200 Subject: [PATCH 21/40] Rename inhibitwhenluks actor to checkluks The actor nowadays does more then just inhibiting the upgrade when LUKS is detected. Let's rename it to respect current behaviour. --- .../common/actors/{inhibitwhenluks => checkluks}/actor.py | 6 +++--- .../inhibitwhenluks.py => checkluks/libraries/checkluks.py} | 0 .../tests/test_checkluks.py} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename repos/system_upgrade/common/actors/{inhibitwhenluks => checkluks}/actor.py (85%) rename repos/system_upgrade/common/actors/{inhibitwhenluks/libraries/inhibitwhenluks.py => checkluks/libraries/checkluks.py} (100%) rename repos/system_upgrade/common/actors/{inhibitwhenluks/tests/test_inhibitwhenluks.py => checkluks/tests/test_checkluks.py} (100%) diff --git a/repos/system_upgrade/common/actors/inhibitwhenluks/actor.py b/repos/system_upgrade/common/actors/checkluks/actor.py similarity index 85% rename from repos/system_upgrade/common/actors/inhibitwhenluks/actor.py rename to repos/system_upgrade/common/actors/checkluks/actor.py index 65607167..607fd040 100644 --- a/repos/system_upgrade/common/actors/inhibitwhenluks/actor.py +++ b/repos/system_upgrade/common/actors/checkluks/actor.py @@ -1,11 +1,11 @@ from leapp.actors import Actor -from leapp.libraries.actor.inhibitwhenluks import check_invalid_luks_devices +from leapp.libraries.actor.checkluks import check_invalid_luks_devices from leapp.models import CephInfo, LuksDumps, StorageInfo, TargetUserSpaceUpgradeTasks, UpgradeInitramfsTasks from leapp.reporting import Report from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -class InhibitWhenLuks(Actor): +class CheckLuks(Actor): """ Check if any encrypted partitions are in use and whether they are supported for the upgrade. @@ -15,7 +15,7 @@ class InhibitWhenLuks(Actor): during the process). """ - name = 'check_luks_and_inhibit' + name = 'check_luks' consumes = (CephInfo, LuksDumps, StorageInfo) produces = (Report, TargetUserSpaceUpgradeTasks, UpgradeInitramfsTasks) tags = (ChecksPhaseTag, IPUWorkflowTag) diff --git a/repos/system_upgrade/common/actors/inhibitwhenluks/libraries/inhibitwhenluks.py b/repos/system_upgrade/common/actors/checkluks/libraries/checkluks.py similarity index 100% rename from repos/system_upgrade/common/actors/inhibitwhenluks/libraries/inhibitwhenluks.py rename to repos/system_upgrade/common/actors/checkluks/libraries/checkluks.py diff --git a/repos/system_upgrade/common/actors/inhibitwhenluks/tests/test_inhibitwhenluks.py b/repos/system_upgrade/common/actors/checkluks/tests/test_checkluks.py similarity index 100% rename from repos/system_upgrade/common/actors/inhibitwhenluks/tests/test_inhibitwhenluks.py rename to repos/system_upgrade/common/actors/checkluks/tests/test_checkluks.py -- 2.47.0