Add OSSM rest api test for regression check (#367)

updates! c1618fe

Author: dbasunag

tests/model_registry/conftest.py

@@ -34,6 +34,7 @@
     MODEL_REGISTRY_DB_SECRET_ANNOTATIONS,
     OAUTH_PROXY_CONFIG_DICT,
     MODEL_REGISTRY_STANDARD_LABELS,
+    ISTIO_CONFIG_DICT,
 )
 from utilities.constants import Labels
 from tests.model_registry.utils import (
@@ -150,9 +151,16 @@ def model_registry_db_deployment(
 
 @pytest.fixture(scope="class")
 def model_registry_instance(
-    model_registry_namespace: str,
-    model_registry_mysql_config: dict[str, Any],
+    model_registry_namespace: str, model_registry_mysql_config: dict[str, Any], is_model_registry_oauth: bool
 ) -> Generator[ModelRegistry, Any, Any]:
+    istio_config = None
+    oauth_config = None
+    if is_model_registry_oauth:
+        LOGGER.warning("Requested Ouath Proxy configuration:")
+        oauth_config = OAUTH_PROXY_CONFIG_DICT
+    else:
+        LOGGER.warning("Requested OSSM configuration:")
+        istio_config = ISTIO_CONFIG_DICT
     """Creates a model registry instance with oauth proxy configuration."""
     oauth_config = OAUTH_PROXY_CONFIG_DICT
     with ModelRegistry(
@@ -161,7 +169,7 @@ def model_registry_instance(
         label=MODEL_REGISTRY_STANDARD_LABELS,
         grpc={},
         rest={},
-        istio=None,
+        istio=istio_config,
         oauth_proxy=oauth_config,
         mysql=model_registry_mysql_config,
         wait_for_resource=True,
@@ -374,7 +382,7 @@ def model_registry_instance_pod(admin_client: DynamicClient) -> Generator[Pod, A
 
 @pytest.fixture(scope="class")
 def is_model_registry_oauth(request: FixtureRequest) -> bool:
-    return getattr(request, "param", {}).get("use_oauth_proxy", False)
+    return getattr(request, "param", {}).get("use_oauth_proxy", True)
 
 
 @pytest.fixture(scope="session")

tests/model_registry/rest_api/test_model_registry_rest_api.py

@@ -1,9 +1,9 @@
 from typing import Self, Any
 import pytest
 from pytest_testconfig import config as py_config
-
+from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from tests.model_registry.rest_api.constants import MODEL_REGISTER, MODEL_ARTIFACT, MODEL_VERSION, MODEL_REGISTER_DATA
-from tests.model_registry.rest_api.utils import validate_resource_attributes
+from tests.model_registry.rest_api.utils import validate_resource_attributes, ModelRegistryV1Alpha1
 from utilities.constants import DscComponents
 from simple_logger.logger import get_logger
 
@@ -25,7 +25,7 @@
 
 
 @pytest.mark.parametrize(
-    "updated_dsc_component_state_scope_class, registered_model_rest_api",
+    "updated_dsc_component_state_scope_class, is_model_registry_oauth, registered_model_rest_api",
     [
         pytest.param(
             {
@@ -36,12 +36,27 @@
                     },
                 },
             },
+            {"use_oauth_proxy": False},
+            MODEL_REGISTER_DATA,
+        ),
+        pytest.param(
+            {
+                "component_patch": {
+                    DscComponents.MODELREGISTRY: {
+                        "managementState": DscComponents.ManagementState.MANAGED,
+                        "registriesNamespace": py_config["model_registry_namespace"],
+                    },
+                },
+            },
+            {},
             MODEL_REGISTER_DATA,
         ),
     ],
     indirect=True,
 )
-@pytest.mark.usefixtures("updated_dsc_component_state_scope_class", "registered_model_rest_api")
+@pytest.mark.usefixtures(
+    "updated_dsc_component_state_scope_class", "is_model_registry_oauth", "registered_model_rest_api"
+)
 class TestModelRegistryCreationRest:
     """
     Tests the creation of a model registry. If the component is set to 'Removed' it will be switched to 'Managed'
@@ -80,6 +95,27 @@ def test_validate_model_registry_resource(
             resource_name=data_key,
         )
 
+    def test_model_registry_validate_api_version(self: Self, model_registry_instance):
+        api_version = model_registry_instance.instance.apiVersion
+        LOGGER.info(f"Validating apiversion {api_version} for model registry")
+        expected_version = f"{ModelRegistry.ApiGroup.MODELREGISTRY_OPENDATAHUB_IO}/{ModelRegistry.ApiVersion.V1BETA1}"
+        assert api_version == expected_version
+
+    def test_model_registry_validate_oauthproxy_enabled(self: Self, model_registry_instance):
+        model_registry_instance_spec = model_registry_instance.instance.spec
+        LOGGER.info(f"Validating that MR is using oauth proxy {model_registry_instance_spec}")
+        assert not model_registry_instance_spec.istio
+        assert model_registry_instance_spec.oauthProxy.serviceRoute == "enabled"
+
+    def test_model_registry_validate_mr_status_v1alpha1(self: Self, model_registry_instance):
+        mr_instance = ModelRegistryV1Alpha1(
+            name=model_registry_instance.name, namespace=model_registry_instance.namespace, ensure_exists=True
+        ).instance
+        status = mr_instance.status.to_dict()
+        LOGGER.info(f"Validating MR status {status}")
+        if not status:
+            pytest.fail(f"Empty status found for {mr_instance}")
+
     @pytest.mark.parametrize(
         "updated_model_registry_resource, expected_param",
         [

tests/model_registry/rest_api/utils.py

@@ -12,6 +12,8 @@
 from tests.model_registry.rest_api.constants import MODEL_REGISTRY_BASE_URI
 from pyhelper_utils.shell import run_command
 from utilities.exceptions import ResourceValueMismatch
+from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+
 
 LOGGER = get_logger(name=__name__)
 
@@ -262,3 +264,7 @@ def sign_db_server_cert_with_ca_with_openssl(
         ],
         check=True,
     )
+
+
+class ModelRegistryV1Alpha1(ModelRegistry):
+    api_version = f"{ModelRegistry.ApiGroup.MODELREGISTRY_OPENDATAHUB_IO}/{ModelRegistry.ApiVersion.V1ALPHA1}"