Merge pull request #760 from tas50/solaris_needs_virt_love

Improve virtualization detection on Solaris

3 files changed, 33 insertions, 32 deletions

diff --git a/lib/ohai/mixin/dmi_decode.rb b/lib/ohai/mixin/dmi_decode.rb
index c8c4c5ac..8ec109f5 100644
--- a/lib/ohai/mixin/dmi_decode.rb
+++ b/lib/ohai/mixin/dmi_decode.rb
@@ -21,7 +21,7 @@ module ::Ohai::Mixin::DmiDecode
     dmi_data.each_line do |line|
       case line
       when /Manufacturer: Microsoft/
-        if dmi_data =~ /Product Name: Virtual Machine/
+        if dmi_data =~ /Product.*: Virtual Machine/
           if dmi_data =~ /Version: (7.0|Hyper-V)/
             return "hyperv"
           elsif dmi_data =~ /Version: (VS2005R2|6.0)/
@@ -34,9 +34,9 @@ module ::Ohai::Mixin::DmiDecode
         return "vmware"
       when /Manufacturer: Xen/
         return "xen"
-      when /Product Name: VirtualBox/
+      when /Product.*: VirtualBox/
         return "vbox"
-      when /Product Name: OpenStack/
+      when /Product.*: OpenStack/
         return "openstack"
       when /Manufacturer: QEMU|Product Name: (KVM|RHEV)/
         return "kvm"
diff --git a/lib/ohai/plugins/solaris2/virtualization.rb b/lib/ohai/plugins/solaris2/virtualization.rb
index 13ee7839..7518cb41 100644
--- a/lib/ohai/plugins/solaris2/virtualization.rb
+++ b/lib/ohai/plugins/solaris2/virtualization.rb
@@ -18,6 +18,9 @@
 # limitations under the License.
 #
 
+require "ohai/mixin/dmi_decode"
+include Ohai::Mixin::DmiDecode
+
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
 
@@ -29,34 +32,28 @@ Ohai.plugin(:Virtualization) do
 
   collect_data(:solaris2) do
     virtualization Mash.new
+    virtualization[:systems] = Mash.new
 
-    # Detect KVM/QEMU from cpuinfo, report as KVM
+    # Detect paravirt KVM/QEMU from cpuinfo, report as KVM
     psrinfo_path = Ohai.abs_path( "/usr/sbin/psrinfo" )
-    if File.exists?(psrinfo_path)
+    if File.exist?(psrinfo_path)
       so = shell_out("#{psrinfo_path} -pv")
-      if so.stdout =~ /QEMU Virtual CPU/
+      if so.stdout =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/
         virtualization[:system] = "kvm"
         virtualization[:role] = "guest"
+        virtualization[:systems][:kvm] = "guest"
       end
     end
 
-    # http://www.dmo.ca/blog/detecting-virtualization-on-linux
-    smbios_path = Ohai.abs_path( "/usr/sbin/smbios" )
-    if File.exists?(smbios_path)
-      so = shell_out(smbios_path)
-      case so.stdout
-      when /Manufacturer: Microsoft/
-        if so.stdout =~ /Product: Virtual Machine/
-          virtualization[:system] = "virtualpc"
-          virtualization[:role] = "guest"
-        end
-      when /Manufacturer: VMware/
-        if so.stdout =~ /Product: VMware Virtual Platform/
-          virtualization[:system] = "vmware"
-          virtualization[:role] = "guest"
-        end
-      else
-        nil
+    # Pass smbios information to the dmi_decode mixin to
+    # identify possible virtualization systems
+    smbios_path = Ohai.abs_path("/usr/sbin/smbios")
+    if File.exist?(smbios_path)
+      guest = guest_from_dmi(shell_out(smbios_path).stdout)
+      if guest
+        virtualization[:system] = guest
+        virtualization[:role] = "guest"
+        virtualization[:systems][guest.to_sym] = "guest"
       end
     end
 
@@ -77,15 +74,17 @@ Ohai.plugin(:Virtualization) do
 
       if zones.length == 1
         first_zone = zones.keys[0]
-        unless( first_zone == "global")
+        unless first_zone == "global"
           virtualization[:system] = "zone"
           virtualization[:role] = "guest"
+          virtualization[:systems][:zone] = "guest"
           virtualization[:guest_uuid] = zones[first_zone]["uuid"]
           virtualization[:guest_id] = collect_solaris_guestid
         end
       elsif zones.length > 1
         virtualization[:system] = "zone"
         virtualization[:role] = "host"
+        virtualization[:systems][:zone] = "host"
         virtualization[:guests] = zones
       end
     end
diff --git a/spec/unit/plugins/solaris2/virtualization_spec.rb b/spec/unit/plugins/solaris2/virtualization_spec.rb
index 6e1b95e9..e0f950e3 100644
--- a/spec/unit/plugins/solaris2/virtualization_spec.rb
+++ b/spec/unit/plugins/solaris2/virtualization_spec.rb
@@ -30,16 +30,16 @@ PSRINFO_PV
     allow(@plugin).to receive(:collect_os).and_return(:solaris2)
 
     # default to all requested Files not existing
-    allow(File).to receive(:exists?).with("/usr/sbin/psrinfo").and_return(false)
-    allow(File).to receive(:exists?).with("/usr/sbin/smbios").and_return(false)
-    allow(File).to receive(:exists?).with("/usr/sbin/zoneadm").and_return(false)
+    allow(File).to receive(:exist?).with("/usr/sbin/psrinfo").and_return(false)
+    allow(File).to receive(:exist?).with("/usr/sbin/smbios").and_return(false)
+    allow(File).to receive(:exist?).with("/usr/sbin/zoneadm").and_return(false)
     allow(@plugin).to receive(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, "", ""))
     allow(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "", ""))
   end
 
   describe "when we are checking for kvm" do
     before(:each) do
-      expect(File).to receive(:exists?).with("/usr/sbin/psrinfo").and_return(true)
+      expect(File).to receive(:exist?).with("/usr/sbin/psrinfo").and_return(true)
     end
 
     it "should run psrinfo -pv" do
@@ -52,18 +52,19 @@ PSRINFO_PV
       @plugin.run
       expect(@plugin[:virtualization][:system]).to eq("kvm")
       expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:kvm]).to eq("guest")
     end
 
     it "should not set virtualization if kvm isn't there" do
       expect(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, @psrinfo_pv, ""))
       @plugin.run
-      expect(@plugin[:virtualization]).to eq({})
+      expect(@plugin[:virtualization][:systems]).to eq({})
     end
   end
 
   describe "when we are parsing smbios" do
     before(:each) do
-      expect(File).to receive(:exists?).with("/usr/sbin/smbios").and_return(true)
+      expect(File).to receive(:exist?).with("/usr/sbin/smbios").and_return(true)
     end
 
     it "should run smbios" do
@@ -107,17 +108,18 @@ VMWARE
       @plugin.run
       expect(@plugin[:virtualization][:system]).to eq("vmware")
       expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:vmware]).to eq("guest")
     end
 
     it "should run smbios and not set virtualization if nothing is detected" do
       expect(@plugin).to receive(:shell_out).with("/usr/sbin/smbios")
       @plugin.run
-      expect(@plugin[:virtualization]).to eq({})
+      expect(@plugin[:virtualization][:systems]).to eq({})
     end
   end
 
   it "should not set virtualization if no tests match" do
     @plugin.run
-    expect(@plugin[:virtualization]).to eq({})
+    expect(@plugin[:virtualization][:systems]).to eq({})
   end
 end