diff options
| author | Lance Albertson <lance@osuosl.org> | 2020-04-17 14:45:37 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-04-21 14:58:26 -0700 |
| commit | 6086b3e1b5f73ab2499969245ff29d0af605fea1 (patch) | |
| tree | ec4a64843ae4984df21febb52ab2920d8d30883a | |
| parent | 1516a849f22c4248c8bccbf7b979e966d401d294 (diff) | |
| download | ohai-6086b3e1b5f73ab2499969245ff29d0af605fea1.tar.gz | |
Use correct DMI attribute name for product name
I discovered that ohai was incorrectly detecting our OpenStack guests showing
the following output:
{
"systems": {
}
}
With this change, it correctly shows the following output:
{
"systems": {
"openstack": "guest"
},
"system": "openstack",
"role": "guest"
}
The problem was the fact that dmi/system/product was the incorrect attribute and
should be dmi/system/product_name instead.
Signed-off-by: Lance Albertson <lance@osuosl.org>
| -rw-r--r-- | lib/ohai/plugins/linux/virtualization.rb | 4 | ||||
| -rw-r--r-- | spec/unit/plugins/linux/virtualization_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb index dd512ebb..1cb125aa 100644 --- a/lib/ohai/plugins/linux/virtualization.rb +++ b/lib/ohai/plugins/linux/virtualization.rb @@ -118,8 +118,8 @@ Ohai.plugin(:Virtualization) do # parse dmi to discover various virtualization guests # we do this *after* the kvm detection so that OpenStack isn't detected as KVM - logger.trace("Looking up DMI data manufacturer: '#{get_attribute(:dmi, :system, :manufacturer)}' product: '#{get_attribute(:dmi, :system, :product)}' version: '#{get_attribute(:dmi, :system, :version)}'") - guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version)) + logger.trace("Looking up DMI data manufacturer: '#{get_attribute(:dmi, :system, :manufacturer)}' product_name: '#{get_attribute(:dmi, :system, :product_name)}' version: '#{get_attribute(:dmi, :system, :version)}'") + guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product_name), get_attribute(:dmi, :system, :version)) if guest logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest") virtualization[:system] = guest diff --git a/spec/unit/plugins/linux/virtualization_spec.rb b/spec/unit/plugins/linux/virtualization_spec.rb index 468c5e0f..ccd868a4 100644 --- a/spec/unit/plugins/linux/virtualization_spec.rb +++ b/spec/unit/plugins/linux/virtualization_spec.rb @@ -190,7 +190,7 @@ describe Ohai::System, "Linux virtualization platform" do it "sets virtualization attributes if the appropriate DMI data is present" do plugin[:dmi] = { system: { manufacturer: "Amazon EC2", - product: "c5n.large", + product_name: "c5n.large", version: nil, }, } @@ -203,7 +203,7 @@ describe Ohai::System, "Linux virtualization platform" do it "sets empty virtualization attributes if nothing is detected" do plugin[:dmi] = { system: { manufacturer: "Supermicro", - product: "X10SLH-N6-ST031", + product_name: "X10SLH-N6-ST031", version: "0123456789", }, } |