change 'priority' to 'dispatch priority'

Author: MichaelClifford

src/codeflare_sdk/cluster/cluster.py

@@ -89,12 +89,16 @@ def create_app_wrapper(self):
         instascale = self.config.instascale
         instance_types = self.config.machine_types
         env = self.config.envs
+<<<<<<< HEAD
 <<<<<<< HEAD
         local_interactive = self.config.local_interactive
         image_pull_secrets = self.config.image_pull_secrets
 =======
         priority = self.config.priority
 >>>>>>> 7e7a311 ( add priorities and schedulingSpec to SDK)
+=======
+        dispatch_priority = self.config.dispatch_priority
+>>>>>>> b1d1d16 (change 'priority' to 'dispatch priority')
         return generate_appwrapper(
             name=name,
             namespace=namespace,
@@ -109,12 +113,16 @@ def create_app_wrapper(self):
             instascale=instascale,
             instance_types=instance_types,
             env=env,
+<<<<<<< HEAD
 <<<<<<< HEAD
             local_interactive=local_interactive,
             image_pull_secrets=image_pull_secrets,
 =======
             priority=priority,
 >>>>>>> 7e7a311 ( add priorities and schedulingSpec to SDK)
+=======
+            dispatch_priority=dispatch_priority,
+>>>>>>> b1d1d16 (change 'priority' to 'dispatch priority')
         )
 
     # creates a new cluster with the provided or default spec

src/codeflare_sdk/cluster/config.py

@@ -47,4 +47,4 @@ class ClusterConfiguration:
     image: str = "quay.io/project-codeflare/ray:2.5.0-py38-cu116"
     local_interactive: bool = False
     image_pull_secrets: list = field(default_factory=list)
-
+    dispatch_priority: str = "default"

src/codeflare_sdk/utils/generate_yaml.py

@@ -372,7 +372,7 @@ def generate_appwrapper(
     env,
     local_interactive: bool,
     image_pull_secrets: list,
-    priority: str,
+    dispatch_priority: str,
 ):
     user_yaml = read_template(template)
     appwrapper_name, cluster_name = gen_names(name)
@@ -381,7 +381,7 @@ def generate_appwrapper(
     route_item = resources["resources"].get("GenericItems")[1]
     update_names(user_yaml, item, appwrapper_name, cluster_name, namespace)
     update_labels(user_yaml, instascale, instance_types)
-    update_priority(user_yaml, item, priority)
+    update_priority(user_yaml, item, dispatch_priority)
     update_scheduling_spec(user_yaml, workers)
     update_custompodresources(
         item, min_cpu, max_cpu, min_memory, max_memory, gpu, workers

tests/test-case.yaml

@@ -6,7 +6,7 @@ metadata:
   name: unit-test-cluster
   namespace: ns
 spec:
-  priority: 1
+  priority: 5
   resources:
     GenericItems:
     - custompodresources:
@@ -176,7 +176,7 @@ spec:
                     do echo waiting for myservice; sleep 2; done
                   image: busybox:1.28
                   name: init-myservice
-                priorityClassName: low-priority
+                priorityClassName: default-priority
       replicas: 1
     - generictemplate:
         apiVersion: route.openshift.io/v1

tests/unit_test.py

@@ -228,7 +228,7 @@ def test_config_creation():
         instascale=True,
         machine_types=["cpu.small", "gpu.large"],
         image_pull_secrets=["unit-test-pull-secret"],
-        priority="low",
+        dispatch_priority="default",
     )
 
     assert config.name == "unit-test-cluster" and config.namespace == "ns"
@@ -241,7 +241,7 @@ def test_config_creation():
     assert config.instascale
     assert config.machine_types == ["cpu.small", "gpu.large"]
     assert config.image_pull_secrets == ["unit-test-pull-secret"]
-    assert config.priority == "low"
+    assert config.dispatch_priority == "default"
     return config