test: Raw-kserve clusteripnone changes

Signed-off-by: Milind Waykole <mwaykole@mwaykole-thinkpadp1gen4i.bengluru.csb>

Author: Milind Waykole

tests/model_serving/model_server/components/kserve_dsc_deployment_mode/conftest.py

@@ -56,49 +56,14 @@ def patched_default_deployment_mode_in_dsc(
 
 
 @pytest.fixture(scope="class")
-def default_deployment_serviceconfig_in_dsc(
+def patched_default_deployment_serviceconfig_in_dsc(
     request: FixtureRequest,
     default_deployment_mode_in_dsc: DataScienceCluster,
     inferenceservice_config_cm: ConfigMap,
 ) -> Generator[DataScienceCluster, Any, Any]:
-    """
-    Fixture to set the default deployment service configuration in DSC.
-
-    Args:
-        request: Fixture request object
-        default_deployment_mode_in_dsc: DataScienceCluster resource with deployment mode set
-        inferenceservice_config_cm: ConfigMap for inference service configuration
-
-    Yields:
-        DataScienceCluster: The DSC resource with updated service configuration
-    """
     yield from patch_raw_default_deployment_config(
         dsc_resource=default_deployment_mode_in_dsc,
         inferenceservice_config_cm=inferenceservice_config_cm,
-        request_default_deployment_config=request.param["default-deployment-config"],
-    )
-
-
-@pytest.fixture(scope="class")
-def patched_default_deployment_serviceconfig_in_dsc(
-    request: FixtureRequest,
-    default_deployment_serviceconfig_in_dsc: DataScienceCluster,
-    inferenceservice_config_cm: ConfigMap,
-) -> Generator[DataScienceCluster, Any, Any]:
-    """
-    Fixture to patch the default deployment service configuration in DSC.
-
-    Args:
-        request: Fixture request object
-        default_deployment_serviceconfig_in_dsc: DSC resource with initial service configuration
-        inferenceservice_config_cm: ConfigMap for inference service configuration
-
-    Yields:
-        DataScienceCluster: The DSC resource with patched service configuration
-    """
-    yield from patch_raw_default_deployment_config(
-        dsc_resource=default_deployment_serviceconfig_in_dsc,
-        inferenceservice_config_cm=inferenceservice_config_cm,
         request_default_deployment_config=request.param["updated-deployment-config"],
     )
 

tests/model_serving/model_server/components/kserve_dsc_deployment_mode/test_kserve_dsc_default_deployment_mode.py

@@ -11,6 +11,7 @@
     ModelStoragePath,
     ModelVersion,
     Protocols,
+    DscComponents,
 )
 from utilities.inference_utils import Inference
 from utilities.manifests.openvino import OPENVINO_KSERVE_INFERENCE_CONFIG
@@ -184,19 +185,17 @@ def test_default_service_config_is_headless(
         )
 
     @pytest.mark.parametrize(
-        "patched_default_deployment_serviceconfig_in_dsc,default_deployment_serviceconfig_in_dsc",
+        "patched_default_deployment_serviceconfig_in_dsc",
         [
             pytest.param(
-                {"updated-deployment-config": "Headed"},
-                {"default-deployment-config": "Headless"},
+                {"updated-deployment-config": DscComponents.RawDeploymentServiceConfig.HEADED},
             )
         ],
         indirect=True,
     )
     def test_service_config_can_be_updated_to_headed(
         self,
         default_deployment_mode_in_dsc,
-        default_deployment_serviceconfig_in_dsc,
         patched_default_deployment_serviceconfig_in_dsc,
         ovms_inference_service,
         admin_client,

tests/model_serving/model_server/components/kserve_dsc_deployment_mode/utils.py

@@ -8,7 +8,9 @@
 from timeout_sampler import TimeoutSampler
 
 from kubernetes.dynamic import DynamicClient
-from utilities.constants import Timeout
+from utilities.constants import Timeout, DscComponents
+from pytest_testconfig import config as py_config
+from kubernetes.dynamic.exceptions import ResourceNotFoundError
 
 LOGGER = get_logger(name=__name__)
 
@@ -82,21 +84,18 @@ def wait_for_service_config_in_cm(config_map: ConfigMap, service_config: str) ->
         TimeoutExpiredError: If service config value is not set in configmap
     """
     LOGGER.info(f"Waiting for {service_config} service config to be set in {config_map.name} configmap")
-    expected_value = service_config == "Headless"
+    expected_value = service_config == DscComponents.RawDeploymentServiceConfig.HEADLESS
     for sample in TimeoutSampler(
         wait_timeout=Timeout.TIMEOUT_5MIN,
         sleep=5,
         func=lambda: config_map.instance.data,
     ):
         if sample:
-            try:
-                cm_service_config = json.loads(sample.service)["serviceClusterIPNone"]
-                if cm_service_config == expected_value:
-                    LOGGER.info(f"Service config successfully set to {service_config}")
-                    break
-            except (KeyError, json.JSONDecodeError) as e:
-                LOGGER.warning(f"Error reading service config: {e}")
-                continue
+            service_data = json.loads(sample.get("service", "{}"))
+            cm_service_config = service_data.get("serviceClusterIPNone")
+            if cm_service_config == expected_value:
+                LOGGER.info(f"Service config successfully set to {service_config}")
+                break
 
 
 def patch_raw_default_deployment_config(
@@ -137,17 +136,20 @@ def get_service_cluster_ip(admin_client: DynamicClient) -> bool:
     Get the service cluster IP configuration from the inferenceservice-config configmap.
 
     Args:
-        admin_client: Admin client for accessing the cluster
+        admin_client (DynamicClient): Admin client for accessing the cluster
 
     Returns:
-        dict: Service configuration from the configmap
+        bool: True if service is Headless (serviceClusterIPNone=True), False if Headed
 
     Raises:
-        ValueError: If the configmap or service configuration cannot be read
+        ResourceNotFoundError: If the configmap or service configuration cannot be read
     """
     try:
-        config_map = ConfigMap(client=admin_client, namespace="redhat-ods-applications", name="inferenceservice-config")
-        config_map = json.loads(config_map.instance["data"]["service"])
-        return config_map["serviceClusterIPNone"]
+        config_map = ConfigMap(
+            client=admin_client, namespace=py_config["applications_namespace"], name="inferenceservice-config"
+        )
+        service_data = json.loads(config_map.instance.get("data", {}).get("service", "{}"))
+        service_cluster_ip = service_data.get("serviceClusterIPNone")
+        return service_cluster_ip
     except (KeyError, json.JSONDecodeError) as e:
-        raise ValueError(f"Failed to read service configuration: {e}")
+        raise ResourceNotFoundError(f"Failed to read service configuration: {e} from inferenceservice-config")

utilities/constants.py

@@ -163,6 +163,10 @@ class ConditionType:
         MODELREGISTRY: ConditionType.MODEL_REGISTRY_READY,
     }
 
+    class RawDeploymentServiceConfig:
+        HEADLESS = "Headless"
+        HEADED = "Headed"
+
 
 class Labels:
     class OpenDataHub:
@@ -227,7 +231,8 @@ class Buckets:
 
     class PodConfig:
         KSERVE_MINIO_IMAGE: str = (
-            "quay.io/jooholee/model-minio@sha256:b50aa0fbfea740debb314ece8e925b3e8e761979f345b6cd12a6833efd04e2c2"  # noqa: E501
+            "quay.io/jooholee/model-minio@sha256:b50aa0fbfea740debb314ece8e925b3e8e761979f345b6cd12a6833efd04e2c2"
+            # noqa: E501
         )
 
         MINIO_BASE_CONFIG: dict[str, Any] = {