update cloudlinux actors codebase to recent core changes

Monstrofil · Monstrofil · commit fcacc53b2324 · 2024-08-22T15:35:46.000+03:00
diff --git a/repos/system_upgrade/cloudlinux/actors/checkcllicense/actor.py b/repos/system_upgrade/cloudlinux/actors/checkcllicense/actor.py
@@ -65,8 +65,8 @@ def process(self):
                 reporting.Title(title),
                 reporting.Summary(summary),
                 reporting.Severity(reporting.Severity.HIGH),
-                reporting.Tags([reporting.Tags.OS_FACTS]),
-                reporting.Flags([reporting.Flags.INHIBITOR]),
+                reporting.Groups([reporting.Groups.OS_FACTS]),
+                reporting.Groups([reporting.Groups.INHIBITOR]),
                 reporting.Remediation(hint=remediation),
             ])
         else:
diff --git a/repos/system_upgrade/cloudlinux/actors/checkrhnclienttools/actor.py b/repos/system_upgrade/cloudlinux/actors/checkrhnclienttools/actor.py
@@ -53,6 +53,6 @@ def process(self):
                 reporting.Summary(summary),
                 reporting.Severity(reporting.Severity.HIGH),
                 reporting.Tags([reporting.Tags.OS_FACTS]),
-                reporting.Flags([reporting.Flags.INHIBITOR]),
+                reporting.Groups([reporting.Groups.INHIBITOR]),
                 reporting.Remediation(hint=remediation),
             ])
diff --git a/repos/system_upgrade/cloudlinux/actors/clmysqlrepositorysetup/libraries/clmysqlrepositorysetup.py b/repos/system_upgrade/cloudlinux/actors/clmysqlrepositorysetup/libraries/clmysqlrepositorysetup.py
@@ -134,7 +134,7 @@ def clmysql_process(self, repofile_name, repofile_data):
                         ),
                         reporting.Severity(reporting.Severity.MEDIUM),
                         reporting.Tags([reporting.Tags.REPOSITORY]),
-                        reporting.Flags([reporting.Flags.INHIBITOR]),
+                        reporting.Groups([reporting.Groups.INHIBITOR]),
                         reporting.Remediation(
                             hint=(
                                 "Upgrade to a more recent MySQL version, or"
@@ -250,7 +250,7 @@ def mysql_process(self, repofile_name, repofile_data):
                             ),
                             reporting.Severity(reporting.Severity.MEDIUM),
                             reporting.Tags([reporting.Tags.REPOSITORY]),
-                            reporting.Flags([reporting.Flags.INHIBITOR]),
+                            reporting.Groups([reporting.Groups.INHIBITOR]),
                             reporting.Remediation(
                                 hint=(
                                     "Upgrade to a more recent MySQL version, "
diff --git a/repos/system_upgrade/cloudlinux/actors/detectcontrolpanel/actor.py b/repos/system_upgrade/cloudlinux/actors/detectcontrolpanel/actor.py
@@ -51,6 +51,6 @@ def process(self):
                     ),
                     reporting.Severity(reporting.Severity.HIGH),
                     reporting.Tags([reporting.Tags.OS_FACTS]),
-                    reporting.Flags([reporting.Flags.INHIBITOR]),
+                    reporting.Groups([reporting.Groups.INHIBITOR]),
                 ]
             )
diff --git a/repos/system_upgrade/cloudlinux/actors/switchclnchanneldownload/actor.py b/repos/system_upgrade/cloudlinux/actors/switchclnchanneldownload/actor.py
@@ -49,7 +49,7 @@ def process(self):
                     reporting.Tags(
                         [reporting.Tags.OS_FACTS, reporting.Tags.AUTHENTICATION]
                     ),
-                    reporting.Flags([reporting.Flags.INHIBITOR]),
+                    reporting.Groups([reporting.Groups.INHIBITOR]),
                 ]
             )
         except OSError as e:
diff --git a/repos/system_upgrade/cloudlinux/actors/switchclnchannelreset/actor.py b/repos/system_upgrade/cloudlinux/actors/switchclnchannelreset/actor.py
@@ -41,7 +41,7 @@ def process(self):
                     reporting.Tags(
                         [reporting.Tags.OS_FACTS, reporting.Tags.AUTHENTICATION]
                     ),
