fixed suggestions

Author: Raghul-M

tests/model_serving/model_runtime/image_validation/conftest.py

@@ -7,24 +7,18 @@
 """
 
 from collections.abc import Generator
-from contextlib import contextmanager
 from typing import Any
 
 import pytest
 from kubernetes.dynamic import DynamicClient
-from kubernetes.dynamic.exceptions import ResourceNotFoundError
-from ocp_resources.inference_service import InferenceService
 from ocp_resources.namespace import Namespace
 from ocp_resources.pod import Pod
 from timeout_sampler import TimeoutSampler
 
-from tests.model_serving.model_runtime.image_validation.constant import (
-    PLACEHOLDER_STORAGE_URI,
-    POD_WAIT_TIMEOUT,
-)
-from utilities.constants import KServeDeploymentType, Timeout
+from tests.model_serving.model_runtime.image_validation.constant import PLACEHOLDER_STORAGE_URI
+from utilities.constants import KServeDeploymentType
 from utilities.inference_utils import create_isvc
-from utilities.infra import create_ns, get_pods_by_isvc_label
+from utilities.infra import create_ns, wait_for_isvc_pods
 from utilities.serving_runtime import ServingRuntimeFromTemplate
 
 
@@ -60,36 +54,11 @@ def serving_runtime_pods_for_runtime(
     runtime_name = f"{name_slug}-runtime"
     isvc_name = f"{name_slug}-isvc"
 
-    with _serving_runtime_and_isvc(
-        admin_client=admin_client,
-        namespace_name=namespace_name,
-        runtime_name=runtime_name,
-        isvc_name=isvc_name,
-        template_name=config["template"],
-    ) as isvc:
-        pods = _wait_for_isvc_pods(
-            client=admin_client,
-            isvc=isvc,
-            runtime_name=runtime_name,
-            timeout=POD_WAIT_TIMEOUT,
-        )
-        yield (pods, display_name)
-
-
-@contextmanager
-def _serving_runtime_and_isvc(
-    admin_client: DynamicClient,
-    namespace_name: str,
-    runtime_name: str,
-    isvc_name: str,
-    template_name: str,
-) -> Generator[InferenceService, Any, Any]:
-    """Create ServingRuntime from template and minimal InferenceService; yield ISVC."""
     with ServingRuntimeFromTemplate(
         client=admin_client,
         name=runtime_name,
         namespace=namespace_name,
-        template_name=template_name,
+        template_name=config["template"],
         deployment_type="raw",
     ) as serving_runtime:
         # Get model format from the runtime for the InferenceService spec.
@@ -104,34 +73,18 @@ def _serving_runtime_and_isvc(
             deployment_mode=KServeDeploymentType.RAW_DEPLOYMENT,
             wait=False,
             wait_for_predictor_pods=False,
-            timeout=Timeout.TIMEOUT_2MIN,
+            timeout=120,
             teardown=True,
         ) as isvc:
-            yield isvc
-
-
-def _wait_for_isvc_pods(
-    client: DynamicClient,
-    isvc: InferenceService,
-    runtime_name: str,
-    timeout: int,
-) -> list[Pod]:
-    """Wait until at least one pod exists for the InferenceService; return list of pods."""
-
-    def _get_pods() -> list[Pod] | None:
-        try:
-            return get_pods_by_isvc_label(
-                client=client,
+            # Wait for pods to be created (300 seconds timeout)
+            for pods in TimeoutSampler(
+                wait_timeout=300,
+                sleep=5,
+                func=wait_for_isvc_pods,
+                client=admin_client,
                 isvc=isvc,
                 runtime_name=runtime_name,
-            )
-        except ResourceNotFoundError:
-            return None
-
-    for pods in TimeoutSampler(
-        wait_timeout=timeout,
-        sleep=5,
-        func=_get_pods,
-    ):
-        if pods:
-            return pods
+            ):
+                if pods:
+                    yield (pods, display_name)
+                    return

tests/model_serving/model_runtime/image_validation/constant.py

@@ -1,14 +1,11 @@
 """Constants for serving runtime image validation tests."""
 
-from utilities.constants import RuntimeTemplates, Timeout
+from utilities.constants import RuntimeTemplates
 
 # Placeholder storage URI so the controller creates Deployment/Pod with runtime image.
 # No actual model or inference is required; pod phase does not need to be Ready.
 PLACEHOLDER_STORAGE_URI = "s3://dummy-bucket/dummy/"
 
-# Time to wait for at least one pod to be created for the InferenceService.
-POD_WAIT_TIMEOUT = Timeout.TIMEOUT_5MIN
-
 # Runtime configs: display name (for "name : passed") and template name.
 # For each we create ServingRuntime + InferenceService, wait for pod(s), validate, then teardown.
 RUNTIME_CONFIGS = [