ohai 8.16.0 → 8.17.0

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

@@ -31,15 +31,41 @@ serio_raw              13031  0
 virtio_balloon         13168  0
 floppy                 55441  0
 ENV_LSMOD
+    @version_module = {
+      dm_crypt: "",
+      psmouse: "",
+      acpiphp: "",
+      microcode: "1.2.3",
+      serio_raw: "",
+      virtio_balloon: "",
+      floppy: "",
+    }
+
+    @expected_result = {
+      "dm_crypt"       => { "size" => "22321", "refcount" => "0" },
+      "psmouse"        => { "size" => "81038", "refcount" => "0" },
+      "acpiphp"        => { "size" => "23314", "refcount" => "0" },
+      "microcode"      => { "size" => "18286", "refcount" => "0", "version" => "1.2.3" },
+      "serio_raw"      => { "size" => "13031", "refcount" => "0" },
+      "virtio_balloon" => { "size" => "13168", "refcount" => "0" },
+      "floppy"         => { "size" => "55441", "refcount" => "0" },
+    }
     @plugin = get_plugin("kernel")
     allow(@plugin).to receive(:collect_os).and_return(:linux)
     allow(@plugin).to receive(:init_kernel).and_return({})
     allow(@plugin).to receive(:shell_out).with("uname -o").and_return(mock_shell_out(0, "Linux", ""))
     allow(@plugin).to receive(:shell_out).with("env lsmod").and_return(mock_shell_out(0, @env_lsmod, ""))
+    @version_module.each do |mod, vers|
+      allow(File).to receive(:exist?).with("/sys/module/#{mod}/version").and_return(true)
+      allow(File).to receive(:read).with("/sys/module/#{mod}/version").and_return(vers)
+    end
     expect(@plugin).to receive(:shell_out).with("env lsmod").at_least(1).times
     @plugin.run
   end
 
   it_should_check_from_deep_mash("linux::kernel", "kernel", "os", "uname -o", [0, "Linux", ""])
 
+  it "collects linux::kernel::modules" do
+    expect(@plugin.data["kernel"]["modules"]).to eq(@expected_result)
+  end
 end

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

@@ -336,6 +336,22 @@ Settings for eth0:
         Current message level: 0x00000007 (7)
                                drv probe link
         Link detected: yes
+EOM
+  }
+
+  let(:linux_ethtool_g) { <<-EOM
+Ring parameters for eth0:
+Pre-set maximums:
+RX:		8192
+RX Mini:	0
+RX Jumbo:	0
+TX:		8192
+Current hardware settings:
+RX:		8192
+RX Mini:	0
+RX Jumbo:	0
+TX:		8192
+
 EOM
   }
 
@@ -352,7 +368,8 @@ EOM
     allow(plugin).to receive(:shell_out).with("route -n").and_return(mock_shell_out(0, linux_route_n, ""))
     allow(plugin).to receive(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, linux_ifconfig, ""))
     allow(plugin).to receive(:shell_out).with("arp -an").and_return(mock_shell_out(0, linux_arp_an, ""))
-    allow(plugin).to receive(:shell_out).with(/ethtool/).and_return(mock_shell_out(0, linux_ethtool, ""))
+    allow(plugin).to receive(:shell_out).with(/ethtool -g/).and_return(mock_shell_out(0, linux_ethtool_g, ""))
+    allow(plugin).to receive(:shell_out).with(/ethtool [^\-]/).and_return(mock_shell_out(0, linux_ethtool, ""))
   end
 
   describe "#iproute2_binary_available?" do
@@ -554,6 +571,10 @@ EOM
         expect(plugin["network"]["interfaces"]["eth0"]["transceiver"]).to eq("external")
         expect(plugin["network"]["interfaces"]["eth0"]["auto_negotiation"]).to eq("on")
         expect(plugin["network"]["interfaces"]["eth0"]["mdi_x"]).to be_nil
+        expect(plugin["network"]["interfaces"]["eth0"]["ring_params"]["max_tx"]).to eq(8192)
+        expect(plugin["network"]["interfaces"]["eth0"]["ring_params"]["max_rx"]).to eq(8192)
+        expect(plugin["network"]["interfaces"]["eth0"]["ring_params"]["current_tx"]).to eq(8192)
+        expect(plugin["network"]["interfaces"]["eth0"]["ring_params"]["current_rx"]).to eq(8192)
       end
 
       it "detects the ipv4 addresses of the ethernet interface" do
@@ -808,6 +829,10 @@ EOM
       expect(plugin["network"]["interfaces"]["eth3"]["state"]).to eq("up")
     end
 
+    it "detects tags on v6 addresses of the ethernet interface" do
+      expect(plugin["network"]["interfaces"]["eth0"]["addresses"]["2001:44b8:4160:8f00:a00:27ff:fe13:eacd"]["tags"]).to eq(["dynamic"])
+    end
+
     describe "when IPv6 is disabled" do
       before :each do
         allow(File).to receive(:exist?).with("/proc/net/if_inet6").and_return(false)

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

@@ -217,11 +217,16 @@ describe Ohai::System, "Linux plugin platform" do
     end
 
     it "should set platform and platform_family to gentoo" do
-      expect(File).to receive(:read).with("/etc/gentoo-release").and_return("Gentoo Base System release 1.20.1.1")
       @plugin.run
       expect(@plugin[:platform]).to eq("gentoo")
       expect(@plugin[:platform_family]).to eq("gentoo")
     end
+
+    it "should set platform_version to kernel release" do
+      expect(@plugin).to receive(:`).with("uname -r").and_return("3.18.7-gentoo")
+      @plugin.run
+      expect(@plugin[:platform_version]).to eq("3.18.7-gentoo")
+    end
   end
 
   describe "on alpine" do

data/spec/unit/plugins/packages_spec.rb

@@ -27,6 +27,8 @@ describe Ohai::System, "plugin packages" do
       end
     end
 
+    let(:format) { '${Package}\t${Version}\t${Architecture}\n' }
+
     let(:stdout) do
       File.read(File.join(SPEC_PLUGIN_PATH, "dpkg-query.output"))
     end
@@ -34,20 +36,26 @@ describe Ohai::System, "plugin packages" do
     before(:each) do
       allow(plugin).to receive(:collect_os).and_return(:linux)
       allow(plugin).to receive(:shell_out)
-        .with("dpkg-query -W")
+        .with("dpkg-query -W -f='#{format}'")
         .and_return(mock_shell_out(0, stdout, ""))
       plugin.run
     end
 
     it "calls dpkg query" do
       expect(plugin).to receive(:shell_out)
-        .with("dpkg-query -W")
+        .with("dpkg-query -W -f='#{format}'")
         .and_return(mock_shell_out(0, stdout, ""))
       plugin.run
     end
 
-    it "gets packages and versions" do
-      expect(plugin[:packages]["vim-common"][:version]).to eq("2:7.4.052-1ubuntu3")
+    it "gets packages and versions - arch" do
+      expect(plugin[:packages]["libc6"][:version]).to eq("2.19-18+deb8u3")
+      expect(plugin[:packages]["libc6"][:arch]).to eq("amd64")
+    end
+
+    it "gets packages and versions - noarch" do
+      expect(plugin[:packages]["tzdata"][:version]).to eq("2015g-0+deb8u1")
+      expect(plugin[:packages]["tzdata"][:arch]).to eq("all")
     end
   end
 
@@ -58,7 +66,7 @@ describe Ohai::System, "plugin packages" do
       end
     end
 
-    let(:format) { Shellwords.escape '%{NAME}\t%{VERSION}\t%{RELEASE}\n' }
+    let(:format) { '%{NAME}\t%|EPOCH?{%{EPOCH}}:{0}|\t%{VERSION}\t%{RELEASE}\t%{INSTALLTIME}\t%{ARCH}\n' }
 
     let(:stdout) do
       File.read(File.join(SPEC_PLUGIN_PATH, "rpmquery.output"))
@@ -66,20 +74,31 @@ describe Ohai::System, "plugin packages" do
 
     before(:each) do
       allow(plugin).to receive(:collect_os).and_return(:linux)
-      allow(plugin).to receive(:shell_out).with("rpm -qa --queryformat #{format}").and_return(mock_shell_out(0, stdout, ""))
+      allow(plugin).to receive(:shell_out).with("rpm -qa --qf '#{format}'").and_return(mock_shell_out(0, stdout, ""))
       plugin.run
     end
 
     it "calls rpm -qa" do
       expect(plugin).to receive(:shell_out)
-        .with("rpm -qa --queryformat #{format}")
+        .with("rpm -qa --qf '#{format}'")
         .and_return(mock_shell_out(0, stdout, ""))
       plugin.run
     end
 
-    it "gets packages and versions/release" do
-      expect(plugin[:packages]["vim-common"][:version]).to eq("7.2.411")
-      expect(plugin[:packages]["vim-common"][:release]).to eq("1.8.el6")
+    it "gets packages and versions/release - arch" do
+      expect(plugin[:packages]["glibc"][:version]).to eq("2.17")
+      expect(plugin[:packages]["glibc"][:release]).to eq("106.el7_2.6")
+      expect(plugin[:packages]["glibc"][:epoch]).to eq("0")
+      expect(plugin[:packages]["glibc"][:installdate]).to eq("1463486666")
+      expect(plugin[:packages]["glibc"][:arch]).to eq("x86_64")
+    end
+
+    it "gets packages and versions/release - noarch" do
+      expect(plugin[:packages]["tzdata"][:version]).to eq("2016d")
+      expect(plugin[:packages]["tzdata"][:release]).to eq("1.el7")
+      expect(plugin[:packages]["tzdata"][:epoch]).to eq("0")
+      expect(plugin[:packages]["tzdata"][:installdate]).to eq("1463486618")
+      expect(plugin[:packages]["tzdata"][:arch]).to eq("noarch")
     end
   end
 
@@ -193,6 +212,31 @@ describe Ohai::System, "plugin packages" do
     end
   end
 
+  context "on freebsd" do
+    let(:plugin) { get_plugin("packages") }
+
+    let(:stdout) do
+      File.read(File.join(SPEC_PLUGIN_PATH, "pkg-query.output"))
+    end
+
+    before(:each) do
+      allow(plugin).to receive(:collect_os).and_return(:freebsd)
+      allow(plugin).to receive(:shell_out).with('pkg query -a "%n %v"').and_return(mock_shell_out(0, stdout, ""))
+      plugin.run
+    end
+
+    it 'calls pkg query -a "%n %v"' do
+      expect(plugin).to receive(:shell_out)
+        .with('pkg query -a "%n %v"')
+        .and_return(mock_shell_out(0, stdout, ""))
+      plugin.run
+    end
+
+    it "gets packages with version" do
+      expect(plugin[:packages]["rubygem-chef"][:version]).to eq("12.6.0_1")
+    end
+  end
+
   context "on solaris2" do
     let(:plugin) { get_plugin("packages") }
 

data/spec/unit/plugins/timezone_spec.rb

@@ -0,0 +1,30 @@
+#
+# Author:: John Bellone (<jbellone@bloomberg.net>)
+# 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.dirname(__FILE__) + "/../../spec_helper.rb")
+
+describe Ohai::System, "timezone plugin" do
+  before(:each) do
+    @plugin = get_plugin("timezone")
+    allow(Time).to receive_message_chain(:now, :getlocal, :zone) { "ZZZ" }
+  end
+
+  it "should get the local timezone" do
+    @plugin.run
+    expect(@plugin["timezone"]).to eq("ZZZ")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.16.0
+  version: 8.17.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -422,6 +422,7 @@ files:
 - lib/ohai/plugins/solaris2/virtualization.rb
 - lib/ohai/plugins/solaris2/zpools.rb
 - lib/ohai/plugins/ssh_host_key.rb
+- lib/ohai/plugins/timezone.rb
 - lib/ohai/plugins/uptime.rb
 - lib/ohai/plugins/virtualbox.rb
 - lib/ohai/plugins/virtualization.rb
@@ -460,6 +461,7 @@ files:
 - spec/data/plugins/node.output
 - spec/data/plugins/perl.output
 - spec/data/plugins/php.output
+- spec/data/plugins/pkg-query.output
 - spec/data/plugins/pkginfo.output
 - spec/data/plugins/pkglist.output
 - spec/data/plugins/python.output
@@ -593,6 +595,7 @@ files:
 - spec/unit/plugins/solaris2/virtualization_spec.rb
 - spec/unit/plugins/solaris2/zpools_spec.rb
 - spec/unit/plugins/ssh_host_keys_spec.rb
+- spec/unit/plugins/timezone_spec.rb
 - spec/unit/plugins/virtualbox_spec.rb
 - spec/unit/plugins/vmware_spec.rb
 - spec/unit/plugins/windows/cpu_spec.rb