ohai 14.15.0 → 15.0.35

data/spec/unit/application_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../spec_helper"
+require "spec_helper"
 require "ohai/application"
 
 RSpec.describe "Ohai::Application" do

data/spec/unit/config_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../spec_helper"
+require "spec_helper"
 require "ohai/config"
 
 RSpec.describe Ohai::Config do

data/spec/unit/dsl/plugin_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 shared_examples "Ohai::DSL::Plugin" do
   context "#initialize" do

data/spec/unit/hints_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../spec_helper.rb"
+require "spec_helper"
 
 describe "Ohai::Hints" do
   # We are using the plugins directory infrastructure to test hints
@@ -44,7 +44,7 @@ describe "Ohai::Hints" do
   when_plugins_directory "contains empty and full hints" do
     with_plugin("cloud.json", <<~EOF)
       {"name":"circus"}
-EOF
+    EOF
 
     with_plugin("cloud_empty.json", <<EOF)
 EOF

data/spec/unit/loader_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::Loader do
   extend IntegrationSupport
@@ -38,13 +38,13 @@ describe Ohai::Loader do
       Ohai.plugin(:Alpha) do
         provides "alpha"
       end
-EOF
+    EOF
 
     with_plugin("cookbook_b/beta.rb", <<~EOF)
       Ohai.plugin(:Beta) do
         provides "beta"
       end
-EOF
+    EOF
 
     describe "#load_additional" do
       it "adds the plugins to the map" do
@@ -63,13 +63,13 @@ EOF
       Ohai.plugins(:ExtraS) do
         provides "the_letter_s"
       end
-EOF
+    EOF
 
     with_plugin("no_method.rb", <<~EOF)
       Ohai.plugin(:NoMethod) do
         really_wants "this_attribute"
       end
-EOF
+    EOF
 
     with_plugin("illegal_def.rb", <<~EOF)
       Ohai.plugin(:Zoo) do
@@ -78,32 +78,32 @@ EOF
         collect_data(:darwin) do
         end
       end
-EOF
+    EOF
 
     with_plugin("unexpected_error.rb", <<~EOF)
       Ohai.plugin(:Zoo) do
         raise "You aren't expecting this."
       end
-EOF
+    EOF
 
     with_plugin("bad_symbol.rb", <<~EOF)
       Ohai.plugin(:1nval!d) do
         provides "not_a_symbol"
       end
-EOF
+    EOF
 
     with_plugin("no_end.rb", <<~EOF)
       Ohai.plugin(:NoEnd) do
         provides "fish_oil"
         collect_data do
       end
-EOF
+    EOF
 
     with_plugin("bad_name.rb", <<~EOF)
       Ohai.plugin(:you_give_plugins_a_bad_name) do
         provides "that/one/song"
       end
-EOF
+    EOF
 
     describe "load_plugin() method" do
       describe "when the plugin uses Ohai.plugin instead of Ohai.plugins" do
@@ -185,9 +185,9 @@ EOF
 
       describe "when plugin directory does not exist" do
         it "logs an invalid plugin path warning" do
-          expect(Ohai::Log).to receive(:info).with(/The plugin path.*does not exist/)
+          expect(Ohai::Log).to receive(:debug).with(/The plugin path.*does not exist/)
           allow(Dir).to receive(:exist?).with("/bogus/dir").and_return(false)
-          Ohai::Loader::PluginFile.find_all_in("/bogus/dir")
+          loader.plugin_files_by_dir("/bogus/dir")
         end
       end
     end

data/spec/unit/mixin/azure_metadata_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 require "ohai/mixin/azure_metadata"
 
 describe Ohai::Mixin::AzureMetadata do

data/spec/unit/mixin/command_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::Mixin::Command, "shell_out" do
   let(:cmd) { "sparkle-dream --version" }

data/spec/unit/mixin/dmi_decode.rb

