ohai 8.7.0 → 8.8.0

data/spec/unit/plugins/{freebsd → bsd}/virtualization_spec.rb

@@ -18,9 +18,9 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
-describe Ohai::System, "FreeBSD virtualization plugin" do
+describe Ohai::System, "BSD virtualization plugin" do
   before(:each) do
-    @plugin = get_plugin("freebsd/virtualization")
+    @plugin = get_plugin("bsd/virtualization")
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
     allow(@plugin).to receive(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "0", ""))
     allow(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/sbin/kldstat" )}").and_return(mock_shell_out(0, "", ""))
@@ -34,6 +34,7 @@ describe Ohai::System, "FreeBSD virtualization plugin" do
       @plugin.run
       expect(@plugin[:virtualization][:system]).to eq("jail")
       expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:jail]).to eq("guest")
     end
 
     it "detects we are hosting jails" do
@@ -43,6 +44,7 @@ describe Ohai::System, "FreeBSD virtualization plugin" do
       @plugin.run
       expect(@plugin[:virtualization][:system]).to eq("jail")
       expect(@plugin[:virtualization][:role]).to eq("host")
+      expect(@plugin[:virtualization][:systems][:jail]).to eq("host")
     end
   end
 
@@ -60,6 +62,7 @@ OUT
       @plugin.run
       expect(@plugin[:virtualization][:system]).to eq("vbox")
       expect(@plugin[:virtualization][:role]).to eq("guest")
+      expect(@plugin[:virtualization][:systems][:vbox]).to eq("guest")
     end
   end
 
@@ -77,6 +80,7 @@ OUT
       @plugin.run
       expect(@plugin[:virtualization][:system]).to eq("vbox")
       expect(@plugin[:virtualization][:role]).to eq("host")
+      expect(@plugin[:virtualization][:systems][:vbox]).to eq("host")
     end
   end
 
@@ -87,9 +91,8 @@ OUT
         @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
     end
   end
-
-  # TODO upfactor tests from linux virtualization plugin for dmidecode
 end

data/spec/unit/plugins/freebsd/cpu_spec.rb

@@ -18,51 +18,97 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
-describe Ohai::System, "FreeBSD cpu plugin" do
+describe Ohai::System, "FreeBSD cpu plugin on FreeBSD >=10.2" do
   before(:each) do
     @plugin = get_plugin("freebsd/cpu")
     allow(@plugin).to receive(:collect_os).and_return(:freebsd)
     allow(@plugin).to receive(:shell_out).with("sysctl -n hw.ncpu").and_return(mock_shell_out(0, "2", ""))
     @double_file = double("/var/run/dmesg.boot")
     allow(@double_file).to receive(:each).
-      and_yield('CPU: Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz (3516.61-MHz K8-class CPU)').
-      and_yield('  Origin = "GenuineIntel"  Id = 0x306a9  Family = 6  Model = 3a  Stepping = 9').
+      and_yield('CPU: Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz (2793.59-MHz K8-class CPU)').
+      and_yield('  Origin="GenuineIntel"  Id=0x40661  Family=0x6  Model=0x46  Stepping=1').
       and_yield('  Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>').
-      and_yield('  Features2=0x209<SSE3,MON,SSSE3>').
+      and_yield('  Features2=0x5ed8220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AESNI,XSAVE,OSXSAVE,AVX,RDRAND>').
       and_yield('  AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>').
-      and_yield('  AMD Features2=0x1<LAHF>').
+      and_yield('  AMD Features2=0x21<LAHF,ABM>').
+      and_yield('  Structured Extended Features=0x2000<NFPUSG>').
       and_yield('  TSC: P-state invariant')
     allow(File).to receive(:open).with("/var/run/dmesg.boot").and_return(@double_file)
   end
 
   it "detects all CPU flags" do
     @plugin.run