-                    reporting.Flags([reporting.Flags.INHIBITOR]),
+                    reporting.Groups([reporting.Groups.INHIBITOR]),
                 ]
             )
         except OSError as e:
diff --git a/repos/system_upgrade/cloudlinux/actors/updatealmalinuxkey/actor.py b/repos/system_upgrade/cloudlinux/actors/updatealmalinuxkey/actor.py
@@ -45,7 +45,7 @@ def process(self):
                     reporting.Tags(
                         [reporting.Tags.OS_FACTS, reporting.Tags.NETWORK]
                     ),
-                    reporting.Flags([reporting.Flags.INHIBITOR]),
+                    reporting.Groups([reporting.Groups.INHIBITOR]),
                 ]
             )
         except OSError as e:
diff --git a/repos/system_upgrade/common/actors/dummyinhibitor/actor.py b/repos/system_upgrade/common/actors/dummyinhibitor/actor.py
@@ -25,5 +25,5 @@ def process(self):
                 ),
                 reporting.Severity(reporting.Severity.HIGH),
                 reporting.Tags([reporting.Tags.SANITY]),
-                reporting.Flags([reporting.Flags.INHIBITOR]),
+                reporting.Groups([reporting.Groups.INHIBITOR]),
             ])
diff --git a/repos/system_upgrade/common/actors/kernel/checkinstalledkernels/libraries/checkinstalledkernels.py b/repos/system_upgrade/common/actors/kernel/checkinstalledkernels/libraries/checkinstalledkernels.py
@@ -93,9 +93,9 @@ def process():
     # LVE kernels can be installed over newer kernels and be older
     # than the most current avalable ones - that's not an inhibitor, it's expected
     # They're marked with 'lve' in the release string
-    lve_kernel = "lve" in current_evr[2]
+    lve_kernel = "lve" in current_kernel_evr[2]
 
-    if current_evr != newest_evr and not lve_kernel:
+    if current_kernel_evr != newest_kernel_evr and not lve_kernel:
         title = 'Newest installed kernel not in use'
         summary = ('To ensure a stable upgrade, the machine needs to be'
                    ' booted into the latest installed kernel.')
diff --git a/repos/system_upgrade/el7toel8/actors/checkfirstpartitionoffset/libraries/check_first_partition_offset.py b/repos/system_upgrade/el7toel8/actors/checkfirstpartitionoffset/libraries/check_first_partition_offset.py
@@ -57,5 +57,5 @@ def check_first_partition_offset():
             reporting.Remediation(hint=hint.format(SAFE_OFFSET_BYTES // 1024)),
             reporting.Severity(reporting.Severity.HIGH),
             reporting.Tags([reporting.Tags.BOOT]),
-            reporting.Flags([reporting.Flags.INHIBITOR]),
+            reporting.Groups([reporting.Groups.INHIBITOR]),
         ])
diff --git a/repos/system_upgrade/el7toel8/actors/checklegacygrub/libraries/check_legacy_grub.py b/repos/system_upgrade/el7toel8/actors/checklegacygrub/libraries/check_legacy_grub.py
@@ -28,13 +28,7 @@ def has_legacy_grub(device):
 
 def check_grub_disks_for_legacy_grub():
     # Both GRUB2 and Grub Legacy are recognized by `get_grub_devices`
-    # oshyshatskyi: newer versions of leapp support multiple grub devices e.g. for raid
-    # because our version does not support that, we always check only one device
-    # https://github.com/oamg/leapp-repository/commit/2ba44076625e35aabfd2a1f9e45b2934f99f1e8d
-    grub_device = grub_lib.get_grub_device()
-    grub_devices = []
-    if grub_device:
-        grub_devices.append(grub_device)
+    grub_devices = grub_lib.get_grub_devices()
 
     legacy_grub_devices = []
     for device in grub_devices:
