Merge branch 'main' into feat/mr_upg

Author: lugi0

conftest.py

@@ -106,6 +106,11 @@ def pytest_addoption(parser: Parser) -> None:
         default=os.environ.get("VLLM_RUNTIME_IMAGE"),
         help="Specify the runtime image to use for the tests",
     )
+    runtime_group.addoption(
+        "--mlserver-runtime-image",
+        default=os.environ.get("MLSERVER_RUNTIME_IMAGE"),
+        help="Specify the runtime image to use for the tests",
+    )
 
     # Upgrade options
     upgrade_group.addoption(

tests/conftest.py

@@ -221,6 +221,14 @@ def vllm_runtime_image(pytestconfig: pytest.Config) -> str | None:
     return runtime_image
 
 
+@pytest.fixture(scope="session")
+def mlserver_runtime_image(pytestconfig: pytest.Config) -> str | None:
+    runtime_image = pytestconfig.option.mlserver_runtime_image
+    if not runtime_image:
+        return None
+    return runtime_image
+
+
 @pytest.fixture(scope="session")
 def use_unprivileged_client(pytestconfig: pytest.Config) -> bool:
     _use_unprivileged_client = py_config.get("use_unprivileged_client")

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 (
@@ -189,21 +190,29 @@ def model_registry_instance(
     model_registry_namespace: str,
     model_registry_mysql_config: dict[str, Any],
     teardown_resources: bool,
+    is_model_registry_oauth: bool,
 ) -> Generator[ModelRegistry, Any, Any]:
     """Creates a model registry instance with oauth proxy configuration."""
     if pytestconfig.option.post_upgrade:
         mr_instance = ModelRegistry(name=MR_INSTANCE_NAME, namespace=model_registry_namespace, ensure_exists=True)
         yield mr_instance
         mr_instance.delete(wait=True)
     else:
-        oauth_config = OAUTH_PROXY_CONFIG_DICT
+        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
         with ModelRegistry(
             name=MR_INSTANCE_NAME,
             namespace=model_registry_namespace,
             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,
@@ -478,6 +487,11 @@ def model_registry_instance_pod(admin_client: DynamicClient) -> Generator[Pod, A
     )[0]
 
 
+@pytest.fixture(scope="class")
+def is_model_registry_oauth(request: FixtureRequest) -> bool:
+    return getattr(request, "param", {}).get("use_oauth_proxy", True)
+
+
 @pytest.fixture(scope="session")
 def api_server_url(admin_client: DynamicClient) -> str:
     infrastructure = Infrastructure(client=admin_client, name="cluster", ensure_exists=True)

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

@@ -14,6 +14,7 @@
 from utilities.exceptions import ResourceValueMismatch
 from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 
+
 LOGGER = get_logger(name=__name__)
 
 

tests/model_serving/model_runtime/mlserver/__init__.py

@@ -0,0 +1,24 @@
+{
+  "modelName": "catboost",
+  "modelVersion": "v0.1.0",
+  "outputs": [
+    {
+      "contents": {
+        "int64Contents": [
+          "0"
+        ]
+      },
+      "datatype": "INT64",
+      "name": "predict",
+      "parameters": {
+        "content_type": {
+          "stringParam": "np"
+        }
+      },
+      "shape": [
+        "1",
+        "1"
+      ]
+    }
+  ]
+}

tests/model_serving/model_runtime/mlserver/basic_model_deployment/__init__.py

@@ -0,0 +1,22 @@
+{
+  "id": "catboost",
+  "model_name": "catboost",
+  "model_version": "v0.1.0",
+  "outputs": [
+    {
+      "data": [
+        0
+      ],
+      "datatype": "INT64",
+      "name": "predict",
+      "parameters": {
+        "content_type": "np"
+      },
+      "shape": [
+        1,
+        1
+      ]
+    }
+  ],
+  "parameters": {}
+}

tests/model_serving/model_runtime/mlserver/basic_model_deployment/__snapshots__/test_catboost_basic_model_deployment/TestCatBoostModel.test_catboost_model_inference[catboost-raw-grpc-deployment].json

@@ -0,0 +1,24 @@
+{
+  "modelName": "catboost",
+  "modelVersion": "v0.1.0",
+  "outputs": [
+    {
+      "contents": {
+        "int64Contents": [
+          "0"
+        ]
+      },
+      "datatype": "INT64",
+      "name": "predict",
+      "parameters": {
+        "content_type": {
+          "stringParam": "np"
+        }
+      },
+      "shape": [
+        "1",
+        "1"
+      ]
+    }
+  ]
+}