add separate commandline option for custom namespace tests (#480)

Author: dbasunag

conftest.py

@@ -23,7 +23,7 @@
 from typing import Optional, Any
 from pytest_testconfig import config as py_config
 
-from utilities.constants import KServeDeploymentType
+from utilities.constants import KServeDeploymentType, MODEL_REGISTRY_CUSTOM_NAMESPACE
 from utilities.database import Database
 from utilities.logger import separator, setup_logging
 from utilities.must_gather_collector import (
@@ -53,7 +53,7 @@ def pytest_addoption(parser: Parser) -> None:
     serving_arguments_group = parser.getgroup(name="Serving arguments")
     model_validation_automation_group = parser.getgroup(name="Model Validation Automation")
     hf_group = parser.getgroup(name="Hugging Face")
-
+    model_registry_group = parser.getgroup(name="Model Registry options")
     # AWS config and credentials options
     aws_group.addoption(
         "--aws-secret-access-key",
@@ -190,6 +190,13 @@ def pytest_addoption(parser: Parser) -> None:
 
     # HuggingFace options
     hf_group.addoption("--hf-access-token", default=os.environ.get("HF_ACCESS_TOKEN"), help="HF access token")
+    # Model Registry options
+    model_registry_group.addoption(
+        "--custom-namespace",
+        default=False,
+        action="store_true",
+        help="Indicates if the model registry tests are to be run against custom namespace",
+    )
 
 
 def pytest_cmdline_main(config: Any) -> None:
@@ -285,10 +292,10 @@ def pytest_sessionstart(session: Session) -> None:
     if config.getoption("--collect-only") or config.getoption("--setup-plan"):
         LOGGER.info("Skipping global config update for collect-only or setup-plan")
         return
-    updated_global_config(admin_client=get_client())
+    updated_global_config(admin_client=get_client(), config=config)
 
 
-def updated_global_config(admin_client: DynamicClient) -> None:
+def updated_global_config(admin_client: DynamicClient, config: Config) -> None:
     """
     Updates the global config with the distribution, applications namespace, and model registry namespace.
     Args:
@@ -308,9 +315,15 @@ def updated_global_config(admin_client: DynamicClient) -> None:
         pytest.exit(f"Unknown distribution: {distribution}")
 
     py_config["applications_namespace"] = get_dsci_applications_namespace(client=admin_client)
-    py_config["model_registry_namespace"] = get_data_science_cluster(
-        client=admin_client
-    ).instance.spec.components.modelregistry.registriesNamespace
+
+    if config.getoption("--custom-namespace"):
+        LOGGER.info(f"Running model registry tests against custom namespace: {MODEL_REGISTRY_CUSTOM_NAMESPACE}")
+        py_config["model_registry_namespace"] = MODEL_REGISTRY_CUSTOM_NAMESPACE
+    else:
+        LOGGER.info("Running model registry tests against default namespace")
+        py_config["model_registry_namespace"] = get_data_science_cluster(
+            client=admin_client
+        ).instance.spec.components.modelregistry.registriesNamespace
 
 
 def pytest_fixture_setup(fixturedef: FixtureDef[Any], request: FixtureRequest) -> None:

pytest.ini

@@ -32,6 +32,9 @@ markers =
     multinode: Mark tests which require multiple nodes
     keda: Mark tests which are testing KEDA scaling
 
+    # Model Registry:
+    custom_namespace: mark tests that are to be run with custom namespace
+
 addopts =
     -s
     -p no:logging

tests/model_registry/conftest.py

@@ -290,18 +290,21 @@ def updated_dsc_component_state_scope_class(
         yield dsc_resource
     else:
         original_components = dsc_resource.instance.spec.components
-        component_patch = request.param["component_patch"]
+        component_patch = {
+            DscComponents.MODELREGISTRY: {
+                "managementState": DscComponents.ManagementState.MANAGED,
+                "registriesNamespace": py_config["model_registry_namespace"],
+            },
+        }
+        LOGGER.info(f"Applying patch {component_patch}")
 
         with ResourceEditor(patches={dsc_resource: {"spec": {"components": component_patch}}}):
             for component_name in component_patch:
                 dsc_resource.wait_for_condition(
                     condition=DscComponents.COMPONENT_MAPPING[component_name], status="True"
                 )
-            if component_patch.get(DscComponents.MODELREGISTRY):
-                namespace = Namespace(
-                    name=dsc_resource.instance.spec.components.modelregistry.registriesNamespace, ensure_exists=True
-                )
-                namespace.wait_for_status(status=Namespace.Status.ACTIVE)
+            namespace = Namespace(name=py_config["model_registry_namespace"], ensure_exists=True)
+            namespace.wait_for_status(status=Namespace.Status.ACTIVE)
             wait_for_pods_running(
                 admin_client=admin_client,
                 namespace_name=py_config["applications_namespace"],
@@ -321,7 +324,7 @@ def updated_dsc_component_state_scope_class(
             ):
                 # Since namespace specified in registriesNamespace is automatically created after setting
                 # managementStateto Managed. We need to explicitly delete it on clean up.
-                namespace = Namespace(name=value["registriesNamespace"], ensure_exists=True)
+                namespace = Namespace(name=py_config["model_registry_namespace"], ensure_exists=True)
                 if namespace:
                     namespace.delete(wait=True)
 

tests/model_registry/image_validation/test_verify_rhoai_images.py

@@ -2,9 +2,7 @@
 from typing import Self, Set
 from simple_logger.logger import get_logger
 from kubernetes.dynamic import DynamicClient
-from pytest_testconfig import config as py_config
 
-from utilities.constants import DscComponents
 from utilities.general import (
     validate_container_images,
 )
@@ -14,20 +12,6 @@
 LOGGER = get_logger(name=__name__)
 
 
-@pytest.mark.parametrize(
-    "updated_dsc_component_state_scope_class",
-    [
-        {
-            "component_patch": {
-                DscComponents.MODELREGISTRY: {
-                    "managementState": DscComponents.ManagementState.MANAGED,
-                    "registriesNamespace": py_config["model_registry_namespace"],
-                }
-            }
-        }
-    ],
-    indirect=True,
-)
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class",
     "is_model_registry_oauth",

tests/model_registry/negative_tests/conftest.py

@@ -1,32 +1,40 @@
 import pytest
 from typing import Generator, Any
+
+from _pytest.config import Config
+
+from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.secret import Secret
 from ocp_resources.namespace import Namespace
 from ocp_resources.service import Service
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.deployment import Deployment
 
-from pytest import FixtureRequest
 from kubernetes.dynamic import DynamicClient
 
 
 from tests.model_registry.constants import (
     MODEL_REGISTRY_DB_SECRET_STR_DATA,
     MODEL_REGISTRY_DB_SECRET_ANNOTATIONS,
 )
-from tests.model_registry.negative_tests.constants import CUSTOM_NEGATIVE_NS
 from tests.model_registry.utils import get_model_registry_deployment_template_dict, get_model_registry_db_label_dict
+from utilities.constants import MODEL_REGISTRY_CUSTOM_NAMESPACE
 from utilities.infra import create_ns
 
 DB_RESOURCES_NAME_NEGATIVE = "db-model-registry-negative"
 
 
 @pytest.fixture(scope="class")
 def model_registry_namespace_for_negative_tests(
-    request: FixtureRequest, admin_client: DynamicClient
+    dsc_resource: DataScienceCluster,
+    admin_client: DynamicClient,
+    pytestconfig: Config,
 ) -> Generator[Namespace, Any, Any]:
+    namespace_name = MODEL_REGISTRY_CUSTOM_NAMESPACE
+    if pytestconfig.option.custom_namespace:
+        namespace_name = "rhoai-model-registries"
     with create_ns(
-        name=request.param.get("namespace_name", CUSTOM_NEGATIVE_NS),
+        name=namespace_name,
         admin_client=admin_client,
     ) as ns:
         yield ns

tests/model_registry/negative_tests/constants.py

@@ -4,7 +4,6 @@
 from pytest_testconfig import config as py_config
 
 from ocp_resources.pod import Pod
-from utilities.constants import DscComponents
 from tests.model_registry.constants import MR_INSTANCE_NAME
 from kubernetes.dynamic.client import DynamicClient
 from utilities.general import wait_for_container_status
@@ -13,20 +12,6 @@
 LOGGER = get_logger(name=__name__)
 
 
-@pytest.mark.parametrize(
-    "updated_dsc_component_state_scope_class",
-    [
-        pytest.param({
-            "component_patch": {
-                DscComponents.MODELREGISTRY: {
-                    "managementState": DscComponents.ManagementState.MANAGED,
-                    "registriesNamespace": py_config["model_registry_namespace"],
-                },
-            }
-        }),
-    ],
-    indirect=True,
-)
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class", "model_registry_mysql_metadata_db", "model_registry_instance_mysql"
 )

tests/model_registry/negative_tests/test_db_migration.py

@@ -7,8 +7,7 @@
 from pytest_testconfig import config as py_config
 from ocp_resources.namespace import Namespace
 from ocp_resources.secret import Secret
-from tests.model_registry.negative_tests.constants import CUSTOM_NEGATIVE_NS
-from utilities.constants import DscComponents, Annotations
+from utilities.constants import Annotations
 from tests.model_registry.constants import (
     MR_OPERATOR_NAME,
     MR_INSTANCE_NAME,
@@ -21,42 +20,13 @@
 LOGGER = get_logger(name=__name__)
 
 
-@pytest.mark.parametrize(
-    "model_registry_namespace_for_negative_tests, updated_dsc_component_state_scope_class, expected_namespace",
-    [
-        pytest.param(
-            {"namespace_name": CUSTOM_NEGATIVE_NS},
-            {
-                "component_patch": {
-                    DscComponents.MODELREGISTRY: {
-                        "managementState": DscComponents.ManagementState.MANAGED,
-                        "registriesNamespace": py_config["model_registry_namespace"],
-                    },
-                }
-            },
-            py_config["model_registry_namespace"],
-        ),
-        pytest.param(
-            {"namespace_name": py_config["model_registry_namespace"]},
-            {
-                "component_patch": {
-                    DscComponents.MODELREGISTRY: {
-                        "managementState": DscComponents.ManagementState.MANAGED,
-                        "registriesNamespace": CUSTOM_NEGATIVE_NS,
-                    },
-                },
-            },
-            CUSTOM_NEGATIVE_NS,
-        ),
-    ],
-    indirect=["model_registry_namespace_for_negative_tests", "updated_dsc_component_state_scope_class"],
-)
 @pytest.mark.usefixtures(
     "model_registry_namespace_for_negative_tests",
     "updated_dsc_component_state_scope_class",
     "model_registry_db_secret_negative_test",
     "model_registry_db_deployment_negative_test",
 )
+@pytest.mark.custom_namespace
 class TestModelRegistryCreationNegative:
     def test_registering_model_negative(
         self: Self,
@@ -65,7 +35,6 @@ def test_registering_model_negative(
         updated_dsc_component_state_scope_class: DataScienceCluster,
         model_registry_db_secret_negative_test: Secret,
         model_registry_db_deployment_negative_test: Deployment,
-        expected_namespace: str,
     ):
         my_sql_dict: dict[str, str] = {
             "host": f"{model_registry_db_deployment_negative_test.name}."
@@ -78,7 +47,7 @@ def test_registering_model_negative(
         }
         with pytest.raises(
             ForbiddenError,  # UnprocessibleEntityError
-            match=f"namespace must be {expected_namespace}",
+            match=f"namespace must be {py_config['model_registry_namespace']}",
         ):
             with ModelRegistry(
                 name=MR_INSTANCE_NAME,

tests/model_registry/negative_tests/test_model_registry_creation_negative.py

@@ -1,7 +1,6 @@
 import pytest
 from typing import Self, Any
 from simple_logger.logger import get_logger
-from pytest_testconfig import config as py_config
 
 # ocp_resources imports
 from ocp_resources.pod import Pod
@@ -11,7 +10,6 @@
     validate_no_grpc_container,
     validate_mlmd_removal_in_model_registry_pod_log,
 )
-from utilities.constants import DscComponents
 from tests.model_registry.constants import MODEL_NAME, MODEL_DICT
 from model_registry import ModelRegistry as ModelRegistryClient
 from model_registry.types import RegisteredModel
@@ -23,28 +21,9 @@
 
 
 @pytest.mark.parametrize(
-    "updated_dsc_component_state_scope_class, registered_model",
+    "registered_model",
     [
         pytest.param(
-            {
-                "component_patch": {
-                    DscComponents.MODELREGISTRY: {
-                        "managementState": DscComponents.ManagementState.MANAGED,
-                        "registriesNamespace": CUSTOM_NAMESPACE,
-                    },
-                }
-            },
-            MODEL_DICT,
-        ),
-        pytest.param(
-            {
-                "component_patch": {
-                    DscComponents.MODELREGISTRY: {
-                        "managementState": DscComponents.ManagementState.MANAGED,
-                        "registriesNamespace": py_config["model_registry_namespace"],
-                    },
-                },
-            },
             MODEL_DICT,
         ),
     ],
@@ -56,6 +35,7 @@
     "model_registry_instance_mysql",
     "registered_model",
 )
+@pytest.mark.custom_namespace
 class TestModelRegistryCreation:
     """
     Tests the creation of a model registry. If the component is set to 'Removed' it will be switched to 'Managed'

tests/model_registry/python_client/test_model_registry_creation.py

@@ -9,7 +9,6 @@
 """
 
 import pytest
-from pytest_testconfig import config as py_config
 from typing import Self, Generator, List
 from simple_logger.logger import get_logger
 
@@ -25,7 +24,6 @@
 from ocp_resources.deployment import Deployment
 from tests.model_registry.rbac.utils import build_mr_client_args, assert_positive_mr_registry, assert_forbidden_access
 from utilities.infra import get_openshift_token
-from utilities.constants import DscComponents
 from mr_openapi.exceptions import ForbiddenException
 from utilities.user_utils import UserTestSession
 from kubernetes.dynamic import DynamicClient
@@ -36,26 +34,13 @@
 pytestmark = [pytest.mark.usefixtures("original_user", "test_idp_user")]
 
 
-@pytest.mark.parametrize(
-    "updated_dsc_component_state_scope_class",
-    [
-        pytest.param({
-            "component_patch": {
-                DscComponents.MODELREGISTRY: {
-                    "managementState": DscComponents.ManagementState.MANAGED,
-                    "registriesNamespace": py_config["model_registry_namespace"],
-                },
-            }
-        }),
-    ],
-    indirect=True,
-)
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class",
     "is_model_registry_oauth",
     "model_registry_mysql_metadata_db",
     "model_registry_instance_mysql",
 )
+@pytest.mark.custom_namespace
 class TestUserPermission:
     @pytest.mark.sanity
     def test_user_permission_non_admin_user(