Fixed failing unit tests

Signed-off-by: Pat O'Connor <[email protected]>

Author: chipspeak

src/codeflare_sdk/ray/cluster/cluster.py

@@ -21,6 +21,7 @@
 from time import sleep
 from typing import List, Optional, Tuple, Dict
 import copy
+import dataclasses
 
 from ray.job_submission import JobSubmissionClient, JobStatus
 import time
@@ -1059,10 +1060,13 @@ def get_cluster(
     )
     # 1. Prepare RayClusterSpec from ClusterConfiguration
     # Create a temporary config with appwrapper=False to ensure build_ray_cluster returns RayCluster YAML
-    temp_cluster_config_dict = cluster_config.dict(
-        exclude_none=True
-    )  # Assuming Pydantic V1 or similar .dict() method
+    temp_cluster_config_dict = dataclasses.asdict(cluster_config)
+    # Filter out None values similar to exclude_none=True in Pydantic
+    temp_cluster_config_dict = {k: v for k, v in temp_cluster_config_dict.items() if v is not None}
     temp_cluster_config_dict["appwrapper"] = False
+    # Set overwrite_default_resource_mapping=True to avoid conflicts when extended_resource_mapping 
+    # already contains the combined default and custom mappings from the original object
+    temp_cluster_config_dict["overwrite_default_resource_mapping"] = True
     temp_cluster_config_for_spec = ClusterConfiguration(**temp_cluster_config_dict)
     # Ignore the warning here for the lack of a ClusterConfiguration
     with warnings.catch_warnings():

src/codeflare_sdk/ray/rayjobs/test_rayjob.py

@@ -26,8 +26,8 @@ def test_rayjob_submit_success(mocker):
     mock_api_instance = MagicMock()
     mock_api_class.return_value = mock_api_instance
 
