[6.19.z] Change 'iop_advisor_engine' settings to 'iop'. (#20899)

Change 'iop_advisor_engine' settings to 'iop'. (#20861)

(cherry picked from commit 429c0cc)

Co-authored-by: Tasos Papaioannou <tpapaioa@redhat.com>

Author: Satellite-QE

conf/rh_cloud.yaml.template

@@ -4,7 +4,7 @@ RH_CLOUD:
   ORGANIZATION:
   ACTIVATION_KEY: ak_name
   CRC_ENV: prod
-  IOP_ADVISOR_ENGINE:
+  IOP:
     IMAGE_PATH:   # For 6.17 IoP
     IMAGE_PATHS:  # For 6.18+ IoP
     REGISTRY:

pytest_fixtures/component/maintain.py

@@ -61,7 +61,7 @@ def sat_maintain(request):
     yield infra_host
 
     if host_type == 'satellite_iop':
-        iop_settings = settings.rh_cloud.iop_advisor_engine
+        iop_settings = settings.rh_cloud.iop
         if not infra_host.is_podman_logged_in(iop_settings.stage_registry):
             infra_host.podman_login(
                 iop_settings.stage_username,

pytest_fixtures/core/sat_cap_factory.py

@@ -225,8 +225,7 @@ def module_unconfigured_satellite():
 def get_iop_deploy_args():
     """Get deploy arguments for IoP workflow"""
     image_args = {
-        f'iop_{service}_image': path
-        for service, path in settings.rh_cloud.iop_advisor_engine.image_paths.items()
+        f'iop_{service}_image': path for service, path in settings.rh_cloud.iop.image_paths.items()
     }
     return settings.server.deploy_arguments.to_dict() | image_args
 

robottelo/config/validators.py

@@ -338,9 +338,7 @@
     ],
     rh_cloud=[
         Validator('rh_cloud.token', required=True),
-        Validator(
-            'rh_cloud.iop_advisor_engine.image_paths', default={}, apply_default_on_none=True
-        ),
+        Validator('rh_cloud.iop.image_paths', default={}, apply_default_on_none=True),
     ],
     repos=[
         Validator(

robottelo/host_helpers/satellite_mixins.py

@@ -453,7 +453,7 @@ class IoPSetup:
     def get_iop_image_paths():
         return {
             f'iop::{service}::image': path
-            for service, path in settings.rh_cloud.iop_advisor_engine.image_paths.items()
+            for service, path in settings.rh_cloud.iop.image_paths.items()
         }
 
     def configure_iop(self):
@@ -466,7 +466,7 @@ def configure_iop(self):
 
         self.ensure_podman_installed()
 
-        iop_settings = settings.rh_cloud.iop_advisor_engine
+        iop_settings = settings.rh_cloud.iop
         self.podman_login(iop_settings.username, iop_settings.token, iop_settings.registry)
         self.podman_login(
             iop_settings.stage_username, iop_settings.stage_token, iop_settings.stage_registry

robottelo/hosts.py

@@ -1621,7 +1621,7 @@ def ensure_podman_installed(self):
 
     def podman_login(self, username=None, password=None, registry=None):
         """Login to a podman registry."""
-        iop_settings = settings.rh_cloud.iop_advisor_engine
+        iop_settings = settings.rh_cloud.iop
         username = username or iop_settings.username
         password = password or iop_settings.token
         registry = registry or iop_settings.registry
@@ -1652,7 +1652,7 @@ def podman_login(self, username=None, password=None, registry=None):
 
     def is_podman_logged_in(self, registry=None):
         """Check if podman is logged into a registry."""
-        registry = registry or settings.rh_cloud.iop_advisor_engine.registry
+        registry = registry or settings.rh_cloud.iop.registry
         return (
             self.execute(
                 f'podman login --get-login --authfile {constants.PODMAN_AUTHFILE_PATH} {registry}'
@@ -1663,7 +1663,7 @@ def is_podman_logged_in(self, registry=None):
 
     def podman_logout(self, registry=None):
         """Logout of a podman registry."""
-        registry = registry or settings.rh_cloud.iop_advisor_engine.registry
+        registry = registry or settings.rh_cloud.iop.registry
         if self.is_podman_logged_in(registry):
             cmd_result = self.execute(
                 f'podman logout --authfile {constants.PODMAN_AUTHFILE_PATH} {registry}'

tests/foreman/cli/test_rhcloud_iop.py

@@ -70,7 +70,7 @@ def test_positive_install_iop_custom_certs(
     """
     satellite = sat_ready_rhel
     host = rhel_contenthost
-    iop_settings = settings.rh_cloud.iop_advisor_engine
+    iop_settings = settings.rh_cloud.iop
 
     # Satellite + IoP installation
 

tests/foreman/maintain/test_health.py

@@ -45,7 +45,7 @@ def test_podman_login_check(request, sat_maintain):
 
     :Verifies: SAT-35282
     """
-    iop_settings = settings.rh_cloud.iop_advisor_engine
+    iop_settings = settings.rh_cloud.iop
 
     request.addfinalizer(lambda: sat_maintain.podman_logout(iop_settings.registry))