-    expect(@plugin[:cpu][:flags]).to eq(%w{fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 mmx fxsr sse sse2 sse3 mon ssse3 syscall nx rdtscp lm lahf})
+    expect(@plugin[:cpu][:flags]).to eq(%w{fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 mmx fxsr sse sse2 sse3 pclmulqdq mon ssse3 cx16 sse4.1 sse4.2 movbe popcnt aesni xsave osxsave avx rdrand syscall nx rdtscp lm lahf abm nfpusg})
   end
 
-  it "detects all CPU model_name" do
+  it "detects CPU model_name" do
     @plugin.run
-    expect(@plugin[:cpu][:model_name]).to eq("Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz")
+    expect(@plugin[:cpu][:model_name]).to eq("Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz")
   end
 
-  it "detects all CPU mhz" do
+  it "detects CPU mhz" do
     @plugin.run
-    expect(@plugin[:cpu][:mhz]).to eq("3516.61")
+    expect(@plugin[:cpu][:mhz]).to eq("2793.59")
   end
 
-  it "detects all CPU vendor_id" do
+  it "detects CPU vendor_id" do
     @plugin.run
     expect(@plugin[:cpu][:vendor_id]).to eq("GenuineIntel")
   end
 
-  it "detects all CPU stepping" do
+  it "detects CPU family" do
     @plugin.run
-    expect(@plugin[:cpu][:stepping]).to eq("9")
+    expect(@plugin[:cpu][:family]).to eq("6")
   end
 
-  it "detects all CPU total" do
+  it "detects CPU model" do
+    @plugin.run
+    expect(@plugin[:cpu][:model]).to eq("70")
+  end
+
+  it "detects CPU stepping" do
+    @plugin.run
+    expect(@plugin[:cpu][:stepping]).to eq("1")
+  end
+
+  it "detects CPU total" do
     @plugin.run
     expect(@plugin[:cpu][:total]).to eq(2)
   end
 
 end
+
+describe Ohai::System, "FreeBSD cpu plugin on FreeBSD <=10.1" do
+  before(:each) do
+    @plugin = get_plugin("freebsd/cpu")
+    allow(@plugin).to receive(:collect_os).and_return(:freebsd)
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.ncpu").and_return(mock_shell_out(0, "2", ""))
+    @double_file = double("/var/run/dmesg.boot")
+    allow(@double_file).to receive(:each).
+      and_yield('CPU: Intel(R) Atom(TM) CPU N270   @ 1.60GHz (1596.03-MHz 686-class CPU)').
+      and_yield('  Origin = "GenuineIntel"  Id = 0x106c2  Family = 0x6  Model = 0x1c  Stepping = 2')
+    allow(File).to receive(:open).with("/var/run/dmesg.boot").and_return(@double_file)
+  end
+
+  it "detects CPU vendor_id" do
+    @plugin.run
+    expect(@plugin[:cpu][:vendor_id]).to eq("GenuineIntel")
+  end
+
+  it "detects CPU family" do
+    @plugin.run
+    expect(@plugin[:cpu][:family]).to eq("6")
+  end
+
+  it "detects CPU model" do
+    @plugin.run
+
+    expect(@plugin[:cpu][:model]).to eq("28")
+  end
+
+  it "detects CPU stepping" do
+    @plugin.run
+    expect(@plugin[:cpu][:stepping]).to eq("2")
+  end
+
+end

data/spec/unit/plugins/linux/virtualization_spec.rb

@@ -168,7 +168,41 @@ MSVPC
       expect(plugin[:virtualization][:systems][:virtualpc]).to eq("guest")
     end
 
