Merge branch 'main' into feature/maas-model

Author: dbasunag

tests/model_explainability/trustyai_service/trustyai_service_utils.py

@@ -370,7 +370,7 @@ def _get_pods() -> list[Pod]:
         )
 
     samples = TimeoutSampler(
-        wait_timeout=Timeout.TIMEOUT_10MIN,
+        wait_timeout=Timeout.TIMEOUT_20MIN,
         sleep=1,
         func=_get_deployments,
     )

tests/model_registry/async_job/conftest.py

@@ -25,7 +25,7 @@
 from ocp_resources.secret import Secret
 from ocp_resources.service import Service
 from ocp_resources.service_account import ServiceAccount
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.config_map import ConfigMap
 from model_registry.types import RegisteredModel
 from model_registry import ModelRegistry as ModelRegistryClient

tests/model_registry/conftest.py

@@ -25,7 +25,7 @@
 from ocp_resources.deployment import Deployment
 
 
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.resource import ResourceEditor
 
 from pytest import FixtureRequest
@@ -92,7 +92,6 @@ def model_registry_instance(
         yield [mr_instance]
         mr_instance.delete(wait=True)
     else:
-        LOGGER.warning("Requested Oauth Proxy configuration:")
         db_name = param.get("db_name", "mysql")
         mr_objects = get_model_registry_objects(
             client=admin_client,

tests/model_registry/model_catalog/conftest.py

@@ -18,7 +18,11 @@
     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, DEFAULT_CUSTOM_MODEL_CATALOG
+from tests.model_registry.constants import (
+    CUSTOM_CATALOG_ID1,
+    DEFAULT_MODEL_CATALOG_CM,
+    DEFAULT_CUSTOM_MODEL_CATALOG,
+)
 from tests.model_registry.utils import (
     get_rest_headers,
     is_model_catalog_ready,
@@ -34,6 +38,46 @@
 LOGGER = get_logger(name=__name__)
 
 
+@pytest.fixture(scope="session")
+def enabled_model_catalog_config_map(
+    admin_client: DynamicClient,
+    model_registry_namespace: str,
+) -> ConfigMap:
+    """
+    Enable all catalogs in the default model catalog configmap
+    """
+    # Get operator-managed default sources ConfigMap
+    default_sources_cm = ConfigMap(
+        name=DEFAULT_MODEL_CATALOG_CM, client=admin_client, namespace=model_registry_namespace, ensure_exists=True
+    )
+
+    # Get the sources.yaml content from default sources
+    default_sources_yaml = default_sources_cm.instance.data.get("sources.yaml", "")
+
+    # Parse the YAML and extract only catalogs, enabling each one
+    parsed_yaml = yaml.safe_load(default_sources_yaml)
+    if not parsed_yaml or "catalogs" not in parsed_yaml:
+        raise RuntimeError("No catalogs found in default sources ConfigMap")
+
+    for catalog in parsed_yaml["catalogs"]:
+        catalog["enabled"] = True
+    enabled_yaml_dict = {"catalogs": parsed_yaml["catalogs"]}
+    enabled_sources_yaml = yaml.dump(enabled_yaml_dict, default_flow_style=False, sort_keys=False)
+
+    LOGGER.info("Adding enabled catalogs to model-catalog-sources ConfigMap")
+
+    # Get user-managed sources ConfigMap
+    user_sources_cm = ConfigMap(
+        name=DEFAULT_CUSTOM_MODEL_CATALOG, client=admin_client, namespace=model_registry_namespace, ensure_exists=True
+    )
+
+    patches = {"data": {"sources.yaml": enabled_sources_yaml}}
+
+    with ResourceEditor(patches={user_sources_cm: patches}):
+        is_model_catalog_ready(client=admin_client, model_registry_namespace=model_registry_namespace)
+        yield user_sources_cm
+
+
 @pytest.fixture(scope="class")
 def model_catalog_config_map(
     request: pytest.FixtureRequest, admin_client: DynamicClient, model_registry_namespace: str

tests/model_registry/model_catalog/test_default_model_catalog.py

@@ -164,6 +164,7 @@ class TestModelCatalogDefault:
     def test_model_catalog_default_catalog_sources(
         self,
         pytestconfig: pytest.Config,
+        enabled_model_catalog_config_map: ConfigMap,
         test_idp_user: UserTestSession,
         model_catalog_rest_url: list[str],
         user_token_for_api_calls: str,
@@ -199,6 +200,7 @@ def test_model_catalog_default_catalog_sources(
 
     def test_model_default_catalog_get_models_by_source(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
     ):
@@ -211,6 +213,7 @@ def test_model_default_catalog_get_models_by_source(
 
     def test_model_default_catalog_get_model_by_name(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         user_token_for_api_calls: str,
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
@@ -228,6 +231,7 @@ def test_model_default_catalog_get_model_by_name(
 
     def test_model_default_catalog_get_model_artifact(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         user_token_for_api_calls: str,
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
@@ -253,6 +257,7 @@ class TestModelCatalogDefaultData:
 
     def test_model_default_catalog_number_of_models(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         default_catalog_api_response: dict[Any, Any],
         default_model_catalog_yaml_content: dict[Any, Any],
     ):
@@ -269,6 +274,7 @@ def test_model_default_catalog_number_of_models(
 
     def test_model_default_catalog_correspondence_of_model_name(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         default_catalog_api_response: dict[Any, Any],
         default_model_catalog_yaml_content: dict[Any, Any],
         catalog_openapi_schema: dict[Any, Any],
@@ -322,6 +328,7 @@ def test_model_default_catalog_correspondence_of_model_name(
 
     def test_model_default_catalog_random_artifact(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         default_model_catalog_yaml_content: dict[Any, Any],
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],

tests/model_registry/model_catalog/test_filter_options_endpoint.py

@@ -1,7 +1,7 @@
 import pytest
 from typing import Self
 from simple_logger.logger import get_logger
-
+from ocp_resources.config_map import ConfigMap
 from tests.model_registry.model_catalog.utils import (
     validate_filter_options_structure,
     execute_database_query,
@@ -45,6 +45,7 @@ class TestFilterOptionsEndpoint:
     )
     def test_filter_options_endpoint_validation(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         user_token_for_api_calls: str,
         test_idp_user: UserTestSession,
@@ -97,6 +98,7 @@ def test_filter_options_endpoint_validation(
     )
     def test_comprehensive_coverage_against_database(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         user_token_for_api_calls: str,
         model_registry_namespace: str,

tests/model_registry/model_catalog/test_model_search.py

@@ -1,6 +1,6 @@
 import pytest
 from dictdiffer import diff
-
+from ocp_resources.config_map import ConfigMap
 from simple_logger.logger import get_logger
 from typing import Self, Any
 from tests.model_registry.model_catalog.constants import (
@@ -32,7 +32,10 @@
 class TestSearchModelCatalog:
     @pytest.mark.smoke
     def test_search_model_catalog_source_label(
-        self: Self, model_catalog_rest_url: list[str], model_registry_rest_headers: dict[str, str]
+        self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
+        model_catalog_rest_url: list[str],
+        model_registry_rest_headers: dict[str, str],
     ):
         """
         RHOAIENG-33656: Validate search model catalog by source label
@@ -61,7 +64,10 @@ def test_search_model_catalog_source_label(
         assert redhat_ai_filter_moldels_size + redhat_ai_validated_filter_models_size == both_filtered_models_size
 
     def test_search_model_catalog_invalid_source_label(
-        self: Self, model_catalog_rest_url: list[str], model_registry_rest_headers: dict[str, str]
+        self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
+        model_catalog_rest_url: list[str],
+        model_registry_rest_headers: dict[str, str],
     ):
         """
         RHOAIENG-33656:
@@ -102,6 +108,7 @@ def test_search_model_catalog_invalid_source_label(
     )
     def test_search_model_catalog_match(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
@@ -145,6 +152,7 @@ class TestSearchModelArtifact:
     )
     def test_validate_model_artifacts_by_artifact_type(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
@@ -210,6 +218,7 @@ def test_validate_model_artifacts_by_artifact_type(
     )
     def test_error_handled_for_invalid_artifact_type(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
@@ -248,6 +257,7 @@ def test_error_handled_for_invalid_artifact_type(
     )
     def test_multiple_artifact_type_filtering(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
         randomly_picked_model_from_catalog_api_by_source: tuple[dict[Any, Any], str, str],
@@ -299,6 +309,7 @@ class TestSearchModelCatalogQParameter:
     )
     def test_q_parameter_basic_search(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         search_term: str,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
@@ -338,6 +349,7 @@ def test_q_parameter_basic_search(
     )
     def test_q_parameter_case_insensitive(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         search_term: str,
         case_variant: str,
         model_catalog_rest_url: list[str],
@@ -388,6 +400,7 @@ def test_q_parameter_case_insensitive(
 
     def test_q_parameter_no_results(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
         model_registry_namespace: str,
@@ -417,6 +430,7 @@ def test_q_parameter_no_results(
     def test_q_parameter_empty_query(
         self: Self,
         search_term,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
     ):
@@ -434,6 +448,7 @@ def test_q_parameter_empty_query(
 
     def test_q_parameter_with_source_label_filter(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
     ):
@@ -479,6 +494,7 @@ def test_q_parameter_with_source_label_filter(
 class TestSearchModelsByFilterQuery:
     def test_search_models_by_filter_query(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
         model_registry_namespace: str,
@@ -524,6 +540,7 @@ def test_search_models_by_filter_query(
 
     def test_search_models_by_invalid_filter_query(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         model_catalog_rest_url: list[str],
         model_registry_rest_headers: dict[str, str],
         model_registry_namespace: str,
@@ -563,6 +580,7 @@ def test_search_models_by_invalid_filter_query(
     @pytest.mark.downstream_only
     def test_presence_performance_data_on_pod(
         self: Self,
+        enabled_model_catalog_config_map: ConfigMap,
         admin_client: DynamicClient,
         model_registry_namespace: str,
     ):

tests/model_registry/negative_tests/test_model_registry_creation_negative.py

@@ -3,7 +3,7 @@
 from simple_logger.logger import get_logger
 from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.deployment import Deployment
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from pytest_testconfig import config as py_config
 from ocp_resources.namespace import Namespace
 from ocp_resources.secret import Secret

tests/model_registry/rbac/conftest.py

@@ -7,7 +7,7 @@
 from simple_logger.logger import get_logger
 
 from ocp_resources.deployment import Deployment
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.secret import Secret
 from ocp_resources.service import Service

tests/model_registry/rbac/test_mr_rbac.py

@@ -33,7 +33,7 @@
 from mr_openapi.exceptions import ForbiddenException
 from utilities.user_utils import UserTestSession
 from kubernetes.dynamic import DynamicClient
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from utilities.resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from tests.model_registry.utils import get_mr_service_by_label, get_endpoint_from_mr_service, get_mr_user_token
 from tests.model_registry.rbac.utils import grant_mr_access, revoke_mr_access
 from utilities.constants import Protocols