Fixing tests

efim-a-efim · efim-a-efim · commit 82a43e2180fc · 2025-09-04T15:24:28.000Z
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_efa_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_efa_partition.conf
@@ -1,7 +1,7 @@
 # This file is automatically generated by pcluster
 
-NodeName=efa-st-efa-c5n-[1-1] CPUs=36 RealMemory=186777 State=CLOUD Feature=static,c5n.18xlarge,efa-c5n,efa Weight=1
-NodeName=efa-dy-efa-c5n-[1-4] CPUs=36 RealMemory=186777 State=CLOUD Feature=dynamic,c5n.18xlarge,efa-c5n,efa Weight=1000
+NodeName=efa-st-efa-c5n-[1-1] CPUs=36 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,efa,efa-c5n,static Weight=1
+NodeName=efa-dy-efa-c5n-[1-4] CPUs=36 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,dynamic,efa,efa-c5n Weight=1000
 
 NodeSet=efa_nodes Nodes=efa-st-efa-c5n-[1-1],efa-dy-efa-c5n-[1-4]
 PartitionName=efa Nodes=efa_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_efa_partition_mem_sched.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_efa_partition_mem_sched.conf
@@ -1,7 +1,7 @@
 # This file is automatically generated by pcluster
 
-NodeName=efa-st-efa-c5n-[1-1] CPUs=36 RealMemory=176947 State=CLOUD Feature=static,c5n.18xlarge,efa-c5n,efa Weight=1
-NodeName=efa-dy-efa-c5n-[1-4] CPUs=36 RealMemory=176947 State=CLOUD Feature=dynamic,c5n.18xlarge,efa-c5n,efa Weight=1000
+NodeName=efa-st-efa-c5n-[1-1] CPUs=36 RealMemory=176947 State=CLOUD Feature=c5n.18xlarge,efa,efa-c5n,static Weight=1
+NodeName=efa-dy-efa-c5n-[1-4] CPUs=36 RealMemory=176947 State=CLOUD Feature=c5n.18xlarge,dynamic,efa,efa-c5n Weight=1000
 
 NodeSet=efa_nodes Nodes=efa-st-efa-c5n-[1-1],efa-dy-efa-c5n-[1-4]
 PartitionName=efa Nodes=efa_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=16 RealMemory=237363 State=CLOUD Feature=static,g3.8xlarge,gpu-g38xlarge,gpu Weight=1 Gres=gpu:m60:2
-NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=16 RealMemory=237363 State=CLOUD Feature=dynamic,g3.8xlarge,gpu-g38xlarge,gpu Weight=1000 Gres=gpu:m60:2
-NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=48 RealMemory=747110 State=CLOUD Feature=dynamic,p3dn.24xlarge,gpu-p3dn24xlarge,gpu Weight=1000 Gres=gpu:v100:8
+NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=16 RealMemory=237363 State=CLOUD Feature=g3.8xlarge,gpu,gpu-g38xlarge,static Weight=1 Gres=gpu:m60:2
+NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=16 RealMemory=237363 State=CLOUD Feature=dynamic,g3.8xlarge,gpu,gpu-g38xlarge Weight=1000 Gres=gpu:m60:2
+NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=48 RealMemory=747110 State=CLOUD Feature=dynamic,gpu,gpu-p3dn24xlarge,p3dn.24xlarge Weight=1000 Gres=gpu:v100:8
 
 NodeSet=gpu_nodes Nodes=gpu-st-gpu-g38xlarge-[1-1],gpu-dy-gpu-g38xlarge-[1-4],gpu-dy-gpu-p3dn24xlarge-[1-10]
 PartitionName=gpu Nodes=gpu_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition_mem_sched.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition_mem_sched.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=16 RealMemory=248000 State=CLOUD Feature=static,g3.8xlarge,gpu-g38xlarge,gpu Weight=1 Gres=gpu:m60:2
-NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=16 RealMemory=248000 State=CLOUD Feature=dynamic,g3.8xlarge,gpu-g38xlarge,gpu Weight=1000 Gres=gpu:m60:2
-NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=48 RealMemory=707788 State=CLOUD Feature=dynamic,p3dn.24xlarge,gpu-p3dn24xlarge,gpu Weight=1000 Gres=gpu:v100:8
+NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=16 RealMemory=248000 State=CLOUD Feature=g3.8xlarge,gpu,gpu-g38xlarge,static Weight=1 Gres=gpu:m60:2
+NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=16 RealMemory=248000 State=CLOUD Feature=dynamic,g3.8xlarge,gpu,gpu-g38xlarge Weight=1000 Gres=gpu:m60:2
+NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=48 RealMemory=707788 State=CLOUD Feature=dynamic,gpu,gpu-p3dn24xlarge,p3dn.24xlarge Weight=1000 Gres=gpu:v100:8
 
 NodeSet=gpu_nodes Nodes=gpu-st-gpu-g38xlarge-[1-1],gpu-dy-gpu-g38xlarge-[1-4],gpu-dy-gpu-p3dn24xlarge-[1-10]
 PartitionName=gpu Nodes=gpu_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_multiple_spot_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_multiple_spot_partition.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=multiple_spot-st-multiplespot-1-[1-5] CPUs=2 RealMemory=7296 State=CLOUD Feature=static,c4.xlarge,multiplespot-1 Weight=1
-NodeName=multiple_spot-dy-multiplespot-1-[1-5] CPUs=2 RealMemory=7296 State=CLOUD Feature=dynamic,c4.xlarge,multiplespot-1 Weight=1000
-NodeName=multiple_spot-st-multiplespot-2-[1-5] CPUs=4 RealMemory=15564 State=CLOUD Feature=static,c5.2xlarge,multiplespot-2 Weight=1
+NodeName=multiple_spot-st-multiplespot-1-[1-5] CPUs=2 RealMemory=7296 State=CLOUD Feature=c4.xlarge,multiplespot-1,static Weight=1
+NodeName=multiple_spot-dy-multiplespot-1-[1-5] CPUs=2 RealMemory=7296 State=CLOUD Feature=c4.xlarge,dynamic,multiplespot-1 Weight=1000
+NodeName=multiple_spot-st-multiplespot-2-[1-5] CPUs=4 RealMemory=15564 State=CLOUD Feature=c5.2xlarge,multiplespot-2,static Weight=1
 
 NodeSet=multiple_spot_nodes Nodes=multiple_spot-st-multiplespot-1-[1-5],multiple_spot-dy-multiplespot-1-[1-5],multiple_spot-st-multiplespot-2-[1-5]
 PartitionName=multiple_spot Nodes=multiple_spot_nodes MaxTime=INFINITE State=UP Default=YES
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_multiple_spot_partition_mem_sched.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_memory_scheduling/expected_outputs/pcluster/slurm_parallelcluster_multiple_spot_partition_mem_sched.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=multiple_spot-st-multiplespot-1-[1-5] CPUs=2 RealMemory=6912 State=CLOUD Feature=static,c4.xlarge,multiplespot-1 Weight=1
-NodeName=multiple_spot-dy-multiplespot-1-[1-5] CPUs=2 RealMemory=6912 State=CLOUD Feature=dynamic,c4.xlarge,multiplespot-1 Weight=1000
-NodeName=multiple_spot-st-multiplespot-2-[1-5] CPUs=4 RealMemory=13000 State=CLOUD Feature=static,c5.2xlarge,multiplespot-2 Weight=1
+NodeName=multiple_spot-st-multiplespot-1-[1-5] CPUs=2 RealMemory=6912 State=CLOUD Feature=c4.xlarge,multiplespot-1,static Weight=1
+NodeName=multiple_spot-dy-multiplespot-1-[1-5] CPUs=2 RealMemory=6912 State=CLOUD Feature=c4.xlarge,dynamic,multiplespot-1 Weight=1000
+NodeName=multiple_spot-st-multiplespot-2-[1-5] CPUs=4 RealMemory=13000 State=CLOUD Feature=c5.2xlarge,multiplespot-2,static Weight=1
 
 NodeSet=multiple_spot_nodes Nodes=multiple_spot-st-multiplespot-1-[1-5],multiple_spot-dy-multiplespot-1-[1-5],multiple_spot-st-multiplespot-2-[1-5]
 PartitionName=multiple_spot Nodes=multiple_spot_nodes MaxTime=INFINITE State=UP Default=YES
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_nogpu/expected_outputs/pcluster/slurm_parallelcluster_efa_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_nogpu/expected_outputs/pcluster/slurm_parallelcluster_efa_partition.conf
@@ -1,7 +1,7 @@
 # This file is automatically generated by pcluster
 
