Use exitStack to support multiple resource creations

updates! 72351d8

Author: dbasunag

tests/model_registry/conftest.py

@@ -1,6 +1,6 @@
 from typing import Any
 from ocp_resources.resource import Resource
-from utilities.constants import ModelFormat, Annotations
+from utilities.constants import ModelFormat
 
 
 class ModelRegistryEndpoints:
@@ -25,7 +25,8 @@ class ModelRegistryEndpoints:
         "str_key": "str_value",
     },
 }
-MR_INSTANCE_NAME: str = "model-registry"
+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": {}}},
@@ -35,7 +36,8 @@ class ModelRegistryEndpoints:
     "routePort": 443,
     "serviceRoute": "enabled",
 }
-DB_RESOURCES_NAME: str = "db-model-registry"
+DB_BASE_RESOURCES_NAME: str = "db-model-registry"
+DB_RESOURCE_NAME: str = f"{DB_BASE_RESOURCES_NAME}0"
 MR_DB_IMAGE_DIGEST: str = (
     "public.ecr.aws/docker/library/mysql@sha256:9de9d54fecee6253130e65154b930978b1fcc336bcc86dfd06e89b72a2588ebe"
 )
@@ -53,10 +55,3 @@ class ModelRegistryEndpoints:
 CA_CONFIGMAP_NAME = "odh-trusted-ca-bundle"
 CA_MOUNT_PATH = "/etc/pki/ca-trust/extracted/pem"
 CA_FILE_PATH = f"{CA_MOUNT_PATH}/ca-bundle.crt"
-
-MODEL_REGISTRY_STANDARD_LABELS = {
-    Annotations.KubernetesIo.NAME: MR_INSTANCE_NAME,
-    Annotations.KubernetesIo.INSTANCE: MR_INSTANCE_NAME,
-    Annotations.KubernetesIo.PART_OF: MR_OPERATOR_NAME,
-    Annotations.KubernetesIo.CREATED_BY: MR_OPERATOR_NAME,
-}

tests/model_registry/constants.py

@@ -1,5 +1,5 @@
 import pytest
-from typing import Self, Set
+from typing import Self, Set, Any
 from simple_logger.logger import get_logger
 from kubernetes.dynamic import DynamicClient
 from pytest_testconfig import config as py_config
@@ -8,7 +8,6 @@
 from utilities.general import (
     validate_container_images,
 )
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.pod import Pod
 
 LOGGER = get_logger(name=__name__)