-    it "sets vmware guest if dmidecode detects VMware Virtual Platform" do
+    it "sets hyperv guest if dmidecode detects Hyper-V or version 7.0" do
+      ms_hv_dmidecode=<<-MSHV
+System Information
+        Manufacturer: Microsoft Corporation
+        Product Name: Virtual Machine
+        Version: 7.0
+        Serial Number: 9242-2608-7031-8934-2088-5216-61
+        UUID: C2431A2D-D69C-244F-9DE8-CD5D09E0DA39
+        Wake-up Type: Power Switch
+MSHV
+      allow(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, ms_hv_dmidecode, ""))
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("hyperv")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:hyperv]).to eq("guest")
+    end
+
+    it "sets virtualserver guest if dmidecode detects version 5.0" do
+      ms_vs_dmidecode=<<-MSVS
+System Information
+  Manufacturer: Microsoft Corporation
+  Product Name: Virtual Machine
+  Version: 5.0
+  Serial Number: 1688-7189-5337-7903-2297-1012-52
+  UUID: D29974A4-BE51-044C-BDC6-EFBC4B87A8E9
+  Wake-up Type: Power Switch
+MSVS
+      allow(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, ms_vs_dmidecode, ""))
+      plugin.run
+      expect(plugin[:virtualization][:system]).to eq("virtualserver")
+      expect(plugin[:virtualization][:role]).to eq("guest")
+      expect(plugin[:virtualization][:systems][:virtualserver]).to eq("guest")
+    end
+
+    it "sets vmware guest if dmidecode detects VMware" do
       vmware_dmidecode=<<-VMWARE
 System Information
   Manufacturer: VMware, Inc.
@@ -187,7 +221,7 @@ VMWARE
       expect(plugin[:virtualization][:systems][:vmware]).to eq("guest")
     end
 
-    it "sets vbox guest if dmidecode detects Oracle Corporation" do
+    it "sets vbox guest if dmidecode detects VirtualBox" do
       vbox_dmidecode=<<-VBOX
 Base Board Information
   Manufacturer: Oracle Corporation
@@ -227,8 +261,8 @@ OPENSTACK
       expect(plugin[:virtualization][:systems][:openstack]).to eq("guest")
     end
 
-    it "sets kvm guest if dmidecode detects KVM" do
-      kvm_dmidecode=<<-KVM
+    it "sets kvm guest if dmidecode contains KVM" do
+      kvm_dmidecode=<<-RKVM
 System Information
   Manufacturer: Red Hat
   Product Name: KVM
@@ -238,7 +272,26 @@ System Information
   Wake-up Type: Power Switch
   SKU Number: Not Specified
   Family: Red Hat Enterprise Linux
-KVM
+RKVM
+      allow(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, kvm_dmidecode, ""))
+      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 "sets kvm guest if dmidecode detects RHEV" do
+      kvm_dmidecode=<<-RHEV
+System Information
+  Manufacturer: Red Hat
+  Product Name: RHEV Hypervisor
+  Version: 6.7-20150911.0.el6ev
+  Serial Number: 00000000-0000-0000-0000-000000000000
+  UUID: E7F1DC93-3DA1-4EC3-A6AB-F6904BA87985
+  Wake-up Type: Power Switch
+  SKU Number: Not Specified
+  Family: Red Hat Enterprise Linux
+RHEV
       allow(plugin).to receive(:shell_out).with("dmidecode").and_return(mock_shell_out(0, kvm_dmidecode, ""))
       plugin.run
       expect(plugin[:virtualization][:system]).to eq("kvm")

data/spec/unit/plugins/solaris2/filesystem.rb

