parameterize mariadb tests

Author: dbasunag

tests/model_registry/conftest.py

@@ -54,3 +54,12 @@ class ModelRegistryEndpoints:
 CA_FILE_PATH = f"{CA_MOUNT_PATH}/ca-bundle.crt"
 NUM_RESOURCES = {"num_resources": 3}
 NUM_MR_INSTANCES: int = 2
+MARIADB_MY_CNF = (
+    "[mysqld]\nbind-address=0.0.0.0\ndefault_storage_engine=InnoDB\n"
+    "binlog_format=row\ninnodb_autoinc_lock_mode=2\ninnodb_buffer_pool_size=1024M"
+    "\nmax_allowed_packet=256M\n"
+)
+PORT_MAP = {
+    "mariadb": 3306,
+    "mysql": 3306,
+}

tests/model_registry/constants.py

@@ -0,0 +1,20 @@
+from typing import Generator, Any
+
+import pytest
+from kubernetes.dynamic import DynamicClient
+from pytest_testconfig import config as py_config
+
+from ocp_resources.pod import Pod
+from tests.model_registry.constants import MR_INSTANCE_NAME
+from utilities.general import wait_for_pods_by_labels
+
+
+@pytest.fixture(scope="function")
+def model_registry_instance_pod(admin_client: DynamicClient) -> Generator[Pod, Any, Any]:
+    """Get the model registry instance pod."""
+    yield wait_for_pods_by_labels(
+        admin_client=admin_client,
+        namespace=py_config["model_registry_namespace"],
+        label_selector=f"app={MR_INSTANCE_NAME}",
+        expected_num_pods=1,
+    )[0]

tests/model_registry/image_validation/conftest.py

@@ -12,9 +12,10 @@
 
 
 @pytest.mark.usefixtures(
-    "updated_dsc_component_state_scope_class",
-    "mysql_metadata_resources",
-    "model_registry_instance_mysql",
+    "updated_dsc_component_state_scope_session",
+    "model_registry_namespace",
+    "model_registry_metadata_db_resources",
+    "model_registry_instance",
 )
 @pytest.mark.downstream_only
 class TestModelRegistryImages:

tests/model_registry/image_validation/test_verify_rhoai_images.py

@@ -2,8 +2,10 @@
 from typing import Generator, Any
 
 from _pytest.config import Config
+from pytest_testconfig import config as py_config
 
 from ocp_resources.data_science_cluster import DataScienceCluster
+from ocp_resources.pod import Pod
 from ocp_resources.secret import Secret
 from ocp_resources.namespace import Namespace
 from ocp_resources.service import Service
@@ -16,9 +18,12 @@
 from tests.model_registry.constants import (
     MODEL_REGISTRY_DB_SECRET_STR_DATA,
     MODEL_REGISTRY_DB_SECRET_ANNOTATIONS,
+    DB_RESOURCE_NAME,
+    MR_INSTANCE_NAME,
 )
 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.general import wait_for_pods_by_labels
 from utilities.infra import create_ns
 
 DB_RESOURCES_NAME_NEGATIVE = "db-model-registry-negative"
@@ -121,9 +126,60 @@ def model_registry_db_deployment_negative_test(
         selector={"matchLabels": {"name": DB_RESOURCES_NAME_NEGATIVE}},
         strategy={"type": "Recreate"},
         template=get_model_registry_deployment_template_dict(
-            secret_name=model_registry_db_secret_negative_test.name, resource_name=DB_RESOURCES_NAME_NEGATIVE
+            secret_name=model_registry_db_secret_negative_test.name,
+            resource_name=DB_RESOURCES_NAME_NEGATIVE,
+            db_backend="mysql",
         ),
         wait_for_resource=True,
     ) as mr_db_deployment:
         mr_db_deployment.wait_for_replicas(deployed=True)
         yield mr_db_deployment