@@ -43,7 +42,7 @@ class TestModelRegistryImages:
     def test_verify_model_registry_images(
         self: Self,
         admin_client: DynamicClient,
-        model_registry_instance: ModelRegistry,
+        model_registry_instance: list[Any],
         model_registry_operator_pod: Pod,
         model_registry_instance_pod: Pod,
         related_images_refs: Set[str],

tests/model_registry/image_validation/test_verify_rhoai_images.py

@@ -1,7 +1,6 @@
 import pytest
-from typing import Self
+from typing import Self, Any
 from simple_logger.logger import get_logger
-from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from pytest_testconfig import config as py_config
 from ocp_resources.pod import Pod
 from utilities.constants import DscComponents
@@ -32,7 +31,7 @@ class TestDBMigration:
     def test_db_migration_negative(
         self: Self,
         admin_client: DynamicClient,
-        model_registry_instance: ModelRegistry,
+        model_registry_instance: list[Any],
         model_registry_db_instance_pod: Pod,
         set_mr_db_dirty: int,
         delete_mr_deployment: None,

tests/model_registry/negative_tests/test_db_migration.py

@@ -11,9 +11,9 @@
 from utilities.constants import DscComponents, Annotations
 from tests.model_registry.constants import (
     MR_OPERATOR_NAME,
-    MR_INSTANCE_NAME,
+    MR_INSTANCE_BASE_NAME,
     ISTIO_CONFIG_DICT,
-    DB_RESOURCES_NAME,
+    DB_BASE_RESOURCES_NAME,
 )
 from kubernetes.dynamic.exceptions import ForbiddenError
 
@@ -65,7 +65,7 @@ def test_registering_model_negative(
             "host": f"{model_registry_db_deployment_negative_test.name}."
             f"{model_registry_db_deployment_negative_test.namespace}.svc.cluster.local",
             "database": model_registry_db_secret_negative_test.string_data["database-name"],
-            "passwordSecret": {"key": "database-password", "name": DB_RESOURCES_NAME},
+            "passwordSecret": {"key": "database-password", "name": DB_BASE_RESOURCES_NAME},
             "port": 3306,
             "skipDBCreation": False,
             "username": model_registry_db_secret_negative_test.string_data["database-user"],
@@ -75,11 +75,11 @@ def test_registering_model_negative(
             match=f"namespace must be {expected_namespace}",
         ):
             with ModelRegistry(
-                name=MR_INSTANCE_NAME,
+                name=MR_INSTANCE_BASE_NAME,
                 namespace=model_registry_namespace_for_negative_tests.name,
                 label={
-                    Annotations.KubernetesIo.NAME: MR_INSTANCE_NAME,
-                    Annotations.KubernetesIo.INSTANCE: MR_INSTANCE_NAME,
+                    Annotations.KubernetesIo.NAME: MR_INSTANCE_BASE_NAME,
+                    Annotations.KubernetesIo.INSTANCE: MR_INSTANCE_BASE_NAME,
                     Annotations.KubernetesIo.PART_OF: MR_OPERATOR_NAME,
                     Annotations.KubernetesIo.CREATED_BY: MR_OPERATOR_NAME,
                 },

tests/model_registry/negative_tests/test_model_registry_creation_negative.py

@@ -54,10 +54,10 @@ class TestModelRegistryCreation:
     @pytest.mark.smoke
     def test_registering_model(
         self: Self,
-        model_registry_client: ModelRegistryClient,
+        model_registry_client: list[ModelRegistryClient],
         registered_model: RegisteredModel,
     ):
-        model = model_registry_client.get_registered_model(name=MODEL_NAME)
+        model = model_registry_client[0].get_registered_model(name=MODEL_NAME)
         expected_attrs = {
             "id": registered_model.id,
             "name": registered_model.name,
@@ -112,7 +112,7 @@ def test_model_registry_grpc_container_removal(self, model_registry_deployment_c
         ],
     )
     def test_model_registry_endpoint_response(
-        self, model_registry_rest_url: str, model_registry_rest_headers: dict[str, str], endpoint: str
+        self, model_registry_rest_url: list[str], model_registry_rest_headers: dict[str, str], endpoint: str
     ):
         """
         RHOAIENG-26239: Test to ensure model registry endpoints are responsive
@@ -122,6 +122,6 @@ def test_model_registry_endpoint_response(
             Ensure endpoint is responsive via get call
         """
         output = execute_model_registry_get_command(
-            url=f"{model_registry_rest_url}/{endpoint}", headers=model_registry_rest_headers, json_output=False
+            url=f"{model_registry_rest_url[0]}/{endpoint}", headers=model_registry_rest_headers, json_output=False
         )
         assert output["raw_output"].lower() == "OK".lower()

tests/model_registry/python_client/test_model_registry_creation.py

@@ -25,7 +25,6 @@
 from tests.model_registry.rbac.group_utils import create_group
 from tests.model_registry.constants import MR_INSTANCE_NAME
 
-
 LOGGER = get_logger(name=__name__)
 DEFAULT_TOKEN_DURATION = "10m"
 

tests/model_registry/rbac/conftest.py

@@ -42,20 +42,20 @@
     ],
     indirect=True,
 )
-@pytest.mark.usefixtures("updated_dsc_component_state_scope_class")
+@pytest.mark.usefixtures("updated_dsc_component_state_scope_class", "model_registry_instance")
 class TestUserPermission:
     @pytest.mark.sanity
     def test_user_permission_non_admin_user(
         self: Self,
         test_idp_user,
-        model_registry_instance_rest_endpoint: str,
+        model_registry_instance_rest_endpoint: list[str],
         login_as_test_user: None,
     ):
         """
         This test verifies that non-admin users cannot access the Model Registry (403 Forbidden)
         """
         client_args = build_mr_client_args(
-            rest_endpoint=model_registry_instance_rest_endpoint, token=get_openshift_token()
+            rest_endpoint=model_registry_instance_rest_endpoint[0], token=get_openshift_token()
         )
         with pytest.raises(ForbiddenException) as exc_info:
             ModelRegistryClient(**client_args)
@@ -65,7 +65,7 @@ def test_user_permission_non_admin_user(
     @pytest.mark.sanity
     def test_user_added_to_group(
         self: Self,
-        model_registry_instance_rest_endpoint: str,
+        model_registry_instance_rest_endpoint: list[str],
         test_idp_user: UserTestSession,
         model_registry_group_with_user: Group,
         login_as_test_user: Generator[UserTestSession, None, None],
@@ -79,7 +79,7 @@ def test_user_added_to_group(
             wait_timeout=240,
             sleep=5,
             func=assert_positive_mr_registry,
-            model_registry_instance_rest_endpoint=model_registry_instance_rest_endpoint,
+            model_registry_instance_rest_endpoint=model_registry_instance_rest_endpoint[0],
             token=get_openshift_token(),
         )
         for _ in sampler:
@@ -90,7 +90,7 @@ def test_user_added_to_group(
     def test_create_group(
         self: Self,
         test_idp_user: UserTestSession,
-        model_registry_instance_rest_endpoint: str,
+        model_registry_instance_rest_endpoint: list[str],
         created_role_binding_group: RoleBinding,
         login_as_test_user: None,
     ):
@@ -103,14 +103,14 @@ def test_create_group(
         3. Users in the group can access the Model Registry
         """
         assert_positive_mr_registry(
-            model_registry_instance_rest_endpoint=model_registry_instance_rest_endpoint,
+            model_registry_instance_rest_endpoint=model_registry_instance_rest_endpoint[0],
         )
 
     @pytest.mark.sanity
     def test_add_single_user_role_binding(
         self: Self,
         test_idp_user: UserTestSession,
-        model_registry_instance_rest_endpoint: str,
+        model_registry_instance_rest_endpoint: list[str],
         created_role_binding_user: RoleBinding,
         login_as_test_user: None,
     ):
@@ -122,5 +122,5 @@ def test_add_single_user_role_binding(
         2. The user can access the Model Registry after being granted access
         """
         assert_positive_mr_registry(
-            model_registry_instance_rest_endpoint=model_registry_instance_rest_endpoint,
+            model_registry_instance_rest_endpoint=model_registry_instance_rest_endpoint[0],
         )

tests/model_registry/rbac/test_mr_rbac.py

@@ -38,18 +38,18 @@ class TestModelRegistryRBAC:
     def test_service_account_access_denied(
         self: Self,
         sa_token: str,
-        model_registry_instance_rest_endpoint: str,
+        model_registry_instance_rest_endpoint: list[str],
     ):
         """
         Verifies SA access is DENIED (403 Forbidden) by default via REST.
         Does NOT use mr_access_role or mr_access_role_binding fixtures.
         """
         LOGGER.info("--- Starting RBAC Test: Access Denied ---")
-        LOGGER.info(f"Targeting Model Registry REST endpoint: {model_registry_instance_rest_endpoint}")
+        LOGGER.info(f"Targeting Model Registry REST endpoint: {model_registry_instance_rest_endpoint[0]}")
         LOGGER.info("Expecting initial access DENIAL (403 Forbidden)")
 
         client_args = build_mr_client_args(
-            rest_endpoint=model_registry_instance_rest_endpoint, token=sa_token, author="rbac-test-denied"
+            rest_endpoint=model_registry_instance_rest_endpoint[0], token=sa_token, author="rbac-test-denied"
         )
         LOGGER.debug(f"Attempting client connection with args: {client_args}")
 
@@ -69,7 +69,7 @@ def test_service_account_access_denied(
     def test_service_account_access_granted(
         self: Self,
         sa_token: str,
-        model_registry_instance_rest_endpoint: str,
+        model_registry_instance_rest_endpoint: list[str],
     ):
         """
         Verifies SA access is GRANTED via REST after applying Role and RoleBinding fixtures.
@@ -80,7 +80,7 @@ def test_service_account_access_granted(
 
         try:
             client_args = build_mr_client_args(
-                rest_endpoint=model_registry_instance_rest_endpoint, token=sa_token, author="rbac-test-granted"
+                rest_endpoint=model_registry_instance_rest_endpoint[0], token=sa_token, author="rbac-test-granted"
             )
             LOGGER.debug(f"Attempting client connection with args: {client_args}")
             mr_client_success = ModelRegistryClient(**client_args)