[Subnet Prioritization] Set SingleAvailabilityZone as null if EnableSingleAvailabilityZone is not provided

Signed-off-by: Hanxuan Zhang <[email protected]>

Author: Allenz5

cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/pcluster_fleet_config_generator.py

@@ -99,7 +99,9 @@ def generate_fleet_config_file(output_file: str, input_file: str):
                     queue_capacity_reservation=queue_capacity_reservation,
                     queue_capacity_type=queue_capacity_type,
                     queue_subnets=queue_config["Networking"]["SubnetIds"],
-                    queue_single_availability_zone=queue_config["Networking"]["EnableSingleAvailabilityZone"],
+                    queue_single_availability_zone=queue_config.get("Networking", {}).get(
+                        "EnableSingleAvailabilityZone", None
+                    ),
                 )
                 fleet_config[queue_name][compute_resource_name] = config_for_fleet
 

test/unit/slurm/test_fleet_config_generator.py

@@ -60,7 +60,7 @@
                 }
             },
             CriticalError,
-            "Unable to find key 'EnableSingleAvailabilityZone' in the configuration file. Queue: q1",
+            "Unable to find key 'Name' in the configuration file. Queue: q1",
         ),
         (
             {
@@ -239,8 +239,8 @@
                     ]
                 }
             },
-            CriticalError,
-            "Unable to find key 'EnableSingleAvailabilityZone' in the configuration file. Queue: q1",
+            None,
+            None,
         ),
         (
             {

test/unit/slurm/test_fleet_config_generator/test_generate_fleet_config_file/sample_input.yaml

@@ -253,7 +253,6 @@ Scheduling:
       SecurityGroups: null
       SubnetIds:
         - subnet-0230367ab0e5123a4
-      EnableSingleAvailabilityZone: null
   SlurmSettings:
     Dns:
       DisableManagedDns: false