Merge remote-tracking branch 'upstream/main' into cp_maria

Author: dbasunag

pyproject.toml

@@ -50,7 +50,6 @@ dependencies = [
     "pyyaml",
     "tenacity",
     "types-requests>=2.32.0.20241016",
-    "schemathesis>=4.0.0a8",
     "requests",
     "pytest-asyncio",
     "syrupy",

schemathesis.toml

@@ -9,7 +9,7 @@
 LOGGER = get_logger(name=__name__)
 
 
-def get_lmevaljob_pod(client: DynamicClient, lmevaljob: LMEvalJob, timeout: int = Timeout.TIMEOUT_2MIN) -> Pod:
+def get_lmevaljob_pod(client: DynamicClient, lmevaljob: LMEvalJob, timeout: int = Timeout.TIMEOUT_10MIN) -> Pod:
     """
     Gets the pod corresponding to a given LMEvalJob and waits for it to be ready.
 

tests/model_explainability/lm_eval/utils.py

@@ -197,7 +197,6 @@ def test_validate_trustyai_service_image(
     indirect=True,
 )
 @pytest.mark.usefixtures("minio_pod")
-@pytest.mark.smoke
 def test_trustyai_service_db_migration(
     admin_client,
     current_client_token,

tests/model_explainability/trustyai_service/service/test_trustyai_service.py

@@ -38,7 +38,7 @@ def wait_for_mariadb_operator_deployments(mariadb_operator: MariadbOperator) ->
         deployment.wait_for_replicas()
 
 
-def wait_for_mariadb_pods(client: DynamicClient, mariadb: MariaDB, timeout: int = Timeout.TIMEOUT_5MIN) -> None:
+def wait_for_mariadb_pods(client: DynamicClient, mariadb: MariaDB, timeout: int = Timeout.TIMEOUT_15MIN) -> None:
     def _get_mariadb_pods() -> list[Pod]:
         _pods = [
             _pod

tests/model_explainability/trustyai_service/utils.py

@@ -1,7 +1,5 @@
-import os
 import pytest
 from pytest import Config
-import schemathesis
 from typing import Generator, Any
 
 from ocp_resources.infrastructure import Infrastructure
@@ -14,10 +12,6 @@
 from ocp_resources.deployment import Deployment
 
 from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
-from schemathesis.specs.openapi.schemas import BaseOpenAPISchema
-from schemathesis.generation.stateful.state_machine import APIStateMachine
-from schemathesis.core.transport import Response
-from schemathesis.generation.case import Case
 from ocp_resources.resource import ResourceEditor
 
 from pytest import FixtureRequest
@@ -279,43 +273,6 @@ def model_registry_instance_rest_endpoint(admin_client: DynamicClient, model_reg
     )
 
 
-@pytest.fixture(scope="class")
-def generated_schema(pytestconfig: Config, model_registry_instance_rest_endpoint: str) -> BaseOpenAPISchema:
-    os.environ["API_HOST"] = model_registry_instance_rest_endpoint
-    config = schemathesis.config.SchemathesisConfig.from_path(f"{pytestconfig.rootpath}/schemathesis.toml")
-    schema = schemathesis.openapi.from_url(
-        url="https://raw.githubusercontent.com/kubeflow/model-registry/main/api/openapi/model-registry.yaml",
-        config=config,
-    )
-    return schema
-
-
-@pytest.fixture()
-def state_machine(generated_schema: BaseOpenAPISchema, current_client_token: str) -> APIStateMachine:
-    BaseAPIWorkflow = generated_schema.as_state_machine()
-
-    class APIWorkflow(BaseAPIWorkflow):  # type: ignore
-        headers: dict[str, str]
-
-        def setup(self) -> None:
-            self.headers = {"Authorization": f"Bearer {current_client_token}", "Content-Type": "application/json"}
-
-        def before_call(self, case: Case) -> None:
-            LOGGER.info(f"Checking: {case.method} {case.path}")
-
-        # these kwargs are passed to requests.request()
-        def get_call_kwargs(self, case: Case) -> dict[str, Any]:
-            return {"verify": False, "headers": self.headers}
-
-        def after_call(self, response: Response, case: Case) -> None:
-            LOGGER.info(
-                f"Method tested: {case.method}, API: {case.path}, response code:{response.status_code},"
-                f" Full Response:{response.text}"
-            )
-
-    return APIWorkflow
-
-
 @pytest.fixture(scope="class")
 def updated_dsc_component_state_scope_class(
     pytestconfig: Config,

tests/model_registry/conftest.py

@@ -359,6 +359,8 @@ def ovms_kserve_inference_service(
     if (scale_target := request.param.get("scale-target")) is not None:
         isvc_kwargs["scale_target"] = scale_target
 
+    isvc_kwargs["stop_resume"] = request.param.get("stop", False)
+
     with create_isvc(**isvc_kwargs) as isvc:
         yield isvc
 
@@ -382,6 +384,7 @@ def ovms_raw_inference_service(
         model_format=ModelAndFormat.OPENVINO_IR,
         deployment_mode=KServeDeploymentType.RAW_DEPLOYMENT,
         model_version=request.param["model-version"],
+        stop_resume=request.param.get("stop", False),
     ) as isvc:
         yield isvc
 

tests/model_registry/test_rest_api.py

@@ -61,7 +61,7 @@ def test_serverless_before_scale_to_zero(self, ovms_kserve_inference_service):
     @pytest.mark.dependency(name=NO_PODS_AFTER_SCALE_TEST_NAME)
     def test_no_serverless_pods_after_scale_to_zero(self, unprivileged_client, inference_service_patched_replicas):
         """Verify pods are scaled to zero"""
-        verify_no_inference_pods(client=unprivileged_client, isvc=inference_service_patched_replicas)
+        assert verify_no_inference_pods(client=unprivileged_client, isvc=inference_service_patched_replicas)
 
     @pytest.mark.dependency(
         name=INFERENCE_AFTER_SCALE_TEST_NAME,
@@ -84,7 +84,7 @@ def test_serverless_inference_after_scale_to_zero(self, inference_service_patche
     @pytest.mark.order(4)
     def test_no_serverless_pods_when_no_traffic(self, unprivileged_client, inference_service_patched_replicas):
         """Verify pods are scaled to zero when no traffic is sent"""
-        verify_no_inference_pods(client=unprivileged_client, isvc=inference_service_patched_replicas)
+        assert verify_no_inference_pods(client=unprivileged_client, isvc=inference_service_patched_replicas)
 
     @pytest.mark.parametrize(
         "inference_service_patched_replicas",