@@ -0,0 +1,68 @@
+#
+# Author:: Tim Smith (tsmith@chef.io)
+# Copyright:: Copyright (c) 2018 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 "spec_helper"
+require "ohai/mixin/dmi_decode"
+
+describe Ohai::Mixin::DmiDecode, "guest_from_dmi_data" do
+  let(:mixin) { Object.new.extend(Ohai::Mixin::DmiDecode) }
+
+  # for the full DMI data used in these tests see https://github.com/chef/dmidecode_collection
+  {
+    xen: ["Xen", "HVM domU", "4.2.amazon"],
+    vmware: ["VMware, Inc.", "VMware Virtual Platform", "None"],
+    hyperv: ["Microsoft", "Virtual Machine", "7.0"],
+    amazonec2: ["Amazon EC2", "c5n.large", "Not Specified"],
+    veertu: ["Veertu", "Veertu", "Not Specified"],
+    parallels: ["Parallels Software International Inc.", "Parallels Virtual Platform", "None"],
+    vbox: ["Oracle Corporation", "VirtualBox", "1.2"],
+    openstack: ["Red Hat Inc.", "OpenStack Nova", "2014.1.2-1.el6"],
+    kvm: ["Red Hat", "KVM", "RHEL 7.0.0 PC (i440FX + PIIX, 1996"],
+    bhyve: ["", "BHYVE", "1.0"],
+  }.each_pair do |hypervisor, values|
+    describe "when passed #{hypervisor} dmi data" do
+      it "returns '#{hypervisor}'" do
+        expect(mixin.guest_from_dmi_data(values[0], values[1], values[2])).to eq("#{hypervisor}")
+      end
+    end
+  end
+
+  describe "When running on RHEV Hypervisor" do
+    it "returns 'kvm'" do
+      expect(mixin.guest_from_dmi_data("Red Hat", "RHEV Hypervisor", "6.7-20150911.0.el6ev")).to eq("kvm")
+    end
+  end
+
+  describe "When the manufactuer is 'QEMU'" do
+    it "return kvm" do
+      expect(mixin.guest_from_dmi_data("QEMU", "", "")).to eq("kvm")
+    end
+  end
+
+  describe "returns nil if manufactuer is 'Microsoft', but product is not 'Virtual Machine'" do
+    it "returns nil" do
+      expect(mixin.guest_from_dmi_data("Microsot", "Zune", "2018")).to be_nil
+    end
+  end
+
+  describe "When running on an unkown system" do
+    it "returns nil" do
+      expect(mixin.guest_from_dmi_data("TimCorp", "SuperServer", "2018")).to be_nil
+    end
+  end
+end

data/spec/unit/mixin/ec2_metadata_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 require "ohai/mixin/ec2_metadata"
 
 describe Ohai::Mixin::Ec2Metadata do

data/spec/unit/mixin/softlayer_metadata_spec.rb

@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 require "ohai/mixin/softlayer_metadata"
 
 describe ::Ohai::Mixin::SoftlayerMetadata do

data/spec/unit/plugin_config_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../spec_helper"
+require "spec_helper"
 require "ohai/plugin_config"
 
 describe "Ohai::PluginConfig" do

data/spec/unit/plugins/abort_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 tmp = ENV["TMPDIR"] || ENV["TMP"] || ENV["TEMP"] || "/tmp"
 
@@ -31,11 +31,11 @@ EOF
 
 describe "a plug-in that aborts execution" do
   before(:all) do
-    begin
-      Dir.mkdir("#{tmp}/plugins")
-    rescue Errno::EEXIST
+
+    Dir.mkdir("#{tmp}/plugins")
+  rescue Errno::EEXIST
       # ignore
-    end
+
   end
 
   before(:each) do
@@ -49,11 +49,11 @@ describe "a plug-in that aborts execution" do
   end
 
   after(:all) do
-    begin
-      Dir.delete("#{tmp}/plugins")
-    rescue
+
+    Dir.delete("#{tmp}/plugins")
+  rescue
       # ignore
-    end
+
   end
 
   before(:each) do

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

@@ -16,14 +16,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "AIX cpu plugin" do
   before(:each) do
     @lsdev_cc_processor = <<~LSDEV_CC_PROCESSOR
       proc0 Available 00-00 Processor
       proc4 Defined   00-04 Processor
-LSDEV_CC_PROCESSOR
+    LSDEV_CC_PROCESSOR
 
     @lsattr_el_proc0 = <<~LSATTR_EL
       frequency   1654344000     Processor Speed       False
@@ -31,14 +31,14 @@ LSDEV_CC_PROCESSOR
       smt_threads 2              Processor SMT threads False
       state       enable         Processor state       False
       type        PowerPC_POWER5 Processor type        False
-LSATTR_EL
+    LSATTR_EL
 
     @pmcycles_m = <<~PMCYCLES_M
       CPU 0 runs at 1654 MHz
       CPU 1 runs at 1654 MHz
       CPU 2 runs at 1654 MHz
       CPU 3 runs at 1654 MHz
-PMCYCLES_M
+    PMCYCLES_M
 
     @plugin = get_plugin("cpu")
     allow(@plugin).to receive(:collect_os).and_return(:aix)