-NodeName=efa-st-efa-c5n-[1-1] CPUs=36 RealMemory=186777 State=CLOUD Feature=static,c5n.18xlarge,efa-c5n,efa Weight=1
-NodeName=efa-dy-efa-c5n-[1-4] CPUs=36 RealMemory=186777 State=CLOUD Feature=dynamic,c5n.18xlarge,efa-c5n,efa Weight=1000
+NodeName=efa-st-efa-c5n-[1-1] CPUs=36 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,efa,efa-c5n,static Weight=1
+NodeName=efa-dy-efa-c5n-[1-4] CPUs=36 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,dynamic,efa,efa-c5n Weight=1000
 
 NodeSet=efa_nodes Nodes=efa-st-efa-c5n-[1-1],efa-dy-efa-c5n-[1-4]
 PartitionName=efa Nodes=efa_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_nogpu/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_nogpu/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=16 RealMemory=237363 State=CLOUD Feature=static,g3.8xlarge,gpu-g38xlarge,gpu Weight=1 Gres=gpu:m60:2
-NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=16 RealMemory=237363 State=CLOUD Feature=dynamic,g3.8xlarge,gpu-g38xlarge,gpu Weight=1000 Gres=gpu:m60:2
-NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=48 RealMemory=747110 State=CLOUD Feature=dynamic,p3dn.24xlarge,gpu-p3dn24xlarge,gpu Weight=1000 Gres=gpu:v100:8
+NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=16 RealMemory=237363 State=CLOUD Feature=g3.8xlarge,gpu,gpu-g38xlarge,static Weight=1 Gres=gpu:m60:2
+NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=16 RealMemory=237363 State=CLOUD Feature=dynamic,g3.8xlarge,gpu,gpu-g38xlarge Weight=1000 Gres=gpu:m60:2
+NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=48 RealMemory=747110 State=CLOUD Feature=dynamic,gpu,gpu-p3dn24xlarge,p3dn.24xlarge Weight=1000 Gres=gpu:v100:8
 
 NodeSet=gpu_nodes Nodes=gpu-st-gpu-g38xlarge-[1-1],gpu-dy-gpu-g38xlarge-[1-4],gpu-dy-gpu-p3dn24xlarge-[1-10]
 PartitionName=gpu Nodes=gpu_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_nogpu/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition_no_gpu.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_nogpu/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition_no_gpu.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=16 RealMemory=237363 State=CLOUD Feature=static,g3.8xlarge,gpu-g38xlarge,gpu Weight=1
-NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=16 RealMemory=237363 State=CLOUD Feature=dynamic,g3.8xlarge,gpu-g38xlarge,gpu Weight=1000
-NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=48 RealMemory=747110 State=CLOUD Feature=dynamic,p3dn.24xlarge,gpu-p3dn24xlarge,gpu Weight=1000
+NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=16 RealMemory=237363 State=CLOUD Feature=g3.8xlarge,gpu,gpu-g38xlarge,static Weight=1
+NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=16 RealMemory=237363 State=CLOUD Feature=dynamic,g3.8xlarge,gpu,gpu-g38xlarge Weight=1000
+NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=48 RealMemory=747110 State=CLOUD Feature=dynamic,gpu,gpu-p3dn24xlarge,p3dn.24xlarge Weight=1000
 
 NodeSet=gpu_nodes Nodes=gpu-st-gpu-g38xlarge-[1-1],gpu-dy-gpu-g38xlarge-[1-4],gpu-dy-gpu-p3dn24xlarge-[1-10]
 PartitionName=gpu Nodes=gpu_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_nogpu/expected_outputs/pcluster/slurm_parallelcluster_multiple_spot_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_nogpu/expected_outputs/pcluster/slurm_parallelcluster_multiple_spot_partition.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=multiple_spot-st-multiplespot-1-[1-5] CPUs=2 RealMemory=7296 State=CLOUD Feature=static,c4.xlarge,multiplespot-1 Weight=1
