Add tests for grpc removal

Author: dbasunag

tests/model_registry/conftest.py

@@ -31,15 +31,15 @@
     ISTIO_CONFIG_DICT,
 )
 from tests.model_registry.rest_api.utils import ModelRegistryV1Alpha1
-from utilities.constants import Labels
+from utilities.constants import Labels, Protocols
 from tests.model_registry.utils import (
     get_endpoint_from_mr_service,
     get_mr_service_by_label,
     get_model_registry_deployment_template_dict,
     get_model_registry_db_label_dict,
     wait_for_pods_running,
 )
-from utilities.constants import Protocols, DscComponents
+from utilities.constants import DscComponents
 from model_registry import ModelRegistry as ModelRegistryClient
 from semver import Version
 from utilities.general import wait_for_pods_by_labels
@@ -467,3 +467,18 @@ def is_model_registry_oauth(request: FixtureRequest) -> bool:
 def api_server_url(admin_client: DynamicClient) -> str:
     infrastructure = Infrastructure(client=admin_client, name="cluster", ensure_exists=True)
     return infrastructure.instance.status.apiServerURL
+
+
+@pytest.fixture(scope="class")
+def model_registry_rest_url(model_registry_instance_rest_endpoint: str) -> str:
+    # address and port need to be split in the client instantiation
+    return f"{Protocols.HTTPS}://{model_registry_instance_rest_endpoint}"
+
+
+@pytest.fixture(scope="class")
+def model_registry_rest_headers(current_client_token: str) -> dict[str, str]:
+    return {
+        "Authorization": f"Bearer {current_client_token}",
+        "accept": "application/json",
+        "Content-Type": "application/json",
+    }

tests/model_registry/python_client/conftest.py

@@ -0,0 +1,13 @@
+from typing import Any
+
+import pytest
+
+from ocp_resources.deployment import Deployment
+from tests.model_registry.constants import MR_INSTANCE_NAME
+
+
+@pytest.fixture(scope="class")
+def model_registry_deployment_containers(model_registry_namespace: str) -> dict[str, Any]:
+    return Deployment(
+        name=MR_INSTANCE_NAME, namespace=model_registry_namespace, ensure_exists=True
+    ).instance.spec.template.spec.containers

tests/model_registry/python_client/test_model_registry_creation.py

@@ -1,10 +1,11 @@
 import pytest
-from typing import Self
+from typing import Self, Any
 from simple_logger.logger import get_logger
 from pytest_testconfig import config as py_config
 
 from ocp_resources.pod import Pod
 from ocp_resources.namespace import Namespace
+from tests.model_registry.utils import execute_model_registry_get_command
 from utilities.constants import DscComponents
 from tests.model_registry.constants import MODEL_NAME, MODEL_DICT
 from model_registry import ModelRegistry as ModelRegistryClient
