updates! 2c9819d

Author: dbasunag

tests/model_registry/conftest.py

@@ -13,6 +13,7 @@
 from ocp_resources.infrastructure import Infrastructure
 from ocp_resources.oauth import OAuth
 from ocp_resources.pod import Pod
+from ocp_resources.route import Route
 from ocp_resources.secret import Secret
 from ocp_resources.namespace import Namespace
 from ocp_resources.service import Service
@@ -597,3 +598,23 @@ def user_credentials_rbac() -> dict[str, str]:
 @pytest.fixture(scope="class")
 def catalog_config_map(admin_client: DynamicClient, model_registry_namespace: str) -> ConfigMap:
     return ConfigMap(name=DEFAULT_CUSTOM_MODEL_CATALOG, client=admin_client, namespace=model_registry_namespace)
+
+
+@pytest.fixture(scope="class")
+def model_catalog_routes(admin_client: DynamicClient, model_registry_namespace: str) -> list[Route]:
+    return list(
+        Route.get(namespace=model_registry_namespace, label_selector="component=model-catalog", dyn_client=admin_client)
+    )
+
+
+@pytest.fixture(scope="class")
+def model_catalog_rest_url(model_registry_namespace: str, model_catalog_routes: list[Route]) -> list[str]:
+    assert model_catalog_routes, f"Model catalog routes does not exist in {model_registry_namespace}"
+    route_urls = [
+        f"https://{route.instance.spec.host}:443/api/model_catalog/v1alpha1/" for route in model_catalog_routes
+    ]
+    assert route_urls, (
+        "Model catalog routes information could not be found from "
+        f"routes:{[route.name for route in model_catalog_routes]}"
+    )
+    return route_urls

tests/model_registry/model_catalog/conftest.py

@@ -10,7 +10,6 @@
 from ocp_resources.config_map import ConfigMap
 from ocp_resources.resource import ResourceEditor
 
-from ocp_resources.route import Route
 from ocp_resources.service_account import ServiceAccount
 from tests.model_registry.model_catalog.constants import (
     SAMPLE_MODEL_NAME3,
@@ -44,26 +43,6 @@ def model_catalog_config_map(
     return ConfigMap(name=configmap_name, client=admin_client, namespace=model_registry_namespace, ensure_exists=True)
 
 
-@pytest.fixture(scope="class")
-def model_catalog_routes(admin_client: DynamicClient, model_registry_namespace: str) -> list[Route]:
-    return list(
-        Route.get(namespace=model_registry_namespace, label_selector="component=model-catalog", dyn_client=admin_client)
-    )
-
-
-@pytest.fixture(scope="class")
-def model_catalog_rest_url(model_registry_namespace: str, model_catalog_routes: list[Route]) -> list[str]:
-    assert model_catalog_routes, f"Model catalog routes does not exist in {model_registry_namespace}"
-    route_urls = [
-        f"https://{route.instance.spec.host}:443/api/model_catalog/v1alpha1/" for route in model_catalog_routes
-    ]
-    assert route_urls, (
-        "Model catalog routes information could not be found from "
-        f"routes:{[route.name for route in model_catalog_routes]}"
-    )
-    return route_urls
-
-
 @pytest.fixture(scope="class")
 def updated_catalog_config_map(
     request: pytest.FixtureRequest,

tests/model_registry/model_catalog/test_custom_model_catalog.py

@@ -10,10 +10,8 @@
 import pytest
 from simple_logger.logger import get_logger
 from typing import Self
+from kubernetes.dynamic.exceptions import ResourceNotFoundError
 
-from tests.model_registry.model_catalog.utils import (
-    ResourceNotFoundError,
-)
 from tests.model_registry.utils import execute_get_command, get_sample_yaml_str, get_catalog_str
 
 LOGGER = get_logger(name=__name__)

tests/model_registry/model_catalog/test_default_model_catalog.py

@@ -1,5 +1,7 @@
 import pytest
 import random
+
+import yaml
 from kubernetes.dynamic import DynamicClient
 from dictdiffer import diff
 from ocp_resources.deployment import Deployment
@@ -18,7 +20,7 @@
     validate_model_catalog_resource,
     get_validate_default_model_catalog_source,
     extract_schema_fields,
-    validate_model_catalog_configmap_data,
+    validate_default_catalog,
 )
 from tests.model_registry.utils import get_rest_headers, get_model_catalog_pod, execute_get_command
 from utilities.user_utils import UserTestSession
@@ -60,8 +62,16 @@ class TestModelCatalogGeneral:
         ],
         indirect=["model_catalog_config_map"],
     )