-NodeName=multiple_spot-dy-multiplespot-1-[1-5] CPUs=2 RealMemory=7296 State=CLOUD Feature=dynamic,c4.xlarge,multiplespot-1 Weight=1000
-NodeName=multiple_spot-st-multiplespot-2-[1-5] CPUs=4 RealMemory=15564 State=CLOUD Feature=static,c5.2xlarge,multiplespot-2 Weight=1
+NodeName=multiple_spot-st-multiplespot-1-[1-5] CPUs=2 RealMemory=7296 State=CLOUD Feature=c4.xlarge,multiplespot-1,static Weight=1
+NodeName=multiple_spot-dy-multiplespot-1-[1-5] CPUs=2 RealMemory=7296 State=CLOUD Feature=c4.xlarge,dynamic,multiplespot-1 Weight=1000
+NodeName=multiple_spot-st-multiplespot-2-[1-5] CPUs=4 RealMemory=15564 State=CLOUD Feature=c5.2xlarge,multiplespot-2,static Weight=1
 
 NodeSet=multiple_spot_nodes Nodes=multiple_spot-st-multiplespot-1-[1-5],multiple_spot-dy-multiplespot-1-[1-5],multiple_spot-st-multiplespot-2-[1-5]
 PartitionName=multiple_spot Nodes=multiple_spot_nodes MaxTime=INFINITE State=UP Default=YES
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/expected_outputs/pcluster/slurm_parallelcluster_efa_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/expected_outputs/pcluster/slurm_parallelcluster_efa_partition.conf
@@ -1,7 +1,7 @@
 # This file is automatically generated by pcluster
 
