[SlurmTopo] cookstyle

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb

@@ -27,4 +27,4 @@
 default['cluster']['pyxis']['runtime_path'] = '/run/pyxis'
 
 # Block Topology Plugin
-default['cluster']['slurm']['block_topology']['force_configuration'] = false
+default['cluster']['slurm']['block_topology']['force_configuration'] = false

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

@@ -57,9 +57,9 @@ def _is_gb200(instance_type):
     return instance_type is not None and instance_type.split(".")[0] == P6E_GB200
 
 
-def generate_topology_config_file(
+def generate_topology_config_file(  # noqa: C901
     output_file: str, input_file: str, block_sizes: str, force_configuration: bool
-):  # noqa: C901
+):
     """
     Generate Topology configuration file.
 
@@ -84,13 +84,10 @@ def generate_topology_config_file(
 
                 # Retrieve capacity info from the queue_name, if there
                 queue_capacity_type = CAPACITY_TYPE_MAP.get(queue_config.get("CapacityType", "ONDEMAND"))
-                if not _is_capacity_block(queue_capacity_type):
-                    if force_configuration:
-                        # We ignore this check if force_configuration option is used
-                        pass
-                    else:
-                        log.info("ParallelCluster does not create topology for %s", queue_capacity_type)
-                        continue
+                if not _is_capacity_block(queue_capacity_type) and not force_configuration:
+                    # We ignore this check when force_configuration option is used.
+                    log.info("ParallelCluster does not create topology for %s", queue_capacity_type)
+                    continue
 
                 for compute_resource_config in queue_config["ComputeResources"]:
                     compute_resource_name = compute_resource_config["Name"]

cookbooks/aws-parallelcluster-slurm/resources/block_topology/partial/_block_topology_common.rb

@@ -74,7 +74,5 @@ def topology_generator_command_args
 def topology_generator_extra_args
   if ['true', 'yes', true].include?(node['cluster']['slurm']['block_topology']['force_configuration'])
     " --force-configuration"
-  else
-    nil
   end
-end
+end

cookbooks/aws-parallelcluster-slurm/spec/unit/resources/block_topology_spec.rb

@@ -61,15 +61,15 @@ def self.update(chef_run)
               .with(group: 'root')
               .with(mode: '0644')
           end
-          command =  "#{cookbook_env}/bin/python #{script_dir}/slurm/pcluster_topology_generator.py" \
+          command = "#{cookbook_env}/bin/python #{script_dir}/slurm/pcluster_topology_generator.py" \
             " --output-file #{slurm_install_dir}/etc/topology.conf" \
             " --block-sizes #{block_sizes}" \
             " --input-file #{cluster_config}"
-          if ['true', 'yes', true].include?(force_configuration)
-            command_to_exe =  "#{command}#{force_configuration_extra_args}"
-          else
-            command_to_exe = "#{command}"
-          end
+          command_to_exe = if ['true', 'yes', true].include?(force_configuration)
+                             "#{command}#{force_configuration_extra_args}"
+                           else
+                             "#{command}"
+                           end
           it 'generates topology config when block sizes are present' do
             expect(chef_run).to run_execute('generate_topology_config')
               .with(command: command_to_exe)
@@ -115,11 +115,11 @@ def self.update(chef_run)
               " --output-file #{slurm_install_dir}/etc/topology.conf" \
               " --input-file #{cluster_config}"\
               "#{topo_command_args}"
-            if ['true', 'yes', true].include?(force_configuration)
-              command_to_exe =  "#{command}#{force_configuration_extra_args}"
-            else
-              command_to_exe = "#{command}"
-            end
+            command_to_exe = if ['true', 'yes', true].include?(force_configuration)
+                               "#{command}#{force_configuration_extra_args}"
+                             else
+                               "#{command}"
+                             end
 
             it 'creates the topology configuration template' do
               expect(chef_run).to create_template("#{slurm_install_dir}/etc/slurm_parallelcluster_topology.conf")
@@ -132,12 +132,12 @@ def self.update(chef_run)
             if topo_command_args.nil?
               it 'update or cleanup topology.conf when block sizes are present' do
                 expect(chef_run).not_to run_execute('update or cleanup topology.conf')
-                                      .with(command: command_to_exe)
+                  .with(command: command_to_exe)
               end
             else
               it 'update or cleanup topology.conf when block sizes are present' do
                 expect(chef_run).to run_execute('update or cleanup topology.conf')
-                                      .with(command: command_to_exe)
+                  .with(command: command_to_exe)
               end
             end
 

test/unit/slurm/test_topology_generator.py

@@ -67,7 +67,7 @@ def test_cleanup_topology_config_file(mocker, tmpdir, file_exists):
         ("capacity-block", True),
         ("on-demand", False),
         ("spot", False),
-        ("anay-value", False),
+        ("any-value", False),
         ("bla-capacity-block-bla", False),
     ],
 )