Merge pull request #9455 from mcalmer/fix-payg-pkglist

Fix payg pkglist
uyuni-project · Nov 9, 2024 · ac19845 · ac19845
2 parents 268f856 + bed968f
commit ac19845
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/...emanager/supportutils-plugin-susemanager.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist b/...emanager/supportutils-plugin-susemanager.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist
@@ -0,0 +1 @@
+- change supportconfig as some packages were renamed (bsc#1233014)
diff --git a/susemanager-utils/supportutils-plugin-susemanager/susemanager b/susemanager-utils/supportutils-plugin-susemanager/susemanager
@@ -96,12 +96,12 @@ if [ -x /usr/bin/instance-flavor-check ]; then
                 validate_rpm "python-instance-billing-flavor-check"
                 validate_rpm "billing-data-service"
                 validate_rpm "csp-billing-adapter-service"
-                validate_rpm "python3-csp-billing-adapter"
-                validate_rpm "python3-csp-billing-adapter-local"
-                validate_rpm "python3-csp-billing-adapter-amazon"
+                validate_rpm "python311-csp-billing-adapter"
+                validate_rpm "python311-csp-billing-adapter-local"
+                validate_rpm "python311-csp-billing-adapter-amazon"
                 validate_rpm "suma-amazon-adapter-config-llc"
                 validate_rpm "suma-amazon-adapter-config-ltd"
-                validate_rpm "python3-csp-billing-adapter-azure"
+                validate_rpm "python311-csp-billing-adapter-azure"
                 validate_rpm "suma-azure-adapter-config-llc"
                 validate_rpm "suma-azure-adapter-config-ltd"
         else

diff --git a/uyuni/uyuni-payg-timer/uyuni-payg-extract-data.py b/uyuni/uyuni-payg-timer/uyuni-payg-extract-data.py
@@ -235,12 +235,13 @@ def perform_compliants_checks():
         check_pkgs = [
             "python-instance-billing-flavor-check",
             "csp-billing-adapter-service",
-            "python3-csp-billing-adapter-local",
+            "python311-csp-billing-adapter",
+            "python311-csp-billing-adapter-local",
         ]
         if cloudProvider == "AWS":
-            check_pkgs.append("python3-csp-billing-adapter-amazon")
+            check_pkgs.append("python311-csp-billing-adapter-amazon")
         elif cloudProvider == "AZURE":
-            check_pkgs.append("python3-csp-billing-adapter-microsoft")
+            check_pkgs.append("python311-csp-billing-adapter-microsoft")
 
         modified_packages = any(has_package_modifications(pkg) for pkg in check_pkgs)
 

diff --git a/uyuni/uyuni-payg-timer/uyuni-payg-timer.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist b/uyuni/uyuni-payg-timer/uyuni-payg-timer.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist
@@ -0,0 +1 @@
+- fix compliance check as some packages were renamed (bsc#1233014)