-NodeName=efa-st-efa-c5n-[1-1] CPUs=36 RealMemory=186777 State=CLOUD Feature=static,c5n.18xlarge,efa-c5n,efa Weight=1 CustomEfaComputeParam=unique_efa_compute_value OtherEfaComputeParam=second_efa_compute_value
-NodeName=efa-dy-efa-c5n-[1-4] CPUs=36 RealMemory=186777 State=CLOUD Feature=dynamic,c5n.18xlarge,efa-c5n,efa Weight=1000 CustomEfaComputeParam=unique_efa_compute_value OtherEfaComputeParam=second_efa_compute_value
+NodeName=efa-st-efa-c5n-[1-1] CPUs=36 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,efa,efa-c5n,static Weight=1 CustomEfaComputeParam=unique_efa_compute_value OtherEfaComputeParam=second_efa_compute_value
+NodeName=efa-dy-efa-c5n-[1-4] CPUs=36 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,dynamic,efa,efa-c5n Weight=1000 CustomEfaComputeParam=unique_efa_compute_value OtherEfaComputeParam=second_efa_compute_value
 
 NodeSet=efa_nodes Nodes=efa-st-efa-c5n-[1-1],efa-dy-efa-c5n-[1-4]
 PartitionName=efa Nodes=efa_nodes MaxTime=INFINITE State=UP CustomEfaParam=unique_efa_value OtherEfaParam=second_efa_value
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/expected_outputs/pcluster/slurm_parallelcluster_gpu_partition.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=32 RealMemory=237363 State=CLOUD Feature=static,g3.8xlarge,gpu-g38xlarge,gpu Weight=1 Gres=gpu:m60:2 CustomNvidiaParam=nvidia_setting CustomAmdParam=amd_setting CustomIntelParam=intel_setting
-NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=32 RealMemory=237363 State=CLOUD Feature=dynamic,g3.8xlarge,gpu-g38xlarge,gpu Weight=1000 Gres=gpu:m60:2 CustomNvidiaParam=nvidia_setting CustomAmdParam=amd_setting CustomIntelParam=intel_setting
-NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=96 RealMemory=747110 State=CLOUD Feature=dynamic,p3dn.24xlarge,gpu-p3dn24xlarge,gpu Weight=1000 Gres=gpu:v100:8
+NodeName=gpu-st-gpu-g38xlarge-[1-1] CPUs=32 RealMemory=237363 State=CLOUD Feature=g3.8xlarge,gpu,gpu-g38xlarge,static Weight=1 Gres=gpu:m60:2 CustomNvidiaParam=nvidia_setting CustomAmdParam=amd_setting CustomIntelParam=intel_setting
+NodeName=gpu-dy-gpu-g38xlarge-[1-4] CPUs=32 RealMemory=237363 State=CLOUD Feature=dynamic,g3.8xlarge,gpu,gpu-g38xlarge Weight=1000 Gres=gpu:m60:2 CustomNvidiaParam=nvidia_setting CustomAmdParam=amd_setting CustomIntelParam=intel_setting
+NodeName=gpu-dy-gpu-p3dn24xlarge-[1-10] CPUs=96 RealMemory=747110 State=CLOUD Feature=dynamic,gpu,gpu-p3dn24xlarge,p3dn.24xlarge Weight=1000 Gres=gpu:v100:8
 
 NodeSet=gpu_nodes Nodes=gpu-st-gpu-g38xlarge-[1-1],gpu-dy-gpu-g38xlarge-[1-4],gpu-dy-gpu-p3dn24xlarge-[1-10]
 PartitionName=gpu Nodes=gpu_nodes MaxTime=INFINITE State=UP CustomParam=unique_value OtherParam=second_value TreeAsThird=3
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/expected_outputs/pcluster/slurm_parallelcluster_multiple_spot_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/expected_outputs/pcluster/slurm_parallelcluster_multiple_spot_partition.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=multiple_spot-st-multiplespot-1-[1-5] CPUs=4 RealMemory=7296 State=CLOUD Feature=static,c4.xlarge,multiplespot-1 Weight=1 CustomComputeParam=unique_compute_value OtherComputeParam=second_compute_value
-NodeName=multiple_spot-dy-multiplespot-1-[1-5] CPUs=4 RealMemory=7296 State=CLOUD Feature=dynamic,c4.xlarge,multiplespot-1 Weight=1000 CustomComputeParam=unique_compute_value OtherComputeParam=second_compute_value
-NodeName=multiple_spot-st-multiplespot-2-[1-5] CPUs=4 RealMemory=15564 State=CLOUD Feature=static,c5.2xlarge,multiplespot-2 Weight=1
+NodeName=multiple_spot-st-multiplespot-1-[1-5] CPUs=4 RealMemory=7296 State=CLOUD Feature=c4.xlarge,multiplespot-1,static Weight=1 CustomComputeParam=unique_compute_value OtherComputeParam=second_compute_value
+NodeName=multiple_spot-dy-multiplespot-1-[1-5] CPUs=4 RealMemory=7296 State=CLOUD Feature=c4.xlarge,dynamic,multiplespot-1 Weight=1000 CustomComputeParam=unique_compute_value OtherComputeParam=second_compute_value
+NodeName=multiple_spot-st-multiplespot-2-[1-5] CPUs=4 RealMemory=15564 State=CLOUD Feature=c5.2xlarge,multiplespot-2,static Weight=1
 
 NodeSet=multiple_spot_nodes Nodes=multiple_spot-st-multiplespot-1-[1-5],multiple_spot-dy-multiplespot-1-[1-5],multiple_spot-st-multiplespot-2-[1-5]
 PartitionName=multiple_spot Nodes=multiple_spot_nodes MaxTime=INFINITE State=UP Default=YES CustomQueueParam=unique_queue_value OtherQueueParam=second_queue_value
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/expected_outputs/pcluster/slurm_parallelcluster_queue_jls_default_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/expected_outputs/pcluster/slurm_parallelcluster_queue_jls_default_partition.conf
@@ -1,6 +1,6 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue_jls_default-dy-cr_1-[1-10] CPUs=2 RealMemory=7296 State=CLOUD Feature=dynamic,c4.xlarge,cr_1 Weight=1000
+NodeName=queue_jls_default-dy-cr_1-[1-10] CPUs=2 RealMemory=7296 State=CLOUD Feature=c4.xlarge,cr_1,dynamic Weight=1000
 
 NodeSet=queue_jls_default_nodes Nodes=queue_jls_default-dy-cr_1-[1-10]
 PartitionName=queue_jls_default Nodes=queue_jls_default_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/expected_outputs/pcluster/slurm_parallelcluster_queue_jls_disabled_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/expected_outputs/pcluster/slurm_parallelcluster_queue_jls_disabled_partition.conf
