ModelCatalog: update default tests to reflect expected behavior

Author: dbasunag

tests/model_registry/model_catalog/conftest.py

@@ -54,8 +54,3 @@ def updated_catalog_config_map(
         wait_for_model_catalog_api(url=model_catalog_rest_url[0], headers=model_registry_rest_headers)
         yield catalog_config_map
     is_model_catalog_ready(client=admin_client, model_registry_namespace=model_registry_namespace)
-
-
-@pytest.fixture(scope="class")
-def expected_catalog_values(request: pytest.FixtureRequest) -> dict[str, str]:
-    return request.param

tests/model_registry/model_catalog/test_custom_model_catalog.py

@@ -28,13 +28,10 @@
     indirect=True,
 )
 @pytest.mark.usefixtures(
-    "updated_dsc_component_state_scope_session",
     "model_registry_namespace",
-    "model_registry_metadata_db_resources",
-    "model_registry_instance",
     "updated_catalog_config_map",
 )
-class TestModelCatalogRhec:
+class TestModelCatalogCustom:
     def test_model_custom_catalog_sources(
         self: Self,
         updated_catalog_config_map: tuple[ConfigMap, str, str],

tests/model_registry/model_catalog/test_default_model_catalog.py

@@ -1,46 +1,78 @@
 import pytest
 import yaml
+from kubernetes.dynamic import DynamicClient
 
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from ocp_resources.deployment import Deployment
 from simple_logger.logger import get_logger
-from typing import Self
+from typing import Self, Any
 
 from ocp_resources.pod import Pod
 from ocp_resources.config_map import ConfigMap
-from tests.model_registry.model_catalog.utils import validate_model_catalog_enabled, execute_get_command
+from ocp_resources.route import Route
+from ocp_resources.service import Service
+from tests.model_registry.model_catalog.utils import validate_model_catalog_enabled, execute_get_command, \
+    validate_model_catalog_resource, validate_default_catalog
 
 LOGGER = get_logger(name=__name__)
 
 
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_session",
     "model_registry_namespace",
-    "model_registry_metadata_db_resources",
 )
 class TestModelCatalog:
-    def test_config_map_not_created(self: Self, catalog_config_map: ConfigMap):
-        # Check that the default configmaps does not exist, when model registry is not created
-        assert not catalog_config_map.exists
 
-    def test_config_map_exists(self: Self, model_registry_instance: ModelRegistry, catalog_config_map: ConfigMap):
-        # Check that the default configmaps is created when model registry is enabled.
+    def test_config_map_exists(self: Self, catalog_config_map: ConfigMap):
+        # Check that the default configmaps is created when model registry is
+        # enabled on data science cluster.
         assert catalog_config_map.exists, f"{catalog_config_map.name} does not exist"
-        models = yaml.safe_load(catalog_config_map.instance.data["sources.yaml"])["catalogs"]
-        assert not models, f"Expected no default models to be present. Actual: {models}"
+        catalogs = yaml.safe_load(catalog_config_map.instance.data["sources.yaml"])["catalogs"]
+        assert catalogs
+        assert len(catalogs) == 1, f"{catalog_config_map.name} should have 1 catalog"
+        validate_default_catalog(default_catalog=catalogs[0])
+
+    @pytest.mark.parametrize(
+        "resource_name",
+        [
+            pytest.param(
+                Deployment,
+                id="test_model_catalog_deployment_resource",
+            ),
+            pytest.param(
+                Route,
+                id="test_model_catalog_route_resource",
+            ),
+            pytest.param(
+                Service,
+                id="test_model_catalog_service_resource",
+            ),
+            pytest.param(
+                Pod,
+                id="test_model_catalog_pod_resource",
+            ),
+        ],
+    )
+    def test_model_catalog_resources_exists(self: Self, admin_client: DynamicClient, model_registry_namespace: str,
+                                            resource_name: Any):
+        validate_model_catalog_resource(kind=resource_name, admin_client=admin_client,
+                                        namespace=model_registry_namespace)
 
     def test_operator_pod_enabled_model_catalog(
-        self: Self, model_registry_instance: ModelRegistry, model_registry_operator_pod: Pod
+        self: Self, model_registry_operator_pod: Pod
     ):
         assert validate_model_catalog_enabled(pod=model_registry_operator_pod)
 
     def test_model_catalog_no_custom_catalog(
         self,
-        model_registry_instance: ModelRegistry,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
     ):
+        """
+        Validate sources api for model catalog
+        """
         result = execute_get_command(
             url=f"{model_catalog_rest_url[0]}sources",
             headers=model_registry_rest_headers,
         )["items"]
-        assert not result, f"Expected no custom models to be present. Actual: {result}"
+        assert result
+        assert len(result) == 1, f"Expected no custom models to be present. Actual: {result}"

tests/model_registry/model_catalog/utils.py

@@ -61,3 +61,16 @@ def wait_for_model_catalog_update(client: DynamicClient, model_registry_namespac
         pods[0].wait_for_status(status=Pod.Status.RUNNING)
         return True
     return False
+
+def validate_model_catalog_resource(kind: Any, admin_client: DynamicClient, namespace: str) -> None:
+    resource = list(kind.get(
+        namespace=namespace, label_selector="component=model-catalog", dyn_client=admin_client
+    ))
+    assert resource
+    assert len(resource) == 1,  f"Unexpected number of {kind} resources found: {[res.name for res in resource]}"
+
+def validate_default_catalog(default_catalog) -> None:
+    assert default_catalog["name"] == 'Default Catalog'
+    assert default_catalog['id'] == 'default_catalog'
+    assert default_catalog['type'] == 'yaml'
+    assert default_catalog['properties'].get("yamlCatalogPath") == '/default-catalog.yaml'