ModelCatalog Multi-tenant scenarios base PR

Author: dbasunag

tests/model_registry/constants.py

@@ -64,3 +64,4 @@ class ModelRegistryEndpoints:
     "mysql": 3306,
 }
 MODEL_REGISTRY_POD_FILTER: str = "component=model-registry"
+DEFAULT_MODEL_CATALOG: str = "model-catalog-sources"

tests/model_registry/model_catalog/conftest.py

@@ -7,7 +7,7 @@
 from ocp_resources.resource import ResourceEditor
 
 from ocp_resources.route import Route
-from tests.model_registry.model_catalog.constants import DEFAULT_MODEL_CATALOG
+from tests.model_registry.constants import DEFAULT_MODEL_CATALOG
 from tests.model_registry.model_catalog.utils import is_model_catalog_ready, wait_for_model_catalog_api
 
 

tests/model_registry/model_catalog/constants.py

@@ -1,4 +1,3 @@
-DEFAULT_MODEL_CATALOG: str = "model-catalog-sources"
 CUSTOM_ECHO_CATALOG_ID: str = "sample_rhec_catalog"
 CUSTOM_MODEL_NAME = "rhelai1/modelcar-granite-7b-starter"
 CUSTOM_ECOSYSTEM_CATALOG: str = f"""catalogs:

tests/model_registry/rest_api/test_multiple_mr.py

@@ -1,8 +1,12 @@
 from typing import Self
 import pytest
+from kubernetes.dynamic import DynamicClient
+
+from ocp_resources.config_map import ConfigMap
 from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from ocp_resources.pod import Pod
 
-from tests.model_registry.constants import MR_INSTANCE_BASE_NAME, NUM_RESOURCES
+from tests.model_registry.constants import MR_INSTANCE_BASE_NAME, NUM_RESOURCES, DEFAULT_MODEL_CATALOG
 from tests.model_registry.rest_api.utils import (
     validate_resource_attributes,
     get_register_model_data,
@@ -29,13 +33,39 @@
     "model_registry_instance",
 )
 class TestModelRegistryMultipleInstances:
-    def test_validate_multiple_model_registry(self: Self, model_registry_instance, model_registry_namespace: str):
+    def test_validate_multiple_model_registry(
+        self: Self, model_registry_instance: list[ModelRegistry], model_registry_namespace: str
+    ):
         for num in range(0, NUM_RESOURCES["num_resources"]):
             mr = ModelRegistry(
                 name=f"{MR_INSTANCE_BASE_NAME}{num}", namespace=model_registry_namespace, ensure_exists=True
             )
             LOGGER.info(f"{mr.name} found")
 
+    def test_validate_one_model_catalog_configmap(
+        self: Self, admin_client: DynamicClient, model_registry_namespace: str
+    ):
+        config_map_names: list[str] = []
+        expected_number_config_maps: int = 1
+        for config_map in list(ConfigMap.get(namespace=model_registry_namespace, dyn_client=admin_client)):
+            if config_map.name.startswith(DEFAULT_MODEL_CATALOG):
+                config_map_names.append(config_map.name)
+        assert len(config_map_names) == expected_number_config_maps, (
+            f"Expected {expected_number_config_maps} modelcatalog sources, found: {config_map_names}"
+        )
+
+    def test_validate_one_model_catalog_pod(self: Self, admin_client: DynamicClient, model_registry_namespace: str):
+        catalog_pods: list[Pod] = list(
+            Pod.get(
+                namespace=model_registry_namespace, label_selector="component=model-catalog", dyn_client=admin_client
+            )
+        )
+        expected_number_pods: int = 1
+
+        assert len(catalog_pods) == expected_number_pods, (
+            f"Expected {expected_number_pods} model catalog pods, found: {[pod.name for pod in catalog_pods]}"
+        )
+
     def test_validate_register_models_multiple_registries(
         self: Self, model_registry_rest_url: list[str], model_registry_rest_headers: dict[str, str]
     ):

tests/model_registry/utils.py

@@ -24,9 +24,9 @@
     MARIADB_MY_CNF,
     PORT_MAP,
     MODEL_REGISTRY_POD_FILTER,
+    DEFAULT_MODEL_CATALOG,
 )
 from tests.model_registry.exceptions import ModelRegistryResourceNotFoundError
-from tests.model_registry.model_catalog.constants import DEFAULT_MODEL_CATALOG
 from utilities.exceptions import ProtocolNotSupportedError, TooManyServicesError
 from utilities.constants import Protocols, Annotations, Timeout
 from model_registry import ModelRegistry as ModelRegistryClient