fix: address review comments

Signed-off-by: lugi0 <lgiorgi@redhat.com>

Author: lugi0

tests/model_registry/model_catalog/conftest.py

@@ -18,7 +18,7 @@
     REDHAT_AI_CATALOG_ID,
 )
 from tests.model_registry.model_catalog.utils import get_models_from_catalog_api
-from tests.model_registry.constants import CUSTOM_CATALOG_ID1
+from tests.model_registry.constants import CUSTOM_CATALOG_ID1, DEFAULT_CUSTOM_MODEL_CATALOG
 from tests.model_registry.utils import (
     get_rest_headers,
     is_model_catalog_ready,
@@ -225,3 +225,27 @@ def models_from_filter_query(
     LOGGER.info(f"Filter query '{filter_query}' returned {len(model_names)} models: {', '.join(model_names)}")
 
     return model_names
+
+
+@pytest.fixture()
+def labels_configmap_patch(admin_client: DynamicClient, model_registry_namespace: str) -> dict[str, Any]:
+    # Get the editable ConfigMap
+    sources_cm = ConfigMap(name=DEFAULT_CUSTOM_MODEL_CATALOG, client=admin_client, namespace=model_registry_namespace)
+
+    # Parse current data and add test label
+    current_data = yaml.safe_load(sources_cm.instance.data["sources.yaml"])
+
+    new_label = {
+        "name": "test-dynamic",
+        "displayName": "Dynamic Test Label",
+        "description": "A label added during test execution",
+    }
+
+    if "labels" not in current_data:
+        current_data["labels"] = []
+    current_data["labels"].append(new_label)
+
+    patches = {"data": {"sources.yaml": yaml.dump(current_data, default_flow_style=False)}}
+
+    with ResourceEditor(patches={sources_cm: patches}):
+        yield patches

tests/model_registry/model_catalog/test_labels_endpoint.py

@@ -1,11 +1,8 @@
 import pytest
-import yaml
-
+from typing import Any
 from kubernetes.dynamic import DynamicClient
 from simple_logger.logger import get_logger
 
-from ocp_resources.config_map import ConfigMap
-from ocp_resources.resource import ResourceEditor
 
 from utilities.infra import get_openshift_token
 from timeout_sampler import TimeoutSampler
@@ -51,45 +48,24 @@ def test_labels_endpoint_configmap_updates(
         admin_client: DynamicClient,
         model_registry_namespace: str,
         model_catalog_rest_url: list[str],
+        labels_configmap_patch: dict[str, Any],
     ):
         """
         Sanity test: Edit the editable ConfigMap and verify changes are reflected in API.
         """
+        _ = labels_configmap_patch
 
-        # Get the editable ConfigMap
-        sources_cm = ConfigMap(name="model-catalog-sources", client=admin_client, namespace=model_registry_namespace)
-
-        # Parse current data and add test label
-        current_data = yaml.safe_load(sources_cm.instance.data["sources.yaml"])
-
-        new_label = {
-            "name": "test-dynamic",
-            "displayName": "Dynamic Test Label",
-            "description": "A label added during test execution",
-        }
-
-        if "labels" not in current_data:
-            current_data["labels"] = []
-        current_data["labels"].append(new_label)
-
-        # Update ConfigMap temporarily
-        patches = {"data": {"sources.yaml": yaml.dump(current_data, default_flow_style=False)}}
-
-        with ResourceEditor(patches={sources_cm: patches}):
-
-            def _check_updated_labels():
-                # Get updated expected labels from ConfigMaps
-                expected_labels = get_labels_from_configmaps(
-                    admin_client=admin_client, namespace=model_registry_namespace
-                )
+        def _check_updated_labels():
+            # Get updated expected labels from ConfigMaps
+            expected_labels = get_labels_from_configmaps(admin_client=admin_client, namespace=model_registry_namespace)
 
-                # Get labels from API
-                api_labels = get_labels_from_api(
-                    model_catalog_rest_url=model_catalog_rest_url[0], user_token=get_openshift_token()
-                )
+            # Get labels from API
+            api_labels = get_labels_from_api(
+                model_catalog_rest_url=model_catalog_rest_url[0], user_token=get_openshift_token()
+            )
 
-                # Verify they match (including the new label)
-                verify_labels_match(expected_labels=expected_labels, api_labels=api_labels)
+            # Verify they match (including the new label)
+            verify_labels_match(expected_labels=expected_labels, api_labels=api_labels)
 
-            sampler = TimeoutSampler(wait_timeout=60, sleep=5, func=_check_updated_labels)
-            next(iter(sampler))
+        sampler = TimeoutSampler(wait_timeout=60, sleep=5, func=_check_updated_labels)
+        next(iter(sampler))

tests/model_registry/model_catalog/utils.py

@@ -22,6 +22,7 @@
     CATALOG_CONTAINER,
     PERFORMANCE_DATA_DIR,
 )
+from tests.model_registry.constants import DEFAULT_CUSTOM_MODEL_CATALOG, DEFAULT_MODEL_CATALOG_CM
 from tests.model_registry.utils import execute_get_command
 from tests.model_registry.utils import get_rest_headers
 
@@ -1138,13 +1139,13 @@ def get_labels_from_configmaps(admin_client: DynamicClient, namespace: str) -> L
     labels = []
 
     # Get labels from default ConfigMap
-    default_cm = ConfigMap(name="model-catalog-default-sources", client=admin_client, namespace=namespace)
+    default_cm = ConfigMap(name=DEFAULT_MODEL_CATALOG_CM, client=admin_client, namespace=namespace)
     default_data = yaml.safe_load(default_cm.instance.data["sources.yaml"])
     if "labels" in default_data:
         labels.extend(default_data["labels"])
 
     # Get labels from sources ConfigMap
-    sources_cm = ConfigMap(name="model-catalog-sources", client=admin_client, namespace=namespace)
+    sources_cm = ConfigMap(name=DEFAULT_CUSTOM_MODEL_CATALOG, client=admin_client, namespace=namespace)
     sources_data = yaml.safe_load(sources_cm.instance.data["sources.yaml"])
     if "labels" in sources_data:
         labels.extend(sources_data["labels"])