-    # Configure the mock to return success when submit is called
-    mock_api_instance.submit.return_value = {"metadata": {"name": "test-rayjob"}}
+    # Configure the mock to return success when submit_job is called
+    mock_api_instance.submit_job.return_value = {"metadata": {"name": "test-rayjob"}}
 
     # Create RayJob instance
     rayjob = RayJob(
@@ -45,8 +45,8 @@ def test_rayjob_submit_success(mocker):
     assert job_id == "test-rayjob"
 
     # Verify the API was called with correct parameters
-    mock_api_instance.submit.assert_called_once()
-    call_args = mock_api_instance.submit.call_args
+    mock_api_instance.submit_job.assert_called_once()
+    call_args = mock_api_instance.submit_job.call_args
 
     # Check the namespace parameter
     assert call_args.kwargs["k8s_namespace"] == "test-namespace"

test.ipynb

@@ -19,6 +19,7 @@ spec:
           controller-tools.k8s.io: '1.0'
           key1: value1
           key2: value2
+          ray.io/cluster: aw-all-params
         name: aw-all-params
         namespace: ns
       spec:
@@ -38,6 +39,7 @@ spec:
           rayStartParams:
             block: 'true'
             dashboard-host: 0.0.0.0
+            dashboard-port: '8265'
             num-gpus: '1'
             resources: '"{\"TPU\": 2}"'
           serviceType: ClusterIP

tests/test_cluster_yamls/appwrapper/unit-test-all-params.yaml

@@ -12,7 +12,8 @@ spec:
       kind: RayCluster
       metadata:
         labels:
-          controller-tools.k8s.io: '1.0'
+          controller-tools.k8s.io: "1.0"
+          ray.io/cluster: unit-test-aw-kueue
         name: unit-test-aw-kueue
         namespace: ns
       spec:
@@ -30,15 +31,19 @@ spec:
         headGroupSpec:
           enableIngress: false
           rayStartParams:
-            block: 'true'
+            block: "true"
             dashboard-host: 0.0.0.0
-            num-gpus: '0'
+            dashboard-port: "8265"
+            num-gpus: "0"
             resources: '"{}"'
           serviceType: ClusterIP
           template:
             spec:
               containers:
-              - image: "${image}"
+              - env:
+                - name: RAY_USAGE_STATS_ENABLED
+                  value: "0"
+                image: quay.io/modh/ray@sha256:6d076aeb38ab3c34a6a2ef0f58dc667089aa15826fa08a73273c629333e12f1e
                 imagePullPolicy: Always
                 lifecycle:
                   preStop:
@@ -75,9 +80,6 @@ spec:
                 - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
                   name: odh-ca-cert
                   subPath: odh-ca-bundle.crt
-                env:
-                - name: RAY_USAGE_STATS_ENABLED
-                  value: '0'
               volumes:
               - configMap:
                   items:
@@ -99,14 +101,17 @@ spec:
           maxReplicas: 2
           minReplicas: 2
           rayStartParams:
-            block: 'true'
-            num-gpus: '0'
+            block: "true"
+            num-gpus: "0"
             resources: '"{}"'
           replicas: 2
           template:
             spec:
               containers:
-              - image: "${image}"
+              - env:
+                - name: RAY_USAGE_STATS_ENABLED
+                  value: "0"
+                image: quay.io/modh/ray@sha256:6d076aeb38ab3c34a6a2ef0f58dc667089aa15826fa08a73273c629333e12f1e
                 imagePullPolicy: Always
                 lifecycle:
                   preStop:
@@ -136,9 +141,6 @@ spec:
                 - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
                   name: odh-ca-cert
                   subPath: odh-ca-bundle.crt
-                env:
-                - name: RAY_USAGE_STATS_ENABLED
-                  value: '0'
               volumes:
               - configMap:
                   items:

tests/test_cluster_yamls/kueue/aw_kueue.yaml

@@ -12,7 +12,8 @@ spec:
       kind: RayCluster
       metadata:
         labels:
-          controller-tools.k8s.io: '1.0'
+          controller-tools.k8s.io: "1.0"
+          ray.io/cluster: unit-test-cluster-kueue
         name: unit-test-cluster-kueue
         namespace: ns
       spec:
@@ -30,15 +31,19 @@ spec:
         headGroupSpec:
           enableIngress: false
           rayStartParams:
-            block: 'true'
+            block: "true"
             dashboard-host: 0.0.0.0
-            num-gpus: '0'
+            dashboard-port: "8265"
+            num-gpus: "0"
             resources: '"{}"'
           serviceType: ClusterIP
           template:
             spec:
               containers:
-              - image: "${image}"
+              - env:
+                - name: RAY_USAGE_STATS_ENABLED
+                  value: "0"
+                image: quay.io/modh/ray@sha256:6d076aeb38ab3c34a6a2ef0f58dc667089aa15826fa08a73273c629333e12f1e
                 imagePullPolicy: Always
                 lifecycle:
                   preStop:
@@ -75,9 +80,6 @@ spec:
                 - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
                   name: odh-ca-cert
                   subPath: odh-ca-bundle.crt
-                env:
-                - name: RAY_USAGE_STATS_ENABLED
-                  value: '0'
               volumes:
               - configMap:
                   items:
@@ -99,14 +101,17 @@ spec:
           maxReplicas: 2
           minReplicas: 2
           rayStartParams:
-            block: 'true'
-            num-gpus: '0'
+            block: "true"
+            num-gpus: "0"
             resources: '"{}"'
           replicas: 2
           template:
             spec:
               containers:
-              - image: "${image}"
+              - env:
+                - name: RAY_USAGE_STATS_ENABLED
+                  value: "0"
+                image: quay.io/modh/ray@sha256:6d076aeb38ab3c34a6a2ef0f58dc667089aa15826fa08a73273c629333e12f1e
                 imagePullPolicy: Always
                 lifecycle:
                   preStop:
@@ -136,9 +141,6 @@ spec:
                 - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
                   name: odh-ca-cert
                   subPath: odh-ca-bundle.crt
-                env:
-                - name: RAY_USAGE_STATS_ENABLED
-                  value: '0'
               volumes:
               - configMap:
                   items: