diff options
| author | Tim Smith <tsmith@chef.io> | 2020-11-18 20:42:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 20:42:58 -0800 |
| commit | 50070a1bcb1e1e909879a0af84e64c6bf30500bc (patch) | |
| tree | 0b874630e105faadc8c742b73150d7b25c6f899d | |
| parent | b2a512aeb20b588ee6084c9f21feddcef9b654d2 (diff) | |
| parent | 8fa520310263d54786ac4b94a0c1717acfd928f1 (diff) | |
| download | ohai-50070a1bcb1e1e909879a0af84e64c6bf30500bc.tar.gz | |
Merge pull request #1580 from chef/lpar_detection
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/ohai/plugins/aix/virtualization.rb | 4 | ||||
| -rw-r--r-- | spec/unit/plugins/aix/virtualization_spec.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/ohai/plugins/aix/virtualization.rb b/lib/ohai/plugins/aix/virtualization.rb index 3d152124..74c72a5a 100644 --- a/lib/ohai/plugins/aix/virtualization.rb +++ b/lib/ohai/plugins/aix/virtualization.rb @@ -23,9 +23,7 @@ Ohai.plugin(:Virtualization) do collect_data(:aix) do virtualization Mash.new - uname_data = shell_out("uname -L").stdout.split - lpar_no = uname_data[0] - lpar_name = uname_data[1] + lpar_no, lpar_name = shell_out("uname -L").stdout.split(nil, 2) unless lpar_no.to_i == -1 || (lpar_no.to_i == 1 && lpar_name == "NULL") virtualization[:lpar_no] = lpar_no diff --git a/spec/unit/plugins/aix/virtualization_spec.rb b/spec/unit/plugins/aix/virtualization_spec.rb index 3386ce18..a96f5278 100644 --- a/spec/unit/plugins/aix/virtualization_spec.rb +++ b/spec/unit/plugins/aix/virtualization_spec.rb @@ -23,7 +23,7 @@ describe Ohai::System, "AIX virtualization plugin" do let(:plugin) do p = get_plugin("aix/virtualization") allow(p).to receive(:collect_os).and_return(:aix) - allow(p).to receive(:shell_out).with("uname -L").and_return(mock_shell_out(0, "29 l273pp027", nil)) + allow(p).to receive(:shell_out).with("uname -L").and_return(mock_shell_out(0, "29 virtlpar03 - 7.1 testers", nil)) allow(p).to receive(:shell_out).with("uname -W").and_return(mock_shell_out(0, "0", nil)) allow(p).to receive(:shell_out).with("lswpar -L").and_return(mock_shell_out(0, @lswpar_l, nil)) p @@ -248,7 +248,7 @@ describe Ohai::System, "AIX virtualization plugin" do it "uname -L detects the LPAR number and name" do plugin.run expect(plugin[:virtualization][:lpar_no]).to eq("29") - expect(plugin[:virtualization][:lpar_name]).to eq("l273pp027") + expect(plugin[:virtualization][:lpar_name]).to eq("virtlpar03 - 7.1 testers") end context "when WPARs exist on the LPAR" do |