refactor(workbenches): extract check for internal image registry presence

the check for the internal image registry presence on the cluster is
extracted from the fixture to a function for common use

Author: jstourac

tests/workbenches/conftest.py

@@ -13,11 +13,11 @@
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.route import Route
 from ocp_resources.notebook import Notebook
-from ocp_resources.config_imageregistry_operator_openshift_io import Config
 
 from utilities.constants import Labels
 from utilities import constants
 from utilities.constants import INTERNAL_IMAGE_REGISTRY_PATH
+from utilities.infra import check_internal_image_registry_available
 
 LOGGER = get_logger(name=__name__)
 
@@ -38,25 +38,6 @@ def users_persistent_volume_claim(
         yield pvc
 
 
-@pytest.fixture(scope="function")
-def internal_image_registry(
-    admin_client: DynamicClient,
-) -> Generator[bool, None, None]:
-    """Check if internal image registry is available by checking the imageregistry config managementState"""
-    try:
-        # Access the imageregistry.operator.openshift.io/v1 Config resource named "cluster"
-        config_instance = Config(client=admin_client, name="cluster")
-
-        management_state = config_instance.instance.spec.get("managementState", "").lower()
-        is_available = management_state == "managed"
-
-        LOGGER.info(f"Image registry management state: {management_state}, available: {is_available}")
-        yield is_available
-    except (ResourceNotFoundError, Exception) as e:
-        LOGGER.warning(f"Failed to check image registry config: {e}")
-        yield False
-
-
 @pytest.fixture(scope="function")
 def minimal_image() -> Generator[str, None, None]:
     """Provides a full image name of a minimal workbench image"""
@@ -68,7 +49,6 @@ def minimal_image() -> Generator[str, None, None]:
 def default_notebook(
     request: pytest.FixtureRequest,
     admin_client: DynamicClient,
-    internal_image_registry: bool,
     minimal_image: str,
 ) -> Generator[Notebook, None, None]:
     """Returns a new Notebook CR for a given namespace, name, and image"""
@@ -85,6 +65,9 @@ def default_notebook(
     username = get_username(dyn_client=admin_client)
     assert username, "Failed to determine username from the cluster"
 
+    # Check internal image registry availability
+    internal_image_registry = check_internal_image_registry_available(admin_client=admin_client)
+
     # Set the image path based on internal image registry status
     minimal_image_path = (
         f"{INTERNAL_IMAGE_REGISTRY_PATH}/{py_config['applications_namespace']}/{minimal_image}"

utilities/infra.py

@@ -27,6 +27,7 @@
 from ocp_resources.catalog_source import CatalogSource
 from ocp_resources.cluster_service_version import ClusterServiceVersion
 from ocp_resources.config_map import ConfigMap
+from ocp_resources.config_imageregistry_operator_openshift_io import Config
 from ocp_resources.console_cli_download import ConsoleCLIDownload
 from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.deployment import Deployment
@@ -1237,3 +1238,19 @@ def download_oc_console_cli(tmpdir: LocalPath) -> str:
     binary_path = os.path.join(tmpdir, extracted_filenames[0])
     os.chmod(binary_path, stat.S_IRUSR | stat.S_IXUSR)
     return binary_path
+
+
+def check_internal_image_registry_available(admin_client: DynamicClient) -> bool:
+    """Check if internal image registry is available by checking the imageregistry config managementState"""
+    try:
+        # Access the imageregistry.operator.openshift.io/v1 Config resource named "cluster"
+        config_instance = Config(client=admin_client, name="cluster")
+
+        management_state = config_instance.instance.spec.get("managementState", "").lower()
+        is_available = management_state == "managed"
+
+        LOGGER.info(f"Image registry management state: {management_state}, available: {is_available}")
+        return is_available
+    except (ResourceNotFoundError, Exception) as e:
+        LOGGER.warning(f"Failed to check image registry config: {e}")
+        return False