@@ -71,7 +65,7 @@ def check_grub_disks_for_legacy_grub():
             reporting.Severity(reporting.Severity.HIGH),
             reporting.Tags([reporting.Tags.BOOT]),
             reporting.Remediation(hint=hint),
-            reporting.Flags([reporting.Flags.INHIBITOR]),
+            reporting.Groups([reporting.Groups.INHIBITOR]),
             reporting.ExternalLink(url=MIGRATION_TO_GRUB2_GUIDE_URL,
                                    title='How to install GRUB2 after a RHEL6 to RHEL7 upgrade'),
         ])
diff --git a/repos/system_upgrade/el7toel8/actors/scangrubdevpartitionlayout/libraries/scan_layout.py b/repos/system_upgrade/el7toel8/actors/scangrubdevpartitionlayout/libraries/scan_layout.py
@@ -1,6 +1,5 @@
 from leapp.libraries.stdlib import api, CalledProcessError, run
-from leapp.models import GRUBDevicePartitionLayout, PartitionInfo
-from leapp.libraries.common import grub
+from leapp.models import GRUBDevicePartitionLayout, GrubInfo, PartitionInfo
 
 SAFE_OFFSET_BYTES = 1024*1024  # 1MiB
 
@@ -82,20 +81,11 @@ def get_partition_layout(device):
 
 
 def scan_grub_device_partition_layout():
-    # oshyshatskyi: newer versions of leapp support multiple grub devices e.g. for raid
-    # because our version does not support that, we always check only one device
-    # https://github.com/oamg/leapp-repository/commit/2ba44076625e35aabfd2a1f9e45b2934f99f1e8d
-    grub_device = grub.get_grub_device()
-    if not grub_device:
+    grub_devices = next(api.consume(GrubInfo), None)
+    if not grub_devices:
         return
-    grub_devices = [grub_device]
-
-    # oshyshatskyi: originally rhel used actor to collect information
-    # but we are too out of date to cherry-pick it
-    # anyway, actor did the same thing:
-    #   devices = grub.get_grub_devices()
-    #   grub_info = GrubInfo(orig_devices=devices)
-    for device in grub_devices:
+
+    for device in grub_devices.orig_devices:
         dev_info = get_partition_layout(device)
         if dev_info:
             api.produce(dev_info)

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ def process(self):`
`51`	`51`	`),`
`52`	`52`	`reporting.Severity(reporting.Severity.HIGH),`
`53`	`53`	`reporting.Tags([reporting.Tags.OS_FACTS]),`
`54`		`- reporting.Flags([reporting.Flags.INHIBITOR]),`
	`54`	`+ reporting.Groups([reporting.Groups.INHIBITOR]),`
`55`	`55`	`]`
`56`	`56`	`)`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ def process(self):`
`49`	`49`	`reporting.Tags(`
`50`	`50`	`[reporting.Tags.OS_FACTS, reporting.Tags.AUTHENTICATION]`
`51`	`51`	`),`
`52`		`- reporting.Flags([reporting.Flags.INHIBITOR]),`
	`52`	`+ reporting.Groups([reporting.Groups.INHIBITOR]),`
`53`	`53`	`]`
`54`	`54`	`)`
`55`	`55`	`except OSError as e:`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ def process(self):`
`41`	`41`	`reporting.Tags(`
`42`	`42`	`[reporting.Tags.OS_FACTS, reporting.Tags.AUTHENTICATION]`
`43`	`43`	`),`
`44`		`- reporting.Flags([reporting.Flags.INHIBITOR]),`
	`44`	`+ reporting.Groups([reporting.Groups.INHIBITOR]),`
`45`	`45`	`]`
`46`	`46`	`)`
`47`	`47`	`except OSError as e:`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ def process(self):`
`45`	`45`	`reporting.Tags(`
`46`	`46`	`[reporting.Tags.OS_FACTS, reporting.Tags.NETWORK]`
`47`	`47`	`),`
`48`		`- reporting.Flags([reporting.Flags.INHIBITOR]),`
	`48`	`+ reporting.Groups([reporting.Groups.INHIBITOR]),`
`49`	`49`	`]`
`50`	`50`	`)`
`51`	`51`	`except OSError as e:`