data/spec/unit/plugins/aix/filesystem_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "AIX filesystem plugin" do
   before(:each) do
@@ -45,7 +45,7 @@ describe Ohai::System, "AIX filesystem plugin" do
       /dev/fslv10       5242880     42884   5199996       1% /wpars/toolchain-tester-5c969f/tmp
       /dev/fslv11       5242880   2725048   2517832      52% /wpars/toolchain-tester-5c969f/usr
       /dev/fslv12      10485760    272376  10213384       3% /wpars/toolchain-tester-5c969f/var
-DF_PK
+    DF_PK
 
     @df_pk_wpar = <<~DF_PK
       Filesystem    1024-blocks      Used Available Capacity Mounted on
@@ -56,7 +56,7 @@ DF_PK
       Global            5242880     42884   5199996       1% /tmp
       Global            5242880   2725048   2517832      52% /usr
       Global           10485760    272376  10213384       3% /var
-DF_PK
+    DF_PK
 
     @mount_lpar = <<~MOUNT
         node       mounted        mounted over    vfs       date        options
@@ -70,7 +70,7 @@ DF_PK
                /proc            /proc            procfs Jul 17 13:22 rw
                /dev/hd10opt     /opt             jfs2   Jul 17 13:22 rw,log=/dev/hd8
       192.168.1.11 /stage/middleware1 /stage/middleware2 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
-MOUNT
+    MOUNT
 
     @mount_wpar = <<~MOUNT
         node       mounted        mounted over    vfs       date        options
@@ -83,7 +83,7 @@ MOUNT
                Global           /usr             jfs2   Nov 23 21:03 rw,log=NULL
                Global           /var             jfs2   Nov 23 21:03 rw,log=NULL
       192.168.1.11 /stage/middleware3 /stage/middleware4 nfs3   Jul 17 13:24 ro,bg,hard,intr,sec=sys
-MOUNT
+    MOUNT
 
     @plugin = get_plugin("filesystem")
     allow(@plugin).to receive(:collect_os).and_return(:aix)

data/spec/unit/plugins/aix/hostname_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "AIX hostname plugin" do
   before(:each) do

data/spec/unit/plugins/aix/kernel_spec.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "AIX kernel plugin" do
   before(:each) do

data/spec/unit/plugins/aix/memory_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "AIX memory plugin" do
   before(:each) do

data/spec/unit/plugins/aix/network_spec.rb

@@ -16,14 +16,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "AIX network plugin" do
 
   before(:each) do
     @netstat_rn_grep_default = <<~NETSTAT_RN_GREP_DEFAULT
       default            172.31.8.1        UG        2    121789 en0      -      -
-NETSTAT_RN_GREP_DEFAULT
+    NETSTAT_RN_GREP_DEFAULT
 
     @ifconfig = <<~IFCONFIG
       en0: flags=1e080863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN> metric 1
@@ -39,7 +39,7 @@ NETSTAT_RN_GREP_DEFAULT
               inet 127.0.0.1 netmask 0xff000000 broadcast 127.255.255.255
               inet6 ::1%1/0
                tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1
-IFCONFIG
+    IFCONFIG
 
     @netstat_nrf_inet = <<~NETSTAT_NRF_INET
       Destination        Gateway           Flags   Refs     Use  If   Exp  Groups
@@ -48,14 +48,14 @@ IFCONFIG
       172.29.128.0       172.29.174.58     UHSb      0         0 en0      -      -   =>
       172.29.128/18      172.29.174.58     U         7   1035485 en0      -      -
       172.29.191.255     172.29.174.58     UHSb      0         1 en0      -      -
-NETSTAT_NRF_INET
+    NETSTAT_NRF_INET
 
     @entstat_err = <<~ENSTAT_ERR
 
 
       entstat: 0909-002 Unable to open device en0, errno = 13
       grep: 0652-033 Cannot open Address".
-ENSTAT_ERR
+    ENSTAT_ERR
 
     @aix_arp_an = <<~ARP_AN
         ? (172.29.131.16) at 6e:87:70:0:40:3 [ethernet] stored in bucket 16
@@ -72,7 +72,7 @@ ENSTAT_ERR
 
       bucket:    0     contains:    0 entries
       There are 6 entries in the arp table.
-ARP_AN
+    ARP_AN
 
     @plugin = get_plugin("aix/network")
     allow(@plugin).to receive(:collect_os).and_return(:aix)