model registry ossm request must use v1alpha1 api version

Author: dbasunag

tests/model_registry/conftest.py

@@ -36,6 +36,7 @@
     MODEL_REGISTRY_STANDARD_LABELS,
     ISTIO_CONFIG_DICT,
 )
+from tests.model_registry.rest_api.utils import ModelRegistryV1Alpha1
 from utilities.constants import Labels
 from tests.model_registry.utils import (
     get_endpoint_from_mr_service,
@@ -155,15 +156,16 @@ def model_registry_instance(
 ) -> Generator[ModelRegistry, Any, Any]:
     istio_config = None
     oauth_config = None
+    mr_class_name = ModelRegistry
     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
+        mr_class_name = ModelRegistryV1Alpha1
     """Creates a model registry instance with oauth proxy configuration."""
-    oauth_config = OAUTH_PROXY_CONFIG_DICT
-    with ModelRegistry(
+    with mr_class_name(
         name=MR_INSTANCE_NAME,
         namespace=model_registry_namespace,
         label=MODEL_REGISTRY_STANDARD_LABELS,
@@ -175,6 +177,8 @@ def model_registry_instance(
         wait_for_resource=True,
     ) as mr:
         mr.wait_for_condition(condition="Available", status="True")
+        mr.wait_for_condition(condition="OAuthProxyAvailable", status="True")
+
         yield mr
 
 

tests/model_registry/rest_api/test_model_registry_rest_api.py

@@ -96,7 +96,9 @@ def test_validate_model_registry_resource(
         )
 
     def test_model_registry_validate_api_version(self: Self, model_registry_instance):
-        api_version = model_registry_instance.instance.apiVersion
+        api_version = ModelRegistry(
+            name=model_registry_instance.name, namespace=model_registry_instance.namespace, ensure_exists=True
+        ).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