@@ -86,7 +87,41 @@ def test_model_registry_operator_env(
         if not namespace_env:
             pytest.fail("Missing environment variable REGISTRIES_NAMESPACE")
 
-    # TODO: Edit a registered model
-    # TODO: Add additional versions for a model
-    # TODO: List all available models
-    # TODO: List all versions of a model
+    def test_model_registry_grpc_container_removal(self, model_registry_deployment_containers: dict[str, Any]):
+        """
+        RHOAIENG-26239: Test to ensure removal of grpc container from model registry deployment
+        Steps:
+            Create metadata database
+            Deploys model registry using the same
+            Check model registry deployment for grpc container. It should not be present
+        """
+
+        for container in model_registry_deployment_containers:
+            if "grpc" in container["name"]:
+                pytest.fail(f"GRPC container found: {container}")
+
+    @pytest.mark.parametrize(
+        "endpoint",
+        [
+            pytest.param(
+                "oauth/healthz",
+            ),
+            pytest.param(
+                "readyz/isDirty",
+            ),
+        ],
+    )
+    def test_model_registry_endpoint_response(
+        self, model_registry_rest_url: str, model_registry_rest_headers: dict[str, str], endpoint: str
+    ):
+        """
+        RHOAIENG-26239: Test to ensure model registry endpoints are responsive
+        Steps:
+            Create metadata database
+            Deploys model registry using the same
+            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
+        )
+        assert output["raw_output"].lower() == "OK".lower()

tests/model_registry/rest_api/conftest.py

@@ -3,12 +3,12 @@
 from kubernetes.dynamic import DynamicClient
 import pytest
 import copy
+
 from tests.model_registry.rest_api.constants import MODEL_REGISTRY_BASE_URI, MODEL_REGISTER_DATA
 from tests.model_registry.rest_api.utils import (
     register_model_rest_api,
     execute_model_registry_patch_command,
 )
-from utilities.constants import Protocols
 from utilities.general import generate_random_name
 from ocp_resources.deployment import Deployment
 from tests.model_registry.utils import (
@@ -40,21 +40,6 @@
 LOGGER = get_logger(name=__name__)
 
 
-@pytest.fixture(scope="class")
-def model_registry_rest_url(model_registry_instance_rest_endpoint: str) -> str:
-    # address and port need to be split in the client instantiation
-    return f"{Protocols.HTTPS}://{model_registry_instance_rest_endpoint}"
-
-
-@pytest.fixture(scope="class")
-def model_registry_rest_headers(current_client_token: str) -> dict[str, str]:
-    return {
-        "Authorization": f"Bearer {current_client_token}",
-        "accept": "application/json",
-        "Content-Type": "application/json",
-    }
-
-
 @pytest.fixture(scope="class")
 def registered_model_rest_api(
     request: pytest.FixtureRequest, model_registry_rest_url: str, model_registry_rest_headers: dict[str, str]

tests/model_registry/rest_api/utils.py

@@ -6,7 +6,6 @@
 from simple_logger.logger import get_logger
 from tests.model_registry.exceptions import (
     ModelRegistryResourceNotCreated,
-    ModelRegistryResourceNotFoundError,
     ModelRegistryResourceNotUpdated,
 )
 from tests.model_registry.rest_api.constants import MODEL_REGISTRY_BASE_URI
@@ -52,21 +51,6 @@ def execute_model_registry_post_command(
         raise
 
 
-def execute_model_registry_get_command(url: str, headers: dict[str, str]) -> dict[Any, Any]:  # skip-unused-code
-    resp = requests.get(url=url, headers=headers, verify=False)
-    LOGGER.info(f"url: {url}, status code: {resp.status_code}, rep: {resp.text}")
-    if resp.status_code not in [200, 201]:
-        raise ModelRegistryResourceNotFoundError(
-            f"Failed to get ModelRegistry resource: {url}, {resp.status_code}: {resp.text}"
-        )
-
-    try:
-        return json.loads(resp.text)
-    except json.JSONDecodeError:
-        LOGGER.error(f"Unable to parse {resp.text}")
-        raise
-
-
 def register_model_rest_api(
     model_registry_rest_url: str,
     model_registry_rest_headers: dict[str, str],

tests/model_registry/utils.py

@@ -1,5 +1,7 @@
+import json
 from typing import Any, List
 
+import requests
 from kubernetes.dynamic import DynamicClient
 from ocp_resources.pod import Pod
 from ocp_resources.service import Service
@@ -9,6 +11,7 @@
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 from kubernetes.dynamic.exceptions import NotFoundError
 from tests.model_registry.constants import MR_DB_IMAGE_DIGEST
+from tests.model_registry.exceptions import ModelRegistryResourceNotFoundError
 from utilities.exceptions import ProtocolNotSupportedError, TooManyServicesError
 from utilities.constants import Protocols, Annotations
 from model_registry import ModelRegistry as ModelRegistryClient
@@ -332,3 +335,30 @@ def get_and_validate_registered_model(
         if getattr(model, attr) != expected
     ]
     return errors
+
+
+def execute_model_registry_get_command(url: str, headers: dict[str, str], json_output: bool = True) -> dict[Any, Any]:
+    """
+    Executes model registry get commands against model registry rest end point
+
+    Args:
+        url (str): Model registry endpoint for rest calls
+        headers (dict[str, str]): HTTP headers for get calls
+        json_output(bool): Whether to output JSON response
+
+    Returns: json output or dict of raw output.
+    """
+    resp = requests.get(url=url, headers=headers, verify=False)
+    LOGGER.info(f"url: {url}, status code: {resp.status_code}, rep: {resp.text}")
+    if resp.status_code not in [200, 201]:
+        raise ModelRegistryResourceNotFoundError(
+            f"Failed to get ModelRegistry resource: {url}, {resp.status_code}: {resp.text}"
+        )
+    if json_output:
+        try:
+            return json.loads(resp.text)
+        except json.JSONDecodeError:
+            LOGGER.error(f"Unable to parse {resp.text}")
+            raise
+    else:
+        return {"raw_output": resp.text}