@@ -0,0 +1,84 @@
+#
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative '../../../spec_helper'
+
+describe Ohai::System, "Solaris2.X filesystem plugin" do
+  let(:plugin) { get_plugin("solaris2/filesystem") }
+
+  before(:each) do
+    allow(plugin).to receive(:collect_os).and_return("solaris2")
+  end
+
+  describe "filesystem properties" do
+    let(:plugin_config) { {} }
+
+    before(:each) do
+      @original_plugin_config = Ohai.config[:plugin]
+      Ohai.config[:plugin] = plugin_config
+      allow(plugin).to receive(:shell_out).with("df -Pka").and_return(mock_shell_out(0, "", ""))
+      allow(plugin).to receive(:shell_out).with("df -na").and_return(mock_shell_out(0, "", ""))
+      allow(plugin).to receive(:shell_out).with("mount").and_return(mock_shell_out(0, "", ""))
+    end
+
+    after(:each) do
+      Ohai.config[:plugin] = @original_plugin_config
+    end
+
+    context "when 'zfs get' properties are not configured" do
+      it "collects all filesystem properties" do
+        expect(plugin).to receive(:shell_out).
+          with("zfs get -p -H all").
+          and_return(mock_shell_out(0, "", ""))
+        plugin.run
+      end
+    end
+
+    context "when 'zfs get' properties are configured" do
+      shared_examples_for "configured zfs properties" do
+        let(:plugin_config) do
+          {
+            :filesystem => {
+              :zfs_properties => zfs_properties
+            }
+          }
+        end
+
+        it "collects configured filesystem properties" do
+          expect(plugin).to receive(:shell_out).
+            with("zfs get -p -H #{expected_cmd}").
+            and_return(mock_shell_out(0, "", ""))
+          plugin.run
+        end
+      end
+
+      context "as a String" do
+        include_examples "configured zfs properties" do
+          let(:zfs_properties) { 'mountpoint,creation,available,used' }
+          let(:expected_cmd) { 'mountpoint,creation,available,used' }
+        end
+      end
+
+      context "as an Array" do
+        include_examples "configured zfs properties" do
+          let(:zfs_properties) { ['mountpoint', 'creation', 'available', 'used'] }
+          let(:expected_cmd) { 'mountpoint,creation,available,used' }
+        end
+      end
+    end
+  end
+end

data/spec/unit/plugins/virtualbox_spec.rb