@@ -1,6 +1,6 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue_jls_disabled-dy-cr_1-[1-10] CPUs=2 RealMemory=7296 State=CLOUD Feature=dynamic,c4.xlarge,cr_1 Weight=1000
+NodeName=queue_jls_disabled-dy-cr_1-[1-10] CPUs=2 RealMemory=7296 State=CLOUD Feature=c4.xlarge,cr_1,dynamic Weight=1000
 
 NodeSet=queue_jls_disabled_nodes Nodes=queue_jls_disabled-dy-cr_1-[1-10]
 PartitionName=queue_jls_disabled Nodes=queue_jls_disabled_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/expected_outputs/pcluster/slurm_parallelcluster_queue_jls_enabled_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/expected_outputs/pcluster/slurm_parallelcluster_queue_jls_enabled_partition.conf
@@ -1,6 +1,6 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue_jls_enabled-dy-cr_1-[1-10] CPUs=4 RealMemory=7296 State=CLOUD Feature=dynamic,c4.xlarge,cr_1 Weight=1000
+NodeName=queue_jls_enabled-dy-cr_1-[1-10] CPUs=4 RealMemory=7296 State=CLOUD Feature=c4.xlarge,cr_1,dynamic Weight=1000
 
 NodeSet=queue_jls_enabled_nodes Nodes=queue_jls_enabled-dy-cr_1-[1-10]
 PartitionName=queue_jls_enabled Nodes=queue_jls_enabled_nodes MaxTime=INFINITE State=UP Default=YES OverSubscribe=EXCLUSIVE
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue1_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue1_partition.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue1-st-cr1-[1-2] CPUs=16 RealMemory=40857 State=CLOUD Feature=static,cr1 Weight=1
-NodeName=queue1-dy-cr1-[1-8] CPUs=16 RealMemory=40857 State=CLOUD Feature=dynamic,cr1 Weight=1000
-NodeName=queue1-dy-cr2-[1-10] CPUs=16 RealMemory=40857 State=CLOUD Feature=dynamic,c5n.4xlarge,cr2,efa Weight=1000
+NodeName=queue1-st-cr1-[1-2] CPUs=16 RealMemory=40857 State=CLOUD Feature=cr1,static Weight=1
+NodeName=queue1-dy-cr1-[1-8] CPUs=16 RealMemory=40857 State=CLOUD Feature=cr1,dynamic Weight=1000
+NodeName=queue1-dy-cr2-[1-10] CPUs=16 RealMemory=40857 State=CLOUD Feature=c5n.4xlarge,cr2,dynamic,efa Weight=1000
 
 NodeSet=queue1_nodes Nodes=queue1-st-cr1-[1-2],queue1-dy-cr1-[1-8],queue1-dy-cr2-[1-10]
 PartitionName=queue1 Nodes=queue1_nodes MaxTime=INFINITE State=UP Default=YES
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue2_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue2_partition.conf
@@ -1,8 +1,8 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue2-dy-cr1-[1-10] CPUs=16 RealMemory=40857 State=CLOUD Feature=dynamic,c5n.4xlarge,cr1 Weight=1000
-NodeName=queue2-st-cr2-[1-1] CPUs=72 RealMemory=186777 State=CLOUD Feature=static,c5n.18xlarge,cr2,efa Weight=1
-NodeName=queue2-dy-cr2-[1-9] CPUs=72 RealMemory=186777 State=CLOUD Feature=dynamic,c5n.18xlarge,cr2,efa Weight=1000
+NodeName=queue2-dy-cr1-[1-10] CPUs=16 RealMemory=40857 State=CLOUD Feature=c5n.4xlarge,cr1,dynamic Weight=1000
+NodeName=queue2-st-cr2-[1-1] CPUs=72 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,cr2,efa,static Weight=1
+NodeName=queue2-dy-cr2-[1-9] CPUs=72 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,cr2,dynamic,efa Weight=1000
 
 NodeSet=queue2_nodes Nodes=queue2-dy-cr1-[1-10],queue2-st-cr2-[1-1],queue2-dy-cr2-[1-9]
 PartitionName=queue2 Nodes=queue2_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue3_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue3_partition.conf
