Skip to content

Commit b696af8

Browse files
author
Himani Anil Deshpande
committed
[Nvidia-Imex] Updating function names
1 parent d05ae27 commit b696af8

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use 'partial/_nvidia_imex_common.rb'
1818
use 'partial/_nvidia_imex_rhel.rb'
1919

20-
def imex_installed
20+
def imex_installed?
2121
# We do not install NVIDIA-Imex for Alinux2 due to restriction on NVIDIA driver
2222
true
2323
end

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
action :install do
1919
return unless nvidia_enabled_or_installed?
20-
return if on_docker? || imex_installed || aws_region.start_with?("us-iso")
20+
return if on_docker? || imex_installed? || aws_region.start_with?("us-iso")
2121

2222
# Add NVIDIA repo for nvidia-imex
2323
nvidia_repo 'add nvidia repository' do
@@ -60,7 +60,7 @@
6060
end
6161

6262
action :configure do
63-
return unless imex_installed && node['cluster']['node_type'] == "ComputeFleet"
63+
return unless imex_installed? && node['cluster']['node_type'] == "ComputeFleet"
6464
# Start nvidia-imex on p6e-gb200 and only on ComputeFleet
6565
if get_nvswitch_count(get_device_ids['gb200']) > 1
6666
service nvidia_imex_service do
@@ -82,7 +82,7 @@ def nvidia_imex_full_version
8282
"#{node['cluster']['nvidia']['driver_version']}-1"
8383
end
8484

85-
def imex_installed
85+
def imex_installed?
8686
::File.exist?("/usr/bin/#{nvidia_imex_service}") || ::File.exist?("/usr/bin/#{nvidia_imex_service}-ctl")
8787
end
8888

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def self.configure(chef_run)
7070
end
7171
end
7272

73-
describe 'nvidia_imex:imex_installed' do
73+
describe 'nvidia_imex:imex_installed?' do
7474
for_all_oses do |platform, version|
7575
context "on #{platform}#{version}" do
7676
cached(:chef_run) do
@@ -89,11 +89,11 @@ def self.configure(chef_run)
8989

9090
if platform == 'amazon' && version == '2'
9191
it 'is true' do
92-
expect(resource.imex_installed).to eq(true)
92+
expect(resource.imex_installed?).to eq(true)
9393
end
9494
else
9595
it 'is false' do
96-
expect(resource.imex_installed).to eq(false)
96+
expect(resource.imex_installed?).to eq(false)
9797
end
9898
end
9999
end
@@ -105,7 +105,7 @@ def self.configure(chef_run)
105105
end
106106

107107
it 'is true' do
108-
expect(resource.imex_installed).to eq(true)
108+
expect(resource.imex_installed?).to eq(true)
109109
end
110110
end
111111

@@ -116,7 +116,7 @@ def self.configure(chef_run)
116116
end
117117

118118
it 'is true' do
119-
expect(resource.imex_installed).to eq(true)
119+
expect(resource.imex_installed?).to eq(true)
120120
end
121121
end
122122

@@ -127,7 +127,7 @@ def self.configure(chef_run)
127127
end
128128

129129
it 'is true' do
130-
expect(resource.imex_installed).to eq(true)
130+
expect(resource.imex_installed?).to eq(true)
131131
end
132132
end
133133
end
@@ -155,7 +155,7 @@ def self.configure(chef_run)
155155
context 'when nvidia-imex binary already exists' do
156156
cached(:chef_run) do
157157
stubs_for_resource('nvidia_imex') do |res|
158-
allow(res).to receive(:imex_installed).and_return(true)
158+
allow(res).to receive(:imex_installed?).and_return(true)
159159
end
160160
runner = runner(platform: platform, version: version, step_into: ['nvidia_imex'])
161161
ConvergeNvidiaImex.install(runner)
@@ -273,7 +273,7 @@ def self.configure(chef_run)
273273
context "when nvidia-imex binary is not installed" do
274274
cached(:chef_run) do
275275
stubs_for_resource('nvidia_imex') do |res|
276-
allow(res).to receive(:imex_installed).and_return(false)
276+
allow(res).to receive(:imex_installed?).and_return(false)
277277
end
278278
runner = runner(platform: platform, version: version, step_into: ['nvidia_imex'])
279279
ConvergeNvidiaImex.configure(runner)
@@ -289,7 +289,7 @@ def self.configure(chef_run)
289289
context "when get_nvswitch_count > 1 on #{node_type} node" do
290290
cached(:chef_run) do
291291
stubs_for_provider('nvidia_imex[configure]') do |pro|
292-
allow(pro).to receive(:imex_installed).and_return(true)
292+
allow(pro).to receive(:imex_installed?).and_return(true)
293293
allow(pro).to receive(:get_device_ids).and_return({ 'gb200' => 'test' })
294294
allow(pro).to receive(:get_nvswitch_count).with('test').and_return(4)
295295
end
@@ -318,7 +318,7 @@ def self.configure(chef_run)
318318
context "when get_nvswitch_count <= 1" do
319319
cached(:chef_run) do
320320
stubs_for_provider('nvidia_imex[configure]') do |pro|
321-
allow(pro).to receive(:imex_installed).and_return(true)
321+
allow(pro).to receive(:imex_installed?).and_return(true)
322322
allow(pro).to receive(:get_device_ids).and_return({ 'gb200' => 'test' })
323323
allow(pro).to receive(:get_nvswitch_count).with('test').and_return(1)
324324
end

0 commit comments

Comments
 (0)