@@ -0,0 +1,88 @@
+# Author:: Tim Smith (<tsmith@chef.io>)
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
+
+vbox_output = <<EOF
+Oracle VM VirtualBox Guest Additions Command Line Management Interface Version 5.0.2
+(C) 2008-2015 Oracle Corporation
+All rights reserved.
+
+Name: /VirtualBox/GuestInfo/OS/Product, value: Linux, timestamp: 1448390422246549000, flags: <NULL>
+Name: /VirtualBox/GuestInfo/Net/0/V4/IP, value: 10.0.2.15, timestamp: 1448390422248366000, flags: <NULL>
+Name: /VirtualBox/HostInfo/GUI/LanguageID, value: en_US, timestamp: 1448390412061749000, flags: <NULL>
+Name: /VirtualBox/GuestInfo/Net/0/MAC, value: 080027FBB38C, timestamp: 1448390422248652000, flags: <NULL>
+Name: /VirtualBox/GuestInfo/OS/ServicePack, value: <NULL>, timestamp: 1448390422246976000, flags: <NULL>
+Name: /VirtualBox/HostInfo/VBoxVerExt, value: 5.0.10, timestamp: 1448390411701508000, flags: TRANSIENT, RDONLYGUEST
+Name: /VirtualBox/GuestInfo/Net/0/V4/Netmask, value: 255.255.255.0, timestamp: 1448390422248569000, flags: <NULL>
+Name: /VirtualBox/GuestInfo/OS/Version, value: #36~14.04.1-Ubuntu SMP Thu Oct 8 10:21:08 UTC 2015, timestamp: 1448390422246810000, flags: <NULL>
+Name: /VirtualBox/GuestAdd/VersionExt, value: 5.0.2, timestamp: 1448390422247220000, flags: <NULL>
+Name: /VirtualBox/GuestAdd/Revision, value: 102096, timestamp: 1448390422247266000, flags: <NULL>
+Name: /VirtualBox/HostGuest/SysprepExec, value: <NULL>, timestamp: 1448390411701168000, flags: TRANSIENT, RDONLYGUEST
+Name: /VirtualBox/GuestInfo/OS/LoggedInUsers, value: 1, timestamp: 1448390452251425000, flags: TRANSIENT, TRANSRESET
+Name: /VirtualBox/GuestInfo/Net/0/Status, value: Up, timestamp: 1448390422248755000, flags: <NULL>
+Name: /VirtualBox/GuestInfo/Net/0/Name, value: eth0, timestamp: 1448390422248814000, flags: <NULL>
+Name: /VirtualBox/HostGuest/SysprepArgs, value: <NULL>, timestamp: 1448390411701220000, flags: TRANSIENT, RDONLYGUEST
+Name: /VirtualBox/GuestAdd/Version, value: 5.0.2, timestamp: 1448390422247066000, flags: <NULL>
+Name: /VirtualBox/HostInfo/VBoxRev, value: 104061, timestamp: 1448390411701536000, flags: TRANSIENT, RDONLYGUEST
+Name: /VirtualBox/GuestInfo/Net/0/V4/Broadcast, value: 10.0.2.255, timestamp: 1448390422248498000, flags: <NULL>
+Name: /VirtualBox/HostInfo/VBoxVer, value: 5.0.10, timestamp: 1448390411701485000, flags: TRANSIENT, RDONLYGUEST
+Name: /VirtualBox/GuestInfo/OS/LoggedInUsersList, value: tim, timestamp: 1448390452251274000, flags: TRANSIENT, TRANSRESET
+Name: /VirtualBox/GuestInfo/Net/Count, value: 1, timestamp: 1448391352440445000, flags: <NULL>
+Name: /VirtualBox/GuestInfo/OS/Release, value: 3.19.0-31-generic, timestamp: 1448390422246638000, flags: <NULL>
+Name: /VirtualBox/GuestInfo/OS/NoLoggedInUsers, value: false, timestamp: 1448390452251532000, flags: TRANSIENT, TRANSRESET
+EOF
+
+describe Ohai::System, 'plugin virtualbox' do
+  context 'when VBoxControl shellout fails' do
+    it 'should not set the virtualbox attribute' do
+      plugin = get_plugin('virtualbox')
+      allow(plugin).to receive(:shell_out).with('VBoxControl guestproperty enumerate').and_return(mock_shell_out(1, '', ''))
+      plugin.run
+      expect(plugin).not_to have_key(:virtualbox)
+    end
+  end
+
+  context 'when VBoxControl shellout succeeds' do
+    let(:plugin) { get_plugin('virtualbox') }
+
+    before(:each) do
+      allow(plugin).to receive(:shell_out).with('VBoxControl guestproperty enumerate').and_return(mock_shell_out(0, vbox_output, ''))
+      plugin.run
+    end
+
+    it 'should set the host version' do
+      expect(plugin[:virtualbox][:host][:version]).to eql('5.0.10')
+    end
+
+    it 'should set the host revision' do
+      expect(plugin[:virtualbox][:host][:revision]).to eql('104061')
+    end
+
+    it 'should set the host language' do
+      expect(plugin[:virtualbox][:host][:language]).to eql('en_US')
+    end
+
+    it 'should set the guest additions version' do
+      expect(plugin[:virtualbox][:guest][:guest_additions_version]).to eql('5.0.2')
+    end
+
+    it 'should set the guest additions revision' do
+      expect(plugin[:virtualbox][:guest][:guest_additions_revision]).to eql('102096')
+    end
+  end
+end

data/spec/unit/plugins/windows/cpu_spec.rb

@@ -70,6 +70,7 @@ describe Ohai::System, 'Windows cpu plugin' do
                      'manufacturer' => 'GenuineIntel',
                      'maxclockspeed' => 2793,
                      'numberofcores' => 1,
+                     'numberoflogicalprocessors' => 2,
                      'revision' => 17_921,
                      'stepping' => 9,
                      'l2cachesize' => 64 },
@@ -81,6 +82,7 @@ describe Ohai::System, 'Windows cpu plugin' do
                      'manufacturer' => 'GenuineIntel',
                      'maxclockspeed' => 2793,
                      'numberofcores' => 1,
+                     'numberoflogicalprocessors' => 2,
                      'revision' => 17_921,
                      'stepping' => 9,
                      'l2cachesize' => 64 }]
@@ -95,7 +97,7 @@ describe Ohai::System, 'Windows cpu plugin' do
   end
 
   it 'should set total cpu to 2' do
-    expect(@plugin[:cpu][:total]).to eq(2)
+    expect(@plugin[:cpu][:total]).to eq(4)
   end
 
   it 'should set real cpu to 2' do