Merge branch 'main' into upgrade

Author: dbasunag

tests/model_registry/conftest.py

@@ -460,6 +460,55 @@ def model_registry_instance_pod(admin_client: DynamicClient) -> Generator[Pod, A
     )[0]
 
 
+@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_RESOURCES_NAME}",
+        expected_num_pods=1,
+    )[0]
+
+
+@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 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)
+
+
 @pytest.fixture(scope="class")
 def is_model_registry_oauth(request: FixtureRequest) -> bool:
     return getattr(request, "param", {}).get("use_oauth_proxy", True)

tests/model_registry/negative_tests/test_db_migration.py

@@ -0,0 +1,61 @@
+import pytest
+from typing import Self
+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
+from tests.model_registry.constants import MR_INSTANCE_NAME
+from kubernetes.dynamic.client import DynamicClient
+from utilities.general import wait_for_pods_by_labels
+
+
+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")
+class TestDBMigration:
+    def test_db_migration_negative(
+        self: Self,
+        admin_client: DynamicClient,
+        model_registry_instance: ModelRegistry,
+        model_registry_db_instance_pod: Pod,
+        set_mr_db_dirty: int,
+        delete_mr_deployment: None,
+    ):
+        """
+        RHOAIENG-27505: This test is to check the migration error when the database is dirty.
+        The test will:
+        1. Set the dirty flag to 1 for the latest migration version
+        2. Delete the model registry deployment
+        3. Check the logs for the expected error
+        """
+        mr_pods = 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,
+        )
+        mr_pod = mr_pods[0]
+        LOGGER.info("Checking the logs for the expected error")
+
+        log_output = mr_pod.log(container="rest-container")
+        expected_error = (
+            f"Error: {{{{ALERT}}}} error connecting to datastore: Dirty database version {set_mr_db_dirty}. "
+            "Fix and force version."
+        )
+        assert expected_error in log_output, "Expected error message not found in logs!"