@@ -1,7 +1,7 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue3-st-cr1-[1-1] CPUs=72 RealMemory=186777 State=CLOUD Feature=static,c5n.18xlarge,cr1,efa Weight=1
-NodeName=queue3-dy-cr1-[1-9] CPUs=72 RealMemory=186777 State=CLOUD Feature=dynamic,c5n.18xlarge,cr1,efa Weight=1000
+NodeName=queue3-st-cr1-[1-1] CPUs=72 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,cr1,efa,static Weight=1
+NodeName=queue3-dy-cr1-[1-9] CPUs=72 RealMemory=186777 State=CLOUD Feature=c5n.18xlarge,cr1,dynamic,efa Weight=1000
 
 NodeSet=queue3_nodes Nodes=queue3-st-cr1-[1-1],queue3-dy-cr1-[1-9]
 PartitionName=queue3 Nodes=queue3_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue4_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue4_partition.conf
@@ -1,7 +1,7 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue4-st-cr1-[1-2] CPUs=4 RealMemory=7782 State=CLOUD Feature=static,cr1 Weight=1
-NodeName=queue4-dy-cr1-[1-8] CPUs=4 RealMemory=7782 State=CLOUD Feature=dynamic,cr1 Weight=1000
+NodeName=queue4-st-cr1-[1-2] CPUs=4 RealMemory=7782 State=CLOUD Feature=cr1,static Weight=1
+NodeName=queue4-dy-cr1-[1-8] CPUs=4 RealMemory=7782 State=CLOUD Feature=cr1,dynamic Weight=1000
 
 NodeSet=queue4_nodes Nodes=queue4-st-cr1-[1-2],queue4-dy-cr1-[1-8]
 PartitionName=queue4 Nodes=queue4_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue5_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue5_partition.conf
@@ -1,7 +1,7 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue5-st-cr1-[1-2] CPUs=4 RealMemory=7782 State=CLOUD Feature=static,cr1 Weight=1
-NodeName=queue5-dy-cr1-[1-8] CPUs=4 RealMemory=7782 State=CLOUD Feature=dynamic,cr1 Weight=1000
+NodeName=queue5-st-cr1-[1-2] CPUs=4 RealMemory=7782 State=CLOUD Feature=cr1,static Weight=1
+NodeName=queue5-dy-cr1-[1-8] CPUs=4 RealMemory=7782 State=CLOUD Feature=cr1,dynamic Weight=1000
 
 NodeSet=queue5_nodes Nodes=queue5-st-cr1-[1-2],queue5-dy-cr1-[1-8]
 PartitionName=queue5 Nodes=queue5_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue6_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue6_partition.conf
@@ -1,7 +1,7 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue6-st-cr1-[1-2] CPUs=16 RealMemory=237363 State=CLOUD Feature=static,cr1,gpu Weight=1 Gres=gpu:v100:4
-NodeName=queue6-dy-cr1-[1-3] CPUs=16 RealMemory=237363 State=CLOUD Feature=dynamic,cr1,gpu Weight=1000 Gres=gpu:v100:4
+NodeName=queue6-st-cr1-[1-2] CPUs=16 RealMemory=237363 State=CLOUD Feature=cr1,gpu,static Weight=1 Gres=gpu:v100:4
+NodeName=queue6-dy-cr1-[1-3] CPUs=16 RealMemory=237363 State=CLOUD Feature=cr1,dynamic,gpu Weight=1000 Gres=gpu:v100:4
 
 NodeSet=queue6_nodes Nodes=queue6-st-cr1-[1-2],queue6-dy-cr1-[1-3]
 PartitionName=queue6 Nodes=queue6_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue7_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue7_partition.conf
@@ -1,7 +1,7 @@
 # This file is automatically generated by pcluster
 
-NodeName=queue7-st-cr1-[1-2] CPUs=2 RealMemory=3891 State=CLOUD Feature=static,cr1 Weight=1
-NodeName=queue7-dy-cr1-[1-3] CPUs=2 RealMemory=3891 State=CLOUD Feature=dynamic,cr1 Weight=1000
+NodeName=queue7-st-cr1-[1-2] CPUs=2 RealMemory=3891 State=CLOUD Feature=cr1,static Weight=1
+NodeName=queue7-dy-cr1-[1-3] CPUs=2 RealMemory=3891 State=CLOUD Feature=cr1,dynamic Weight=1000
 
 NodeSet=queue7_nodes Nodes=queue7-st-cr1-[1-2],queue7-dy-cr1-[1-3]
 PartitionName=queue7 Nodes=queue7_nodes MaxTime=INFINITE State=UP
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue8_partition.conf b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/pcluster/slurm_parallelcluster_queue8_partition.conf
