Rename InstanceTypeLIst to Instances

Signed-off-by: Luca Carrogu <[email protected]>

Author: lukeseawalker

src/slurm_plugin/fleet_manager.py

@@ -270,7 +270,7 @@ def _evaluate_launch_params(self, count):
                     },
                 }
 
-            for instance_type in self._compute_resource_config["InstanceTypeList"]:
+            for instance_type in self._compute_resource_config["Instances"]:
                 override = copy.deepcopy(queue_overrides)
                 override["InstanceType"] = instance_type["InstanceType"]
                 template_overrides.append(override)

tests/common.py

@@ -32,32 +32,32 @@ def client_error(error_code):
 
 
 FLEET_CONFIG = {
-    "queue": {"c5xlarge": {"Api": "run-instances", "InstanceTypeList": [{"InstanceType": "c5.xlarge"}]}},
+    "queue": {"c5xlarge": {"Api": "run-instances", "Instances": [{"InstanceType": "c5.xlarge"}]}},
     "queue1": {
-        "c5xlarge": {"Api": "run-instances", "InstanceTypeList": [{"InstanceType": "c5.xlarge"}]},
-        "c52xlarge": {"Api": "run-instances", "InstanceTypeList": [{"InstanceType": "c5.2xlarge"}]},
-        "p4d24xlarge": {"Api": "run-instances", "InstanceTypeList": [{"InstanceType": "p4d.24xlarge"}]},
+        "c5xlarge": {"Api": "run-instances", "Instances": [{"InstanceType": "c5.xlarge"}]},
+        "c52xlarge": {"Api": "run-instances", "Instances": [{"InstanceType": "c5.2xlarge"}]},
+        "p4d24xlarge": {"Api": "run-instances", "Instances": [{"InstanceType": "p4d.24xlarge"}]},
         "fleet-spot": {
             "Api": "create-fleet",
-            "InstanceTypeList": [{"InstanceType": "t2.medium"}, {"InstanceType": "t2.large"}],
+            "Instances": [{"InstanceType": "t2.medium"}, {"InstanceType": "t2.large"}],
             "MaxPrice": 10,
             "AllocationStrategy": "capacity-optimized",
             "CapacityType": "spot",
         },
     },
     "queue2": {
-        "c5xlarge": {"Api": "run-instances", "InstanceTypeList": [{"InstanceType": "c5.xlarge"}]},
+        "c5xlarge": {"Api": "run-instances", "Instances": [{"InstanceType": "c5.xlarge"}]},
         "fleet-ondemand": {
             "Api": "create-fleet",
-            "InstanceTypeList": [{"InstanceType": "t2.medium"}, {"InstanceType": "t2.large"}],
+            "Instances": [{"InstanceType": "t2.medium"}, {"InstanceType": "t2.large"}],
             "AllocationStrategy": "lowest-price",
             "CapacityType": "on-demand",
         },
     },
     "queue3": {
-        "c5xlarge": {"Api": "run-instances", "InstanceTypeList": [{"InstanceType": "c5.xlarge"}]},
-        "c52xlarge": {"Api": "run-instances", "InstanceTypeList": [{"InstanceType": "c5.2xlarge"}]},
-        "p4d24xlarge": {"Api": "run-instances", "InstanceTypeList": [{"InstanceType": "p4d.24xlarge"}]},
+        "c5xlarge": {"Api": "run-instances", "Instances": [{"InstanceType": "c5.xlarge"}]},
+        "c52xlarge": {"Api": "run-instances", "Instances": [{"InstanceType": "c5.2xlarge"}]},
+        "p4d24xlarge": {"Api": "run-instances", "Instances": [{"InstanceType": "p4d.24xlarge"}]},
     },
 }