+
+
+@pytest.fixture()
+def set_mr_db_dirty(model_registry_db_instance_pod: Pod) -> int:
+    """Set the model registry database dirty and return the latest migration version"""
+    output = model_registry_db_instance_pod.execute(
+        command=[
+            "mysql",
+            "-u",
+            MODEL_REGISTRY_DB_SECRET_STR_DATA["database-user"],
+            f"-p{MODEL_REGISTRY_DB_SECRET_STR_DATA['database-password']}",
+            "-e",
+            "SELECT version FROM schema_migrations ORDER BY version DESC LIMIT 1;",
+            MODEL_REGISTRY_DB_SECRET_STR_DATA["database-name"],
+        ]
+    )
+    latest_migration_version = int(output.strip().split()[1])
+    model_registry_db_instance_pod.execute(
+        command=[
+            "mysql",
+            "-u",
+            MODEL_REGISTRY_DB_SECRET_STR_DATA["database-user"],
+            f"-p{MODEL_REGISTRY_DB_SECRET_STR_DATA['database-password']}",
+            "-e",
+            f"UPDATE schema_migrations SET dirty = 1 WHERE version = {latest_migration_version};",
+            MODEL_REGISTRY_DB_SECRET_STR_DATA["database-name"],
+        ]
+    )
+    return latest_migration_version
+
+
+@pytest.fixture()
+def model_registry_db_instance_pod(admin_client: DynamicClient) -> Generator[Pod, Any, Any]:
+    """Get the model registry instance pod."""
+    yield wait_for_pods_by_labels(
+        admin_client=admin_client,
+        namespace=py_config["model_registry_namespace"],
+        label_selector=f"name={DB_RESOURCE_NAME}",
+        expected_num_pods=1,
+    )[0]
+
+
+@pytest.fixture()
+def delete_mr_deployment() -> None:
+    """Delete the model registry deployment"""
+    mr_deployment = Deployment(
+        name=MR_INSTANCE_NAME, namespace=py_config["model_registry_namespace"], ensure_exists=True
+    )
+    mr_deployment.delete(wait=True)

tests/model_registry/negative_tests/conftest.py

@@ -13,7 +13,7 @@
 
 
 @pytest.mark.usefixtures(
-    "updated_dsc_component_state_scope_class", "mysql_metadata_resources", "model_registry_instance_mysql"
+    "updated_dsc_component_state_scope_session", "model_registry_metadata_db_resources", "model_registry_instance"
 )
 class TestDBMigration:
     def test_db_migration_negative(

tests/model_registry/negative_tests/test_db_migration.py

@@ -22,7 +22,7 @@
 
 @pytest.mark.usefixtures(
     "model_registry_namespace_for_negative_tests",
-    "updated_dsc_component_state_scope_class",
+    "updated_dsc_component_state_scope_session",
     "model_registry_db_secret_negative_test",
     "model_registry_db_deployment_negative_test",
 )
@@ -32,7 +32,7 @@ def test_registering_model_negative(
         self: Self,
         current_client_token: str,
         model_registry_namespace_for_negative_tests: Namespace,
-        updated_dsc_component_state_scope_class: DataScienceCluster,
+        updated_dsc_component_state_scope_session: DataScienceCluster,
         model_registry_db_secret_negative_test: Secret,
         model_registry_db_deployment_negative_test: Deployment,
     ):

tests/model_registry/negative_tests/test_model_registry_creation_negative.py

@@ -30,13 +30,10 @@
     indirect=True,
 )
 @pytest.mark.usefixtures(
-    "updated_dsc_component_state_scope_class",
+    "updated_dsc_component_state_scope_session",
     "model_registry_namespace",
-    "model_registry_db_secret",
-    "model_registry_db_pvc",
-    "model_registry_db_service",
-    "model_registry_db_deployment",
-    "model_registry_instance_mysql",
+    "model_registry_metadata_db_resources",
+    "model_registry_instance",
     "registered_model",
 )
 @pytest.mark.custom_namespace

tests/model_registry/python_client/test_model_registry_creation.py

@@ -7,11 +7,10 @@
 from typing import Generator, List, Dict, Any
 
 from _pytest.fixtures import FixtureRequest
-from pytest_testconfig import py_config
 from simple_logger.logger import get_logger
 
-from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.deployment import Deployment
+from ocp_resources.infrastructure import Infrastructure
 from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
 from ocp_resources.namespace import Namespace
 from ocp_resources.oauth import OAuth
@@ -28,11 +27,9 @@
 from pyhelper_utils.shell import run_command
 
 from tests.model_registry.rbac.utils import wait_for_oauth_openshift_deployment, create_role_binding
-from utilities.constants import DscComponents
 from utilities.general import generate_random_name
 from tests.model_registry.utils import (
     generate_namespace_name,
-    wait_for_pods_running,
 )
 from utilities.infra import login_with_user_password
 from utilities.user_utils import UserTestSession, create_htpasswd_file, wait_for_user_creation
