Make the DMI IDs we whitelist configurable #970
Conversation
tas50
changed the title
tas50
force-pushed
the
dmi_ids
branch
2 times, most recently
from
1d83640
to
5b0d752
Compare
tas50
requested review from
lamont-granquist and
thommay
and removed request for
lamont-granquist and
thommay
lib/ohai/common/dmi.rb
Outdated
| ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ] | ||
| # list of IDs to collect from config or default to a sane list that prunes | ||
| # away some of the less useful IDs | ||
| ID_TO_CAPTURE = Ohai.config[:plugin][:dmi][:ids] || [ 0, 1, 2, 3, 4, 6, 11 ] |
There was a problem hiding this comment.
hm, i don't think we should force any user that wants to add a single DMI ID to have to specify the full list of defaults too.
There was a problem hiding this comment.
I could make this additional IDs pretty easily
|
@thommay does this sort of thing make sense to allow the user to provide both IDs and the description we use to build the Mash? |
|
This seems good; you might want to think about accepting an array too and just returning the code if there's no description. |
A lot of people want their OEM / IPMI dmi data. It’s super handy to have. Signed-off-by: Tim Smith <tsmith@chef.io>
We need to allow the user to add not only additional IDs, but the value for that ID. If we don’t have a description name it shows up as “unknown” Signed-off-by: Tim Smith <tsmith@chef.io>
Signed-off-by: Tim Smith <tsmith@chef.io>
This should work since we have the updated list of descriptions. If it doesn't we'll populate the data with a generic description based on the ID. Signed-off-by: Tim Smith <tsmith@chef.io>
Signed-off-by: Tim Smith <tsmith@chef.io>
Signed-off-by: Tim Smith <tsmith@chef.io>
| @plugin.run | ||
| expect(@plugin[:dmi][:base_board]).not_to have_key(:error_correction_type) | ||
| it "allows capturing additional DMI data" do | ||
| Ohai.config[:additional_dmi_ids] = [ 16 ] |
There was a problem hiding this comment.
@thommay or @lamont-granquist I'd love a bit of help here. If I set Ohai.config[:additional_dmi_ids] here it fails, but if I stick the same thing way up in the before each it does work here (but fails other tests). What am I missing in rspec land? It seems like this should work.
There was a problem hiding this comment.
You were shoving additional IDs on to a constant, so that lived forever.
Signed-off-by: Thom May <thom@chef.io>
thommay
changed the title
Backport of chef#970 Signed-off-by: Gavin Reynolds <gavin@chef.io>
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
A lot of people want their OEM / IPMI dmi data. It’s super handy to have.
Signed-off-by: Tim Smith tsmith@chef.io