[NVIDIA-IMEX] Setting Nvidia-imex node attributes which should show the version and package name as seen on the repositories

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/nvidia_imex_alinux2023.rb

@@ -19,6 +19,5 @@
 use 'partial/_nvidia_imex_common.rb'
 
 def _nvidia_imex_version
-  nvidia_major_version = node['cluster']['nvidia']['driver_version'].split('.')[0]
-  "#{nvidia_major_version}-#{node['cluster']['nvidia']['driver_version']}-1"
+  "#{nvidia_driver_major_version}-#{nvidia_imex_full_version}"
 end

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/nvidia_imex_redhat8.rb

@@ -19,6 +19,5 @@
 use 'partial/_nvidia_imex_common.rb'
 
 def _nvidia_imex_version
-  nvidia_major_version = node['cluster']['nvidia']['driver_version'].split('.')[0]
-  "#{nvidia_major_version}-#{node['cluster']['nvidia']['driver_version']}-1"
+  "#{nvidia_driver_major_version}-#{nvidia_imex_full_version}"
 end

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/nvidia_imex_rocky8.rb

@@ -19,6 +19,5 @@
 use 'partial/_nvidia_imex_common.rb'
 
 def _nvidia_imex_version
-  nvidia_major_version = node['cluster']['nvidia']['driver_version'].split('.')[0]
-  "#{nvidia_major_version}-#{node['cluster']['nvidia']['driver_version']}-1"
+  "#{nvidia_driver_major_version}-#{nvidia_imex_full_version}"
 end

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/nvidia_imex_ubuntu22+.rb

@@ -19,6 +19,5 @@
 use 'partial/_nvidia_imex_common.rb'
 
 def _nvidia_imex_version
-  nvidia_major_version = node['cluster']['nvidia']['driver_version'].split('.')[0]
-  "#{nvidia_major_version}_#{node['cluster']['nvidia']['driver_version']}-1"
+  "#{nvidia_driver_major_version}_#{nvidia_imex_full_version}"
 end

cookbooks/aws-parallelcluster-platform/resources/nvidia_imex/partial/_nvidia_imex_common.rb

@@ -53,8 +53,8 @@
     action :install
   end
   # Save Imex version in Node Attributes for InSpec Tests
-  node.default['cluster']['nvidia']['imex']['version'] = _nvidia_imex_version
-  node.default['cluster']['nvidia']['imex']['package'] = "#{nvidia_imex_service}-#{node['cluster']['nvidia']['driver_version'].split('.')[0]}"
+  node.default['cluster']['nvidia']['imex']['version'] = nvidia_imex_full_version
+  node.default['cluster']['nvidia']['imex']['package'] = "#{nvidia_imex_service}-#{nvidia_driver_major_version}"
   node_attributes 'dump node attributes'
 end
 
@@ -69,10 +69,18 @@
   end
 end
 
+def nvidia_driver_major_version
+  node['cluster']['nvidia']['driver_version'].split('.')[0]
+end
+
 def nvidia_imex_service
   'nvidia-imex'
 end
 
+def nvidia_imex_full_version
+  "#{node['cluster']['nvidia']['driver_version']}-1"
+end
+
 def imex_installed
   ::File.exist?("/usr/bin/#{nvidia_imex_service}") || ::File.exist?("/usr/bin/#{nvidia_imex_service}-ctl")
 end

cookbooks/aws-parallelcluster-platform/spec/unit/resources/nvidia_imex_spec.rb

@@ -177,11 +177,12 @@ def self.configure(chef_run)
           end
           runner(platform: platform, version: version, step_into: ['nvidia_imex'])
         end
-        cached(:nvidia_imex_version) do
+        cached(:nvidia_imex_version) { "1.2.3-1" }
+        cached(:nvidia_imex_name) do
           if %(redhat rocky).include?(platform) || platform == 'amazon' && version == '2023'
-            "1-1.2.3-1"
+            "nvidia-imex-1-#{nvidia_imex_version}"
           else
-            "1_1.2.3-1"
+            "nvidia-imex-1_#{nvidia_imex_version}"
           end
         end
         cached(:node) { chef_run.node }
@@ -213,7 +214,7 @@ def self.configure(chef_run)
               .with(group: 'root')
               .with(mode: '0644')
             is_expected.not_to install_install_packages('Install nvidia-imex')
-              .with(packages: "nvidia-imex-#{nvidia_imex_version}")
+              .with(packages: "#{nvidia_imex_name}")
               .with(action: %i(install))
           end
           it 'does not set nvidia-imex version' do
@@ -241,7 +242,7 @@ def self.configure(chef_run)
               .with(group: 'root')
               .with(mode: '0644')
             is_expected.to install_install_packages('Install nvidia-imex')
-              .with(packages: "nvidia-imex-#{nvidia_imex_version}")
+              .with(packages: "#{nvidia_imex_name}")
               .with(action: %i(install))
           end
           it 'sets nvidia-imex version' do