@@ -425,47 +422,6 @@ def created_role_binding_user(
 # =============================================================================
 # RESOURCE FIXTURES PARMETRIZED
 # =============================================================================
-@pytest.fixture(scope="class")
-def updated_dsc_component_state_parametrized(
-    request: FixtureRequest,
-    admin_client: DynamicClient,
-    dsc_resource: DataScienceCluster,
-    teardown_resources: bool,
-) -> Generator[DataScienceCluster, Any, Any]:
-    """Configure DSC to use parametrized Model Registry namespace"""
-    if not teardown_resources:
-        yield dsc_resource
-
-    # Get the namespace name from the parameter if provided, otherwise use the default namespace
-    namespace_name = request.param.get("ns_name", py_config["model_registry_namespace"])
-
-    # Set the new namespace and manage
-    component_patch = {
-        DscComponents.MODELREGISTRY: {
-            "managementState": DscComponents.ManagementState.MANAGED,
-            "registriesNamespace": namespace_name,
-        },
-    }
-
-    with ResourceEditor(patches={dsc_resource: {"spec": {"components": component_patch}}}):
-        dsc_resource.wait_for_condition(
-            condition=DscComponents.COMPONENT_MAPPING[DscComponents.MODELREGISTRY], status="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,
-            namespace_name=py_config["applications_namespace"],
-            number_of_consecutive_checks=6,
-        )
-        yield dsc_resource
-
-    # Clean up the dynamic namespace
-    namespace = Namespace(name=namespace_name, ensure_exists=True)
-    if namespace:
-        namespace.delete(wait=True)
-
-
 @pytest.fixture(scope="class")
 def db_secret_parametrized(request: FixtureRequest, teardown_resources: bool) -> Generator[List[Secret], Any, Any]:
     """Create DB Secret parametrized"""
@@ -556,3 +512,9 @@ def model_registry_instance_parametrized(
             f"Created {len(model_registry_instances)} MR instances: {[mr.name for mr in model_registry_instances]}"
         )
         yield model_registry_instances
+
+
+@pytest.fixture(scope="session")
+def api_server_url(admin_client: DynamicClient) -> str:
+    infrastructure = Infrastructure(client=admin_client, name="cluster", ensure_exists=True)
+    return infrastructure.instance.status.apiServerURL

tests/model_registry/rbac/conftest.py

@@ -1,4 +1,6 @@
 import pytest
+from pytest_testconfig import config as py_config
+
 from tests.model_registry.constants import (
     MODEL_REGISTRY_DB_SECRET_STR_DATA,
     MR_INSTANCE_NAME,
@@ -13,9 +15,8 @@
     get_mr_standard_labels,
     get_mysql_config,
 )
-from utilities.general import generate_random_name
 
-ns_name = generate_random_name(prefix=MR_INSTANCE_NAME, length=2)
+ns_name = py_config["model_registry_namespace"]
 ns_params = {"ns_name": ns_name}
 
 resource_names = [f"{DB_BASE_RESOURCES_NAME}{index}" for index in range(0, NUM_MR_INSTANCES)]
@@ -66,7 +67,9 @@
         "label": get_model_registry_db_label_dict(db_resource_name=resource_name),
         "selector": {"matchLabels": {"name": resource_name}},
         "strategy": {"type": "Recreate"},
-        "template": get_model_registry_deployment_template_dict(secret_name=resource_name, resource_name=resource_name),
+        "template": get_model_registry_deployment_template_dict(
+            secret_name=resource_name, resource_name=resource_name, db_backend="mysql"
+        ),
         "wait_for_resource": True,
     }
     for resource_name in resource_names
@@ -79,7 +82,7 @@
         "label": get_mr_standard_labels(resource_name=f"{MR_INSTANCE_NAME}{index}"),
         "grpc": {},
         "rest": {},
-        "mysql": get_mysql_config(base_name=f"{DB_BASE_RESOURCES_NAME}{index}", namespace=ns_name),
+        "mysql": get_mysql_config(base_name=f"{DB_BASE_RESOURCES_NAME}{index}", namespace=ns_name, db_backend="mysql"),
         "wait_for_resource": True,
         "oauth_proxy": OAUTH_PROXY_CONFIG_DICT,
     }