change: use model_registry_mysql_config fixture

Author: fege

tests/model_registry/conftest.py

@@ -188,16 +188,22 @@ def model_registry_instance_oauth_proxy(
 
 @pytest.fixture(scope="class")
 def model_registry_mysql_config(
-    model_registry_db_deployment: Deployment, model_registry_db_secret: Secret
+    model_registry_db_deployment: Deployment,
+    model_registry_db_secret: Secret,
+    ssl_ca: str | None = None,
+    port: int = 3306,
 ) -> dict[str, Any]:
-    return {
+    config = {
         "host": f"{model_registry_db_deployment.name}.{model_registry_db_deployment.namespace}.svc.cluster.local",
         "database": model_registry_db_secret.string_data["database-name"],
         "passwordSecret": {"key": "database-password", "name": model_registry_db_deployment.name},
-        "port": 3306,
+        "port": port,
         "skipDBCreation": False,
         "username": model_registry_db_secret.string_data["database-user"],
     }
+    if ssl_ca is not None:
+        config["ssl_ca"] = ssl_ca
+    return config
 
 
 @pytest.fixture(scope="class")

tests/model_registry/rest_api/conftest.py

@@ -11,7 +11,6 @@
 from tests.model_registry.utils import (
     get_model_registry_deployment_template_dict,
     create_model_registry_instance,
-    make_mysql_config,
 )
 from tests.model_registry.constants import (
     DB_RESOURCES_NAME,
@@ -106,26 +105,19 @@ def patch_invalid_ca(
 @pytest.fixture(scope="function")
 def model_registry_instance_ca(
     model_registry_namespace: str,
-    model_registry_db_secret: Secret,
-    model_registry_db_service: Service,
-    patch_invalid_ca: str,
+    model_registry_mysql_config: dict[str, Any],
 ) -> Generator[ModelRegistry, Any, Any]:
     """
     Deploys a Model Registry instance with a custom CA certificate.
     """
-    mysql_config = make_mysql_config(
-        db_service=model_registry_db_service,
-        db_secret=model_registry_db_secret,
-        ssl_ca=patch_invalid_ca,
-    )
     with create_model_registry_instance(
         namespace=model_registry_namespace,
         name=SECURE_MR_NAME,
         labels=MODEL_REGISTRY_STANDARD_LABELS,
         grpc={},
         rest={},
         istio=ISTIO_CONFIG_DICT,
-        mysql=mysql_config,
+        mysql=model_registry_mysql_config,
         wait_for_resource=True,
     ) as mr:
         mr.wait_for_condition(condition="Available", status="True")
@@ -138,6 +130,7 @@ def deploy_secure_mysql_and_mr(
     model_registry_db_secret: Secret,
     model_registry_db_service: Service,
     model_registry_db_deployment: Deployment,
+    model_registry_mysql_config: dict[str, Any],
 ) -> Generator[ModelRegistry, None, None]:
     """
     Deploys MySQL with SSL/TLS and a Model Registry configured to use a secure DB connection.
@@ -161,19 +154,14 @@ def deploy_secure_mysql_and_mr(
     patch = {"spec": {"template": mysql_template["spec"]}}
 
     with ResourceEditor(patches={model_registry_db_deployment: patch}):
-        mysql_config = make_mysql_config(
-            db_service=model_registry_db_service,
-            db_secret=model_registry_db_secret,
-            ssl_ca=CA_FILE_PATH,
-        )
         with create_model_registry_instance(
             namespace=model_registry_namespace,
             name=SECURE_MR_NAME,
             labels=MODEL_REGISTRY_STANDARD_LABELS,
             grpc={},
             rest={},
             istio=ISTIO_CONFIG_DICT,
-            mysql=mysql_config,
+            mysql=model_registry_mysql_config,
             wait_for_resource=True,
         ) as mr:
             mr.wait_for_condition(condition="Available", status="True")

tests/model_registry/rest_api/test_model_registry_secure_db.py

@@ -34,18 +34,31 @@ class TestModelRegistryWithSecureDB:
     Includes tests for both invalid and valid CA certificate scenarios.
     """
 
+    @pytest.fixture
+    def invalid_ca_mysql_config(patch_invalid_ca):
+        """
+        Fixture that returns a dict for model_registry_mysql_config with ssl_ca set to the value from patch_invalid_ca.
+        """
+        return {"ssl_ca": patch_invalid_ca}
+
     # Implements RHOAIENG-26150
-    @pytest.mark.usefixtures("model_registry_instance_ca")
     @pytest.mark.parametrize(
         "patch_invalid_ca",
         [{"ca_configmap_name": "odh-trusted-ca-bundle", "ca_file_name": "invalid-ca.crt"}],
         indirect=True,
     )
+    @pytest.mark.parametrize(
+        "model_registry_mysql_config",
+        [pytest.param("invalid_ca_mysql_config")],
+        indirect=True,
+    )
     @pytest.mark.smoke
     def test_register_model_with_invalid_ca(
         self: Self,
         model_registry_rest_url: str,
         model_registry_rest_headers: dict[str, str],
+        model_registry_instance_ca,
+        patch_invalid_ca,
     ) -> None:
         """
         Test that model registration fails with an SSLError when the Model Registry is deployed

tests/model_registry/utils.py

@@ -10,10 +10,9 @@
 from simple_logger.logger import get_logger
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 from kubernetes.dynamic.exceptions import NotFoundError
-from tests.model_registry.constants import MR_DB_IMAGE_DIGEST, DB_RESOURCES_NAME
+from tests.model_registry.constants import MR_DB_IMAGE_DIGEST
 from utilities.exceptions import ProtocolNotSupportedError, TooManyServicesError
 from utilities.constants import Protocols, Annotations
-from ocp_resources.secret import Secret
 
 ADDRESS_ANNOTATION_PREFIX: str = "routing.opendatahub.io/external-address-"
 
@@ -316,34 +315,3 @@ def create_model_registry_instance(
         enable_database_upgrade=enable_database_upgrade,
         wait_for_resource=wait_for_resource,
     )
-
-
-def make_mysql_config(
-    db_service: Service,
-    db_secret: Secret,
-    ssl_ca: str,
-    db_resource_name: str = DB_RESOURCES_NAME,
-    port: int = 3306,
-) -> dict[str, Any]:
-    """
-    Factory to create a MySQL config dictionary for Model Registry.
-
-    Args:
-        db_service: The MySQL Service resource.
-        db_secret : The MySQL Secret resource.
-        ssl_ca: Path to the CA bundle file.
-        db_resource_name: Name of the DB resource (default: DB_RESOURCES_NAME).
-        port: Port number for the MySQL connection (default: 3306).
-
-    Returns:
-        dict: MySQL configuration dictionary.
-    """
-    return {
-        "host": f"{db_service.name}.{db_service.namespace}.svc.cluster.local",
-        "database": db_secret.string_data["database-name"],
-        "passwordSecret": {"key": "database-password", "name": db_resource_name},
-        "port": port,
-        "skipDBCreation": False,
-        "username": db_secret.string_data["database-user"],
-        "ssl_ca": ssl_ca,
-    }