diff options
| author | Tim Smith <tsmith@chef.io> | 2016-12-15 08:58:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 08:58:17 -0800 |
| commit | 09813a9f987946c0b195f7bfc50b6501c5ee8bff (patch) | |
| tree | 530fc79380017a2e1073cf6b2fc1bbc0be9b42be | |
| parent | b8427163ad659179af16171e329d77c5344d537a (diff) | |
| parent | d2c62978e336c57aaf8f8c024d255d9d13da0e2f (diff) | |
| download | ohai-09813a9f987946c0b195f7bfc50b6501c5ee8bff.tar.gz | |
Merge pull request #922 from rdean716/rdean-patch1
Windows guest support on Hyper-v and Xen.
| -rw-r--r-- | lib/ohai/plugins/windows/virtualization.rb | 10 | ||||
| -rw-r--r-- | spec/unit/plugins/windows/virtualization_spec.rb | 51 |
2 files changed, 61 insertions, 0 deletions
diff --git a/lib/ohai/plugins/windows/virtualization.rb b/lib/ohai/plugins/windows/virtualization.rb index 947e1697..ac36b05a 100644 --- a/lib/ohai/plugins/windows/virtualization.rb +++ b/lib/ohai/plugins/windows/virtualization.rb @@ -44,6 +44,16 @@ Ohai.plugin(:Virtualization) do virtualization[:system] = "kvm" virtualization[:role] = "guest" virtualization[:systems][:kvm] = "guest" + when "American Megatrends Inc." + if bios[0]["version"] =~ /VRTUAL -/ + virtualization[:system] = "hyper-v" + virtualization[:role] = "guest" + virtualization[:systems][:hyperv] = "guest" + end + when "Xen" + virtualization[:system] = "xen" + virtualization[:role] = "guest" + virtualization[:systems][:xen] = "guest" end # vmware fusion detection diff --git a/spec/unit/plugins/windows/virtualization_spec.rb b/spec/unit/plugins/windows/virtualization_spec.rb index 124e92f6..c3ac04ab 100644 --- a/spec/unit/plugins/windows/virtualization_spec.rb +++ b/spec/unit/plugins/windows/virtualization_spec.rb @@ -173,6 +173,57 @@ describe Ohai::System, "Windows virtualization platform" do end end + context "when running on hyper-v" do + it "system is hyper-v" do + allow_any_instance_of(WmiLite::Wmi).to receive(:instances_of).with("Win32_BIOS").and_return([{ "bioscharacteristics" => [4, 7, 9, 11, 12, 14, 15, 16, 17, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 34, 36, 37, 40], + "biosversion" => ["VRTUAL - 4001628, BIOS Date: 04/28/16 13:00:17 Ver: 09.00.06, BIOS Date: 04/28/16 13:00:17 Ver: 09.00.06"], + "buildnumber" => nil, + "codeset" => nil, + "currentlanguage" => "enUS", + "description" => "BIOS Date: 04/28/16 13:00:17 Ver: 09.00.06", + "identificationcode" => nil, + "installablelanguages" => 1, + "installdate" => nil, + "languageedition" => nil, + "listoflanguages" => ["enUS"], + "manufacturer" => "American Megatrends Inc.", + "name" => "BIOS Date: 04/28/16 13:00:17 Ver: 09.00.06", + "othertargetos" => nil, + "primarybios" => true, + "releasedate" => "20160428000000.000000+000", + "serialnumber" => "1158-1757-7941-3855-2170-4122-00", + "smbiosbiosversion" => "090006", + "smbiosmajorversion" => 2, + "smbiosminorversion" => 3, + "smbiospresent" => true, + "softwareelementid" => "BIOS Date: 04/28/16 13:00:17 Ver: 09.00.06", + "softwareelementstate" => 3, + "status" => "OK", + "targetoperatingsystem" => 0, + "version" => "VRTUAL - 4001628", + }]) + plugin.run + expect(plugin[:virtualization][:system]).to eq("hyper-v") + expect(plugin[:virtualization][:role]).to eq("guest") + expect(plugin[:virtualization][:systems][:hyperv]).to eq("guest") + end + end + + context "when running on xen" do + it "system is xen" do + allow_any_instance_of(WmiLite::Wmi).to receive(:instances_of).with("Win32_BIOS").and_return([{ "smbiosbiosversion" => ["4.2.amazon"], + "manufacturer" => "Xen", + "name" => "Revision: 1.221", + "serialnumber" => "ec2b487f-d9ed-7d17-c7c0-1d4599d6c1da", + "version" => "Xen - 0", + }]) + plugin.run + expect(plugin[:virtualization][:system]).to eq("xen") + expect(plugin[:virtualization][:role]).to eq("guest") + expect(plugin[:virtualization][:systems][:xen]).to eq("guest") + end + end + context "when running on a hardware system" do it "does not set virtualization attributes" do allow_any_instance_of(WmiLite::Wmi).to receive(:instances_of).with("Win32_BIOS").and_return([{ "bioscharacteristics" => [7, 11, 12, 15, 16, 17, 19, 23, 24, 25, 26, 27, 28, 29, 32, 33, 40, 42, 43], |