-    def test_config_map_exists(self: Self, model_catalog_config_map: ConfigMap, expected_catalogs: int):
-        validate_model_catalog_configmap_data(configmap=model_catalog_config_map, num_catalogs=expected_catalogs)
+    def test_config_map_exists(
+        self: Self, model_catalog_config_map: ConfigMap, expected_catalogs: int, validate_catalog: bool
+    ) -> None:
+        assert model_catalog_config_map.exists, f"{model_catalog_config_map.name} does not exist"
+        catalogs = yaml.safe_load(model_catalog_config_map.instance.data["sources.yaml"])["catalogs"]
+        assert len(catalogs) == expected_catalogs, (
+            f"{model_catalog_config_map.name} should have {expected_catalogs} catalog"
+        )
+        if validate_catalog:
+            validate_default_catalog(catalogs=catalogs)
 
     @pytest.mark.parametrize(
         "resource_name, expected_resource_count",

tests/model_registry/model_catalog/test_model_catalog_negative.py

@@ -7,10 +7,10 @@
 from ocp_resources.config_map import ConfigMap
 from ocp_resources.pod import Pod
 from ocp_resources.resource import ResourceEditor
-from tests.model_registry.constants import DEFAULT_MODEL_CATALOG_CFG
+from tests.model_registry.constants import DEFAULT_MODEL_CATALOG_CM
 from tests.model_registry.model_catalog.constants import DEFAULT_CATALOGS, CATALOG_CONTAINER
-from tests.model_registry.model_catalog.utils import validate_model_catalog_configmap_data, is_model_catalog_ready
-from tests.model_registry.utils import get_model_catalog_pod
+from tests.model_registry.model_catalog.utils import validate_model_catalog_configmap_data
+from tests.model_registry.utils import get_model_catalog_pod, is_model_catalog_ready
 from timeout_sampler import TimeoutExpiredError
 
 from utilities.general import wait_for_container_status
@@ -102,7 +102,7 @@ class TestDefaultCatalogNegative:
         "model_catalog_config_map, modified_sources_yaml",
         [
             pytest.param(
-                {"configmap_name": DEFAULT_MODEL_CATALOG_CFG},
+                {"configmap_name": DEFAULT_MODEL_CATALOG_CM},
                 """
 catalogs:
   - name: Modified Catalog

tests/model_registry/model_catalog/test_model_search.py

@@ -9,7 +9,7 @@
     REDHAT_AI_CATALOG_ID,
     VALIDATED_CATALOG_ID,
 )
-from tests.model_registry.model_catalog.utils import (
+from tests.model_registry.utils import (
     execute_get_command,
 )
 

tests/model_registry/model_catalog/utils.py

@@ -1,5 +1,4 @@
 from typing import Any
-import time
 import yaml
 
 from kubernetes.dynamic import DynamicClient

tests/model_registry/upgrade/test_model_catalog_upgrade.py

@@ -39,7 +39,7 @@ def pre_upgrade_config_map_update(
         for key in request.param["sample_yaml"]:
             patches["data"][key] = request.param["sample_yaml"][key]
 
-    ResourceEditor(patches=patches).update()
+    ResourceEditor(patches={catalog_config_map: patches}).update()
     is_model_catalog_ready(client=admin_client, model_registry_namespace=model_registry_namespace)
     wait_for_model_catalog_api(url=model_catalog_rest_url[0], headers=model_registry_rest_headers)
     return catalog_config_map
@@ -80,8 +80,8 @@ def test_validate_sources(
         self: Self,
         pre_upgrade_config_map_update: ConfigMap,
     ):
-        # check that the configmap was updated:
-        assert len(yaml.safe_load(pre_upgrade_config_map_update.instance.data["sources.yaml"])["catalogs"]) == 2
+        # check that the custom source configmap was updated:
+        assert len(yaml.safe_load(pre_upgrade_config_map_update.instance.data["sources.yaml"])["catalogs"]) == 1
         LOGGER.info("Testing model catalog validation")
 
 
@@ -93,6 +93,6 @@ def test_validate_sources(
         self: Self,
         post_upgrade_config_map_update: ConfigMap,
     ):
-        # check that the configmap was updated:
+        # check that the configmap was still updated:
         assert len(yaml.safe_load(post_upgrade_config_map_update.instance.data["sources.yaml"])["catalogs"]) == 1
         LOGGER.info("Testing model catalog validation")

tests/model_registry/upgrade/test_model_registry_upgrade.py

@@ -74,7 +74,7 @@ def test_model_registry_instance_spec_post_upgrade(
     ):
         model_registry_instance_spec = model_registry_instance[0].instance.spec
         assert not model_registry_instance_spec.istio
-        assert model_registry_instance_spec.oauthProxy.serviceRoute == "enabled"
+        assert model_registry_instance_spec.kubeRBACProxy.serviceRoute == "enabled"
 
     @pytest.mark.post_upgrade
     def test_model_registry_grpc_container_removal_post_upgrade(