Merge branch 'main' into keda-fix

Author: mwaykole

pyproject.toml

@@ -69,7 +69,7 @@ dependencies = [
     "marshmallow==3.26.1,<4", # this version is needed for pytest-jira
     "pytest-html>=4.1.1",
     "fire",
-    "llama_stack_client==0.2.10",
+    "llama_stack_client==0.2.17",
     "pytest-xdist==3.8.0",
 ]
 

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,11 +36,12 @@ 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"
 )
-MODEL_REGISTRY_DB_SECRET_STR_DATA = {
+MODEL_REGISTRY_DB_SECRET_STR_DATA: dict[str, str] = {
     "database-name": "model_registry",
     "database-password": "TheBlurstOfTimes",  # pragma: allowlist secret
     "database-user": "mlmduser",  # pragma: allowlist secret
@@ -53,12 +55,5 @@ 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,
-}
-
+NUM_RESOURCES = {"num_resources": 3}
 NUM_MR_INSTANCES: int = 2

tests/model_registry/constants.py

@@ -6,7 +6,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__)
@@ -15,7 +14,7 @@
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class",
     "is_model_registry_oauth",
-    "model_registry_mysql_metadata_db",
+    "mysql_metadata_resources",
     "model_registry_instance_mysql",
 )
 @pytest.mark.downstream_only
@@ -32,7 +31,6 @@ class TestModelRegistryImages:
     def test_verify_model_registry_images(
         self: Self,
         admin_client: DynamicClient,
-        model_registry_instance_mysql: ModelRegistry,
         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,65 +1,89 @@
 import pytest
-import uuid
 from tests.model_registry.constants import (
     MODEL_REGISTRY_DB_SECRET_STR_DATA,
     MR_INSTANCE_NAME,
-    DB_RESOURCES_NAME,
+    DB_BASE_RESOURCES_NAME,
     NUM_MR_INSTANCES,
+    MODEL_REGISTRY_DB_SECRET_ANNOTATIONS,
+    OAUTH_PROXY_CONFIG_DICT,
 )
+from tests.model_registry.utils import (
+    get_model_registry_db_label_dict,
+    get_model_registry_deployment_template_dict,
+    get_mr_standard_labels,
+    get_mysql_config,
+)
+from utilities.general import generate_random_name
 
-
-ns_name = f"{MR_INSTANCE_NAME}-ns-{str(uuid.uuid4())[:8]}"
+ns_name = generate_random_name(prefix=MR_INSTANCE_NAME, length=2)
 ns_params = {"ns_name": ns_name}
 
-db_names = [f"{DB_RESOURCES_NAME}-{i + 1}-{str(uuid.uuid4())[:8]}" for i in range(NUM_MR_INSTANCES)]
+resource_names = [f"{DB_BASE_RESOURCES_NAME}{index}" for index in range(0, NUM_MR_INSTANCES)]
 
-db_secret_params = [{"db_name": db_name, "ns_name": ns_name} for db_name in db_names]
+db_secret_params = [
+    {
+        "name": resource_name,
+        "namespace": ns_name,
+        "string_data": MODEL_REGISTRY_DB_SECRET_STR_DATA,
+        "label": get_model_registry_db_label_dict(db_resource_name=resource_name),
+        "annotations": MODEL_REGISTRY_DB_SECRET_ANNOTATIONS,
+    }
+    for resource_name in resource_names
+]
 
 db_pvc_params = [
     {
-        "db_name": db_name,
-        "ns_name": ns_name,
+        "name": resource_name,
+        "namespace": ns_name,
         "accessmodes": "ReadWriteOnce",
         "size": "4Gi",
+        "label": get_model_registry_db_label_dict(db_resource_name=resource_name),
     }
-    for db_name in db_names
+    for resource_name in resource_names
 ]
-
+annotation = {"template.openshift.io/expose-uri": r"mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\mysql\)].port}"}
 db_service_params = [
     {
-        "db_name": db_name,
+        "name": resource_name,
         "ports": [{"name": "mysql", "port": 3306, "protocol": "TCP", "targetPort": 3306}],
-        "ns_name": ns_name,
+        "namespace": ns_name,
+        "selector": {"name": resource_name},
+        "label": get_model_registry_db_label_dict(db_resource_name=resource_name),
+        "annotations": annotation,
     }
-    for db_name in db_names
+    for resource_name in resource_names
 ]
 
 db_deployment_params = [
     {
-        "db_name": db_name,
-        "ns_name": ns_name,
+        "name": resource_name,
+        "namespace": ns_name,
         "replicas": 1,
         "revision_history_limit": 0,
+        "annotations": {
+            "template.alpha.openshift.io/wait-for-ready": "true",
+        },
+        "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),
+        "wait_for_resource": True,
     }
-    for db_name in db_names
+    for resource_name in resource_names
 ]
 
 model_registry_instance_params = [
     {
-        "is_model_registry_oauth": True,
-        "mr_name": f"{MR_INSTANCE_NAME}-{i + 1}",
-        "db_name": db_name,
-        "ns_name": ns_name,
-        "mysql_config": {
-            "host": f"{db_name}.{ns_name}.svc.cluster.local",
-            "database": MODEL_REGISTRY_DB_SECRET_STR_DATA["database-name"],
-            "passwordSecret": {"key": "database-password", "name": db_name},
-            "port": 3306,
-            "skipDBCreation": False,
-            "username": MODEL_REGISTRY_DB_SECRET_STR_DATA["database-user"],
-        },
+        "name": f"{MR_INSTANCE_NAME}{index}",
+        "namespace": ns_name,
+        "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),
+        "wait_for_resource": True,
+        "oauth_proxy": OAUTH_PROXY_CONFIG_DICT,
     }
-    for i, db_name in enumerate(db_names)
+    for index in range(0, NUM_MR_INSTANCES)
 ]
 
 # Add this complete set of parameters as a pytest.param tuple to the list.
@@ -71,6 +95,6 @@
         db_service_params,
         db_deployment_params,
         model_registry_instance_params,
-        id=f"mr-scenario-{len(db_names)}-instances",  # Unique ID for pytest output
+        id=f"mr-scenario-{len(resource_names)}-instances",  # Unique ID for pytest output
     )
 ]

tests/model_registry/multiple_instance_utils.py

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

tests/model_registry/negative_tests/test_db_migration.py

@@ -11,7 +11,7 @@
 from tests.model_registry.constants import (
     MR_OPERATOR_NAME,
     MR_INSTANCE_NAME,
-    DB_RESOURCES_NAME,
+    DB_RESOURCE_NAME,
     OAUTH_PROXY_CONFIG_DICT,
 )
 from kubernetes.dynamic.exceptions import ForbiddenError
@@ -40,7 +40,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_RESOURCE_NAME},
             "port": 3306,
             "skipDBCreation": False,
             "username": model_registry_db_secret_negative_test.string_data["database-user"],

tests/model_registry/negative_tests/test_model_registry_creation_negative.py

@@ -31,7 +31,12 @@
 )
 @pytest.mark.usefixtures(
     "updated_dsc_component_state_scope_class",
-    "model_registry_mysql_metadata_db",
+    "is_model_registry_oauth",
+    "model_registry_namespace",
+    "model_registry_db_secret",
+    "model_registry_db_pvc",
+    "model_registry_db_service",
+    "model_registry_db_deployment",
     "model_registry_instance_mysql",
     "registered_model",
 )
@@ -45,10 +50,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,
@@ -113,7 +118,7 @@ def test_model_registry_pod_log_mlmd_removal(
         ],
     )
     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
@@ -123,6 +128,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"] == "OK"