-
Notifications
You must be signed in to change notification settings - Fork 450
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improvements to filesystem and wpar detection on AIX #654
Conversation
@@ -1,6 +1,7 @@ | |||
# | |||
# Author:: Joshua Timberman <[email protected]> | |||
# Copyright:: Copyright (c) 2013, Opscode, Inc. | |||
# Author:: Isa Farnik (<[email protected]>) | |||
# Copyright:: Copyright (c) 2015 Chef Software, Inc. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The existing years still apply so this should be 2013 - 2015
bcaf473
to
9126f46
Compare
@curiositycasualty looks like you need to go through and update all the tests, too |
Alright, looks like I've got some tests to fix. |
24528e1
to
dac18f9
Compare
dac18f9
to
14f4247
Compare
1 last thing. Is there a reason we have puppet.com all over the tests? |
@tas50 fixed |
resolved. |
fa0d0f3
to
5285faf
Compare
/cc @josephrdsmith @tas50 Commit messages and tests changed. |
5285faf
to
20404cf
Compare
@@ -17,7 +18,7 @@ | |||
# | |||
|
|||
Ohai.plugin(:Virtualization) do | |||
provides "virtualization" | |||
provides "virtualization", "wpars" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't look like you're setting wpars as a top-level attribute. Do you mean "virtualization/wpars"
?
allow(@plugin).to receive(:shell_out).with("uname -L").and_return(mock_shell_out(0, "29 l273pp027", nil)) | ||
allow(@plugin).to receive(:shell_out).with("uname -W").and_return(mock_shell_out(0, "0", nil)) | ||
allow(@plugin).to receive(:shell_out).with("lswpar -L").and_return(mock_shell_out(0, @lswpar_L, nil)) | ||
@plugin.run |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
plugin
is available to use here and it has the same three shell_out
stubs on it: https://github.com/chef/ohai/blob/if/fix-aix-attrs/spec/unit/plugins/aix/virtualization_spec.rb#L240-L248
You can replace @plugin
with plugin
and remove 257-261.
collect fs info by device or mountpoint on AIX AIX WPARs have no macaddresses provide proper os_version on AIX provide WPAR info for an LPAR node (AIX) collect AIX hostnames with dashes properly style and credit for AIX plugns PR comment feedback re: license accommodate WPARs in AIX fs plugin avoid phantom CPUs on WPARs in AIX CPU plugin avoid macaddress on WPARs in AIX networking plugin & test hostname right test AIX platform_version right detect WPARs on LPARs (AIX) refactor AIX filesystem AIX fs plugin: mount options as array license update AIX plugins change AIX test hostnames provide "wpars" as a child of virtualization on AIX reduse code resuse in AIX virt plugin
ea9d23f
to
2434cb9
Compare
👍 |
👍 Are we ready to merge this? |
LGTM |
Improvements to filesystem and wpar detection on AIX
I think that's everything from my shortlist.
/cc @chef/engineering-services @chef/client-aix