Remove references of istio and use oauth for all test scenarios (#495)

Author: dbasunag

tests/model_registry/conftest.py

@@ -62,7 +62,6 @@ def model_registry_db_service(
     admin_client: DynamicClient,
     teardown_resources: bool,
     model_registry_namespace: str,
-    is_model_registry_oauth: bool,
 ) -> Generator[list[Service], Any, Any]:
     num_resources = getattr(request, "param", {}).get("num_resources", 1)
     if pytestconfig.option.post_upgrade:
@@ -89,7 +88,6 @@ def model_registry_db_pvc(
     admin_client: DynamicClient,
     teardown_resources: bool,
     model_registry_namespace: str,
-    is_model_registry_oauth: bool,
 ) -> Generator[list[PersistentVolumeClaim], Any, Any]:
     num_resources = getattr(request, "param", {}).get("num_resources", 1)
     if pytestconfig.option.post_upgrade:
@@ -116,7 +114,6 @@ def model_registry_db_secret(
     admin_client: DynamicClient,
     teardown_resources: bool,
     model_registry_namespace: str,
-    is_model_registry_oauth: bool,
 ) -> Generator[list[Secret], Any, Any]:
     num_resources = getattr(request, "param", {}).get("num_resources", 1)
     if pytestconfig.option.post_upgrade:
@@ -143,7 +140,6 @@ def model_registry_db_deployment(
     admin_client: DynamicClient,
     teardown_resources: bool,
     model_registry_namespace: str,
-    is_model_registry_oauth: bool,
 ) -> Generator[list[Deployment], Any, Any]:
     num_resources = getattr(request, "param", {}).get("num_resources", 1)
     if pytestconfig.option.post_upgrade:
@@ -182,7 +178,6 @@ def model_registry_instance_mysql(
     admin_client: DynamicClient,
     teardown_resources: bool,
     model_registry_namespace: str,
-    is_model_registry_oauth: bool,
 ) -> Generator[list[Any], Any, Any]:
     """Creates a model registry instance with oauth proxy configuration."""
     param = getattr(request, "param", {})
@@ -257,7 +252,7 @@ def updated_dsc_component_state_scope_class(
                 dsc_resource.wait_for_condition(
                     condition=DscComponents.COMPONENT_MAPPING[component_name], status="True"
                 )
-            namespace = Namespace(name=py_config["model_registry_namespace"], ensure_exists=True)
+            namespace = Namespace(name=py_config["model_registry_namespace"], wait_for_resource=True)
             namespace.wait_for_status(status=Namespace.Status.ACTIVE)
             wait_for_pods_running(
                 admin_client=admin_client,
@@ -455,11 +450,6 @@ def delete_mr_deployment() -> None:
     mr_deployment.delete(wait=True)
 
 
-@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/constants.py

@@ -28,9 +28,6 @@ class ModelRegistryEndpoints:
 MR_INSTANCE_BASE_NAME: str = "model-registry"
 MR_INSTANCE_NAME: str = f"{MR_INSTANCE_BASE_NAME}0"
 SECURE_MR_NAME: str = "secure-db-mr"
-ISTIO_CONFIG_DICT: dict[str, Any] = {
-    "gateway": {"grpc": {"tls": {}}, "rest": {"tls": {}}},
-}
 OAUTH_PROXY_CONFIG_DICT: dict[str, Any] = {
     "port": 8443,
     "routePort": 443,

tests/model_registry/image_validation/test_verify_rhoai_images.py

@@ -13,7 +13,6 @@
 
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class",
-    "is_model_registry_oauth",
     "mysql_metadata_resources",
     "model_registry_instance_mysql",
 )

tests/model_registry/python_client/test_model_registry_creation.py

@@ -31,7 +31,6 @@
 )
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class",
-    "is_model_registry_oauth",
     "model_registry_namespace",
     "model_registry_db_secret",
     "model_registry_db_pvc",

tests/model_registry/rbac/conftest.py

@@ -451,7 +451,7 @@ def updated_dsc_component_state_parametrized(
         dsc_resource.wait_for_condition(
             condition=DscComponents.COMPONENT_MAPPING[DscComponents.MODELREGISTRY], status="True"
         )
-        namespace = Namespace(name=namespace_name, ensure_exists=True)
+        namespace = Namespace(name=namespace_name, wait_for_resource=True)
         namespace.wait_for_status(status=Namespace.Status.ACTIVE)
         wait_for_pods_running(
             admin_client=admin_client,

tests/model_registry/rbac/test_mr_rbac.py

@@ -40,7 +40,6 @@
 
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class",
-    "is_model_registry_oauth",
     "mysql_metadata_resources",
     "model_registry_instance_mysql",
 )

tests/model_registry/rbac/test_mr_rbac_sa.py

@@ -11,7 +11,6 @@
 
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class",
-    "is_model_registry_oauth",
     "mysql_metadata_resources",
     "model_registry_instance_mysql",
 )

tests/model_registry/rest_api/conftest.py

@@ -46,7 +46,6 @@
 @pytest.fixture(scope="class")
 def registered_model_rest_api(
     request: pytest.FixtureRequest,
-    is_model_registry_oauth: bool,
     model_registry_rest_url: list[str],
     model_registry_rest_headers: dict[str, str],
 ) -> dict[str, Any]:

tests/model_registry/rest_api/mariadb/conftest.py

@@ -67,7 +67,6 @@ def model_registry_with_mariadb(
     admin_client: DynamicClient,
     model_registry_namespace: str,
     mariadb_mysql_config: dict[str, Any],
-    is_model_registry_oauth: bool,
 ) -> Generator[ModelRegistry, Any, Any]:
     with ModelRegistry(
         name=MR_INSTANCE_NAME,

tests/model_registry/rest_api/mariadb/test_mr_mariadb.py

@@ -33,7 +33,6 @@
 )
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class",
-    "is_model_registry_oauth",
     "deployed_mariadb",
     "model_registry_with_mariadb",
     "registered_model_rest_api",