ohai 8.6.0 → 8.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e00fe8c9c7789a01f275184d7cfe7a6bbc4a8631
-  data.tar.gz: 2368b6c70151bf9b89ee2dc2d3518a8d10add807
+  metadata.gz: 48005ef0ac4164194df7bc906291139ce7227895
+  data.tar.gz: 24932f3bfaa161f5d97e0131801b7f18e999a636
 SHA512:
-  metadata.gz: 9aa2d69b2544e9b270429795f02e3db9e8d2b978c16afba7fecfd377cfac3553c8da4a350a1e8d4edc55577c0a64d8d1d2266dc8135f1d354455494fb7b741c5
-  data.tar.gz: 523a0112f688c7536c5f4bff387ec0218f4ba8f0c97e995917dba271c2f41137c4793e572c826f3050ca577b4a0483c776c98376bd71a93913b61f388db8a79c
+  metadata.gz: f955882f73da2fc4ff1649f0664224bc6878ae78353883e94e08a36c379d2306da9fb2c632c3f0ed58d00a64ea2b271c98670356f0885410fc872695920c3755
+  data.tar.gz: 80adff5dccf6c1f7ef8afaefda644fc820bcf13f7919277d89f7c0d93388720dd32e961e5296343ee2456f8a86543f3330133dd31699f6c2baf57988c7dc5053

data/Gemfile

@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+gemspec
+
+group :development do
+  gem "chef", github: "chef/chef", branch: "master"
+
+  gem "sigar", :platform => "ruby"
+  gem 'plist'
+
+  # gem 'pry-byebug'
+  # gem 'pry-stack_explorer'
+end

data/lib/ohai/plugins/aix/network.rb

@@ -1,7 +1,8 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Isa Farnik (<isa@chef.io>)
+# Copyright:: Copyright (c) 2015 Chef, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,76 +46,78 @@ Ohai.plugin(:Network) do
     network Mash.new unless network
     network[:interfaces] = Mash.new unless network[:interfaces]
 
-    # :default_interface, :default_gateway - route -n get 0
-    so = shell_out("netstat -rn |grep default")
-    so.stdout.lines.each do |line|
-      items = line.split(' ')
-      if items[0] == "default"
-        network[:default_gateway] = items[1]
-        network[:default_interface] = items[5]
+    # We unfortunately have to do things a bit different here, if ohai is running
+    # within a WPAR. For instance, the WPAR isn't aware of some of its own networking
+    # minutia such as default gateway/route.
+    unless shell_out("uname -W").stdout.to_i > 0
+      # :default_interface, :default_gateway - route -n get 0
+      so = shell_out("netstat -rn |grep default")
+      so.stdout.lines.each do |line|
+        items = line.split(' ')
+        if items[0] == "default"
+          network[:default_gateway] = items[1]
+          network[:default_interface] = items[5]
+        end
       end
     end
 
-    # List the interfaces in system.
-    so = shell_out("lsdev -Cc if | grep Available")
-    so.stdout.lines.each do |line|
-      if line =~ /(\S+) (\S+)\s+(.+)/
-        interface = $1
-        iface[interface] = Mash.new unless iface[interface]
-        iface[interface][:state] = ($2 == 'Available' ? 'up' : 'down')
-        iface[interface][:description] = $3
-        
-        # Query the interface information
-        if_so = shell_out("ifconfig #{interface}")
-        if_so.stdout.lines.each do |line|
-          case line
-          when /^#{interface}:\sflags=\S+<(\S+)>/
-            iface[interface][:flags] = $1.split(',')
-            iface[interface][:metric] = $1 if line =~ /metric\s(\S+)/
-          else
-            # We have key value pairs.
-            if line =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/(\d{1,2}))?/
-              tmp_addr, tmp_prefix = $1, $3
-              if tmp_prefix.nil?
-                netmask = hex_to_dec_netmask($1) if line =~ /netmask\s(\S+)\s/
-                unless netmask
-                  tmp_prefix ||= "32"
-                  netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
-                end
-              else
+    # Splits the ifconfig output to 1 line per interface
+    if_so = shell_out("ifconfig -a")
+    if_so.stdout.gsub(/\n(\w+\d+)/, '___\1').split("___").each do |intraface|
+      splat = intraface.split(":")
+      interface = splat[0]
+      line = splat[1..-1][0]
+      iface[interface] = Mash.new
+      iface[interface][:state] = (line.include?("<UP,") ? 'up' : 'down')
+
+      intraface.lines.each do |lin|
+        case lin
+        when /flags=\S+<(\S+)>/
+          iface[interface][:flags] = $1.split(',')
+          iface[interface][:metric] = $1 if lin =~ /metric\s(\S+)/
+        else
+          # We have key value pairs.
+          if lin =~ /inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/(\d{1,2}))?/
+            tmp_addr, tmp_prefix = $1, $3
+            if tmp_prefix.nil?
+              netmask = hex_to_dec_netmask($1) if lin =~ /netmask\s(\S+)\s/
+              unless netmask
+                tmp_prefix ||= "32"
                 netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
               end
-              
-              iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
-              iface[interface][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
-              iface[interface][:addresses][tmp_addr][:netmask] = netmask
-              
-              if line =~ /broadcast\s(\S+)\s/
-                iface[interface][:addresses][tmp_addr][:broadcast] = $1
-              end
-            elsif line =~ /inet6 ([a-f0-9\:]+)%?([\d]*)\/?(\d*)/
-              # TODO do we have more properties on inet6 in aix? broadcast
-              iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
-              iface[interface][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }
             else
-              # load all key-values, example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
-              properties = line.split
-              n = properties.length/2 - 1
-              (0..n).each do |i|
-                iface[interface][properties[i*2]] = properties[(i*2+1)]
-              end
+              netmask = IPAddr.new("255.255.255.255").mask(tmp_prefix.to_i).to_s
             end
-          end
-        end #ifconfig stdout
 
-        # Query macaddress
-        e_so = shell_out("entstat -d #{interface} | grep \"Hardware Address\"")
-        iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
-        e_so.stdout.lines.each do |line|
-          iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" } if line =~ /Hardware Address: (\S+)/
+            iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
+            iface[interface][:addresses][tmp_addr] = { "family" => "inet", "prefixlen" => tmp_prefix }
+            iface[interface][:addresses][tmp_addr][:netmask] = netmask
+
+            if lin =~ /broadcast\s(\S+)\s/
+              iface[interface][:addresses][tmp_addr][:broadcast] = $1
+            end
+          elsif lin =~ /inet6 ([a-f0-9\:]+)%?([\d]*)\/?(\d*)?/
+            # TODO do we have more properties on inet6 in aix? broadcast
+            iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
+            iface[interface][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }
+          else
+            # load all key-values, example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
+            properties = lin.split
+            n = properties.length/2 - 1
+            (0..n).each do |i|
+              iface[interface][properties[i*2]] = properties[(i*2+1)]
+            end
+          end
         end
-      end  #lsdev stdout
-    end
+      end
+
+      # Query macaddress
+      e_so = shell_out("entstat -d #{interface} | grep \"Hardware Address\"")
+      iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
+      e_so.stdout.lines.each do |line|
+        iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" } if line =~ /Hardware Address: (\S+)/
+      end
+    end  #ifconfig stdout
 
     # Query routes information
     %w{inet inet6}.each do |family|
@@ -124,7 +127,7 @@ Ohai.plugin(:Network) do
           interface = $6
           iface[interface][:routes] = Array.new unless iface[interface][:routes]
           iface[interface][:routes] << Mash.new( :destination => $1, :family => family,
-                                                 :via => $2, :flags => $3)
+           :via => $2, :flags => $3)
         end
       end
     end
@@ -142,7 +145,8 @@ Ohai.plugin(:Network) do
         count += 1
       end
     end
-    
+
     network["interfaces"] = iface
   end
 end
+

data/lib/ohai/plugins/linux/cpu.rb

@@ -80,5 +80,6 @@ Ohai.plugin(:CPU) do
     cpu cpuinfo
     cpu[:total] = cpu_number
     cpu[:real] = real_cpu.keys.length
+    cpu[:cores] = real_cpu.keys.length * cpu["0"]["cores"].to_i
   end
 end

data/lib/ohai/plugins/linux/platform.rb

@@ -143,9 +143,18 @@ Ohai.plugin(:Platform) do
       # kernel release will be used - ex. 3.13
       platform_version `uname -r`.strip
     elsif os_release_file_is_cisco?
-      raise "unknown Cisco /etc/os-release ID field" unless os_release_info['ID'].include?('nexus')
-      raise "unknown Cisco /etc/os-release ID-LIKE field" unless os_release_info['ID_LIKE'].include?('wrlinux')
-      platform 'nexus'
+      raise 'unknown Cisco /etc/os-release or /etc/cisco-release ID_LIKE field' if
+        os_release_info['ID_LIKE'].nil? || ! os_release_info['ID_LIKE'].include?('wrlinux')
+
+      case os_release_info['ID']
+      when 'nexus'
+        platform 'nexus'
+      when 'ios_xr'
+        platform 'ios_xr'
+      else
+        raise 'unknown Cisco /etc/os-release or /etc/cisco-release ID field'
+      end
+
       platform_family 'wrlinux'
       platform_version os_release_info['VERSION']
     elsif lsb[:id] =~ /RedHat/i

data/lib/ohai/plugins/windows/cpu.rb

@@ -29,7 +29,7 @@ Ohai.plugin(:CPU) do
     wmi = WmiLite::Wmi.new
     processors = wmi.instances_of('Win32_Processor')
 
-    processors.find(:all).each do |processor|
+    processors.each do |processor|
       #
       # On Windows Server 2003 R2 (i.e. 5.2.*), numberofcores property 
       # doesn't exist on the Win32_Processor class unless the user has

data/lib/ohai/runner.rb

@@ -48,6 +48,8 @@ module Ohai
         end
       rescue Ohai::Exceptions::Error
         raise
+      rescue SystemExit # abort or exit from plug-in should exit Ohai with failure code
+        raise
       rescue Exception,Errno::ENOENT => e
         Ohai::Log.debug("Plugin #{plugin.name} threw exception #{e.inspect} #{e.backtrace.join("\n")}")
       end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '8.6.0'
+  VERSION = '8.7.0'
 end

data/spec/unit/plugins/abort_spec.rb

@@ -0,0 +1,69 @@
+#
+# Author:: Salim Alam (salam@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'))
+
+tmp = ENV['TMPDIR'] || ENV['TMP'] || ENV['TEMP'] || '/tmp'
+
+abortstr = <<EOF
+Ohai.plugin(:Abort) do
+  provides "abort_test"
+  collect_data do
+    abort
+  end
+end
+EOF
+
+describe "a plug-in that aborts execution" do
+  before(:all) do
+    begin
+      Dir.mkdir("#{tmp}/plugins")
+    rescue Errno::EEXIST
+      # ignore
+    end
+  end
+
+  before(:each) do
+    fail_file = File.open("#{tmp}/plugins/abort.rb", "w+")
+    fail_file.write(abortstr)
+    fail_file.close
+  end
+
+  after(:each) do
+    File.delete("#{tmp}/plugins/abort.rb")
+  end
+
+  after(:all) do
+    begin
+      Dir.delete("#{tmp}/plugins")
+    rescue
+      # ignore
+    end
+  end
+
+  before(:each) do
+    @ohai = Ohai::System.new
+    @loader = Ohai::Loader.new(@ohai)
+    @runner = Ohai::Runner.new(@ohai)
+  end
+
+  it "should raise SystemExit" do
+    @plugin = @loader.load_plugin("#{tmp}/plugins/abort.rb")
+    expect { @runner.run_plugin(@plugin) }.to raise_error(SystemExit)
+  end
+end

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

@@ -24,18 +24,21 @@ describe Ohai::System, "AIX network plugin" do
 default            172.31.8.1        UG        2    121789 en0      -      -
 NETSTAT_RN_GREP_DEFAULT
 
-    @lsdev_Cc_if = <<-LSDEV_CC_IF
-en0 Available  Standard Ethernet Network Interface
-LSDEV_CC_IF
-
-    @ifconfig_en0 = <<-IFCONFIG_EN0
+    @ifconfig = <<-IFCONFIG
 en0: flags=1e080863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN> metric 1
         inet 172.29.174.58 netmask 0xffffc000 broadcast 172.29.191.255
         inet 172.29.174.59 broadcast 172.29.191.255
         inet 172.29.174.60 netmask 0xffffc000 broadcast 172.29.191.255
         inet6 ::1%1/0
      tcp_sendspace 262144 tcp_recvspace 262144 rfc1323 1
-IFCONFIG_EN0
+en1: flags=1e084863,480<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,CHECKSUM_OFFLOAD(ACTIVE),CHAIN>
+        inet 172.31.10.211 netmask 0xfffffc00 broadcast 172.31.11.255
+         tcp_sendspace 262144 tcp_recvspace 262144 rfc1323 1
+lo0: flags=e08084b,c0<UP,BROADCAST,LOOPBACK,RUNNING,SIMPLEX,MULTICAST,GROUPRT,64BIT,LARGESEND,CHAIN>
+        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
 
     @netstat_nrf_inet = <<-NETSTAT_NRF_INET
 Destination        Gateway           Flags   Refs     Use  If   Exp  Groups
@@ -46,6 +49,13 @@ default            172.29.128.13     UG        0    587683 en0      -      -
 172.29.191.255     172.29.174.58     UHSb      0         1 en0      -      -
 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
+
     @aix_arp_an = <<-ARP_AN
   ? (172.29.131.16) at 6e:87:70:0:40:3 [ethernet] stored in bucket 16
 
@@ -66,10 +76,12 @@ ARP_AN
     @plugin = get_plugin("aix/network")
     allow(@plugin).to receive(:collect_os).and_return(:aix)
     @plugin[:network] = Mash.new
+    allow(@plugin).to receive(:shell_out).with("uname -W").and_return(mock_shell_out(0, "0", nil))
     allow(@plugin).to receive(:shell_out).with("netstat -rn |grep default").and_return(mock_shell_out(0, @netstat_rn_grep_default, nil))
-    allow(@plugin).to receive(:shell_out).with("lsdev -Cc if | grep Available").and_return(mock_shell_out(0, @lsdev_Cc_if, nil))
-    allow(@plugin).to receive(:shell_out).with("ifconfig en0").and_return(mock_shell_out(0, @ifconfig_en0, nil))
+    allow(@plugin).to receive(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @ifconfig, nil))
     allow(@plugin).to receive(:shell_out).with("entstat -d en0 | grep \"Hardware Address\"").and_return(mock_shell_out(0, "Hardware Address: be:42:80:00:b0:05", nil))
+    allow(@plugin).to receive(:shell_out).with("entstat -d en1 | grep \"Hardware Address\"").and_return(mock_shell_out(0, @entstat_err, nil))
+    allow(@plugin).to receive(:shell_out).with("entstat -d lo0 | grep \"Hardware Address\"").and_return(mock_shell_out(0, @entstat_err, nil))
     allow(@plugin).to receive(:shell_out).with("netstat -nrf inet").and_return(mock_shell_out(0, @netstat_nrf_inet, nil))
     allow(@plugin).to receive(:shell_out).with("netstat -nrf inet6").and_return(mock_shell_out(0, "::1%1  ::1%1  UH 1 109392 en0  -  -", nil))
     allow(@plugin).to receive(:shell_out).with("arp -an").and_return(mock_shell_out(0, @aix_arp_an, nil))
@@ -85,7 +97,7 @@ ARP_AN
     end
 
     it "detects the interfaces" do
-      expect(@plugin['network']['interfaces'].keys.sort).to eq(["en0"])
+      expect(@plugin['network']['interfaces'].keys.sort).to eq(["en0", "en1", "lo0"])
     end
 
     it "detects the ip addresses of the interfaces" do
@@ -93,17 +105,34 @@ ARP_AN
     end
   end
 
-  describe "netstat -rn |grep default" do
+  describe "when running on an LPAR" do
+    describe "netstat -rn |grep default" do
+      before do
+        @plugin.run
+      end
+
+      it "returns the default gateway of the system's network" do
+        expect(@plugin[:network][:default_gateway]).to eq('172.31.8.1')
+      end
+
+      it "returns the default interface of the system's network" do
+        expect(@plugin[:network][:default_interface]).to eq('en0')
+      end
+    end
+  end
+
+  describe "when running on a WPAR" do
     before do
+      allow(@plugin).to receive(:shell_out).with("uname -W").and_return(mock_shell_out(0, "6", nil))
       @plugin.run
     end
 
-    it "returns the default gateway of the system's network" do
-      expect(@plugin[:network][:default_gateway]).to eq('172.31.8.1')
+    it "avoids collecting routing information" do
+      expect(@plugin[:network][:default_gateway]).to be_nil
     end
 
-    it "returns the default interface of the system's network" do
-      expect(@plugin[:network][:default_interface]).to eq('en0')
+    it "avoids collecting default interface" do
+      expect(@plugin[:network][:default_gateway]).to be_nil
     end
   end
 
@@ -113,11 +142,6 @@ ARP_AN
       expect(@plugin['network']['interfaces']['en0'][:state]).to eq("up")
     end
 
-    it "detects the description of the interfaces in the system" do
-      @plugin.run
-      expect(@plugin['network']['interfaces']['en0'][:description]).to eq("Standard Ethernet Network Interface")
-    end
-
     describe "ifconfig interface" do
       it "detects the CHAIN network flag" do
         @plugin.run
@@ -173,7 +197,6 @@ ARP_AN
 
       context "inet6 entries" do
         before do
-          allow(@plugin).to receive(:shell_out).with("ifconfig en0").and_return(mock_shell_out(0, "inet6 ::1%1/0", nil))
           @plugin.run
           @inet_entry = @plugin['network']['interfaces']['en0'][:addresses]["::1"]
         end

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

@@ -89,6 +89,11 @@ describe Ohai::System, "General Linux cpu plugin" do
   end
   
   it_behaves_like "Common cpu info", 1, 0
+  
+  it "gets total cores" do
+    @plugin.run
+    expect(@plugin[:cpu][:cores]).to eql(0)
+  end
 
   it "doesn't have a cpu 1" do
     @plugin.run

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

@@ -650,17 +650,116 @@ CISCO_RELEASE
     end
   end
 
-  describe "on Wind River Linux for Cisco Nexus" do
+  describe '#read_os_release_info' do
+    let(:file_contents) { "COW=MOO\nDOG=\"BARK\"" }
+    it 'returns nil if the file does not exist' do
+      allow(File).to receive(:exist?).with('/etc/test-release').and_return(false)
+      expect(@plugin.read_os_release_info('/etc/test-release')).to be nil
+    end
+
+    it 'returns a hash of expected contents' do
+      allow(File).to receive(:exist?).with('/etc/test-release').and_return(true)
+      allow(File).to receive(:read).with('/etc/test-release').and_return(file_contents)
+      release_info = @plugin.read_os_release_info('/etc/test-release')
+
+      expect(release_info['COW']).to eq('MOO')
+      expect(release_info['DOG']).to eq('BARK')
+    end
+  end
+
+  describe '#os_release_info' do
+    context 'when CISCO_RELEASE_INFO is not populated' do
+      let(:release_info) { { 'ID' => 'os_id' } }
+
+      before do
+        allow(File).to receive(:exist?).with('/etc/os-release').and_return(true)
+        allow(@plugin).to receive(:read_os_release_info).with('/etc/os-release').and_return(release_info)
+      end
 
+      it 'reads the os-release file' do
+        expect(@plugin).to receive(:read_os_release_info).with('/etc/os-release').and_return(release_info)
+        @plugin.os_release_info
+      end
+
+      it 'returns a hash of expected contents' do
+        expect(@plugin.os_release_info['ID']).to eq('os_id')
+      end
+    end
+
+    context 'when CISCO_RELEASE_INFO is populated' do
+      let(:release_info) { { 'ID' => 'os_id', 'CISCO_RELEASE_INFO' => '/etc/cisco-release' } }
+      let(:cisco_release_info) { { 'ID' => 'cisco_id' } }
+
+      before do
+        allow(File).to receive(:exist?).with('/etc/os-release').and_return(true)
+        allow(File).to receive(:exist?).with('/etc/cisco-release').and_return(true)
+        allow(@plugin).to receive(:read_os_release_info).with('/etc/os-release').and_return(release_info)
+        allow(@plugin).to receive(:read_os_release_info).with('/etc/cisco-release').and_return(cisco_release_info)
+      end
+
+      it 'reads the os-release AND the cisco-release file' do
+        expect(@plugin).to receive(:read_os_release_info).with('/etc/os-release').and_return(release_info)
+        expect(@plugin).to receive(:read_os_release_info).with('/etc/cisco-release').and_return(release_info)
+        @plugin.os_release_info
+      end
+
+      it 'returns the ID from the cisco-release file instead of the os-release file' do
+        expect(@plugin.os_release_info['ID']).to eq('cisco_id')
+      end
+    end
+  end
+
+  describe 'on Wind River Linux 5 for Cisco Nexus' do
     let(:have_os_release) { true }
+    let(:os_release_info) do
+      {
+        'ID'                 => 'nexus',
+        'ID_LIKE'            => 'wrlinux',
+        'NAME'               => 'Nexus',
+        'VERSION'            => '7.0(3)I2(0.475E.6)',
+        'VERSION_ID'         => '7.0(3)I2',
+        'PRETTY_NAME'        => 'Nexus 7.0(3)I2',
+        'HOME_URL'           => 'http://www.cisco.com',
+        'BUILD_ID'           => '6',
+        'CISCO_RELEASE_INFO' => '/etc/os-release'
+      }
+    end
+
+    it 'should set platform to nexus and platform_family to wrlinux' do
+      allow(@plugin).to receive(:os_release_info).and_return(os_release_info)
+      @plugin.lsb = nil
+      @plugin.run
 
-    it "should set platform to nexus and platform_family to wrlinux" do
+      expect(@plugin[:platform]).to eq('nexus')
+      expect(@plugin[:platform_family]).to eq('wrlinux')
+      expect(@plugin[:platform_version]).to eq('7.0(3)I2(0.475E.6)')
+    end
+  end
+
+  describe 'on Wind River Linux 7 for Cisco IOS-XR' do
+    let(:have_os_release) { true }
+    let(:os_release_info) do
+      {
+        'ID'          => 'ios_xr',
+        'ID_LIKE'     => 'cisco-wrlinux wrlinux',
+        'NAME'        => 'IOS XR',
+        'VERSION'     => '6.0.0.14I',
+        'VERSION_ID'  => '6.0.0.14I',
+        'PRETTY_NAME' => 'Cisco IOS XR Software, Version 6.0.0.14I',
+        'BUILD_ID'    => '2015-09-10-15-50-17',
+        'HOME_URL'    => 'http://www.cisco.com',
+        'CISCO_RELEASE_INFO' => '/etc/os-release'
+      }
+    end
+
+    it 'should set platform to ios_xr and platform_family to wrlinux' do
+      allow(@plugin).to receive(:os_release_info).and_return(os_release_info)
       @plugin.lsb = nil
-      expect(File).to receive(:read).twice.with("/etc/os-release").and_return("ID=nexus\nID_LIKE=wrlinux\nNAME=Nexus\nVERSION=\"7.0(3)I2(0.475E.6)\"\nVERSION_ID=\"7.0(3)I2\"\nPRETTY_NAME=\"Nexus 7.0(3)I2\"\nHOME_URL=http://www.cisco.com\nBUILD_ID=6\nCISCO_RELEASE_INFO=/etc/os-release")
       @plugin.run
-      expect(@plugin[:platform]).to eq("nexus")
-      expect(@plugin[:platform_family]).to eq("wrlinux")
-      expect(@plugin[:platform_version]).to eq("7.0(3)I2(0.475E.6)")
+
+      expect(@plugin[:platform]).to eq('ios_xr')
+      expect(@plugin[:platform_family]).to eq('wrlinux')
+      expect(@plugin[:platform_version]).to eq('6.0.0.14I')
     end
   end
 end

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

@@ -0,0 +1,112 @@
+#
+# Author:: Salim Alam (<salam@chef.io>)
+# Copyright:: Copyright (c) 2015 Chef 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.dirname(__FILE__) + '/../../../spec_helper.rb')
+
+shared_examples 'a cpu' do |cpu_no|
+  describe "cpu #{cpu_no}" do
+    it "should set physical_id to CPU#{cpu_no}" do
+      expect(@plugin[:cpu]["#{cpu_no}"][:physical_id]).to eq("CPU#{cpu_no}")
+    end
+
+    it 'should set mhz to 2793' do
+      expect(@plugin[:cpu]["#{cpu_no}"][:mhz]).to eq('2793')
+    end
+
+    it 'should set vendor_id to GenuineIntel' do
+      expect(@plugin[:cpu]["#{cpu_no}"][:vendor_id]).to eq('GenuineIntel')
+    end
+
+    it 'should set model_name to Intel64 Family 6 Model 70 Stepping 1' do
+      expect(@plugin[:cpu]["#{cpu_no}"][:model_name])
+        .to eq('Intel64 Family 6 Model 70 Stepping 1')
+    end
+
+    it 'should set model to 17921' do
+      expect(@plugin[:cpu]["#{cpu_no}"][:model]).to eq('17921')
+    end
+
+    it 'should set family to 2' do
+      expect(@plugin[:cpu]["#{cpu_no}"][:family]).to eq('2')
+    end
+
+    it 'should set stepping to 9' do
+      expect(@plugin[:cpu]["#{cpu_no}"][:stepping]).to eq(9)
+    end
+
+    it 'should set cache_size to 64 KB' do
+      expect(@plugin[:cpu]["#{cpu_no}"][:cache_size]).to eq('64 KB')
+    end
+  end
+end
+
+describe Ohai::System, 'Windows cpu plugin' do
+  before(:each) do
+    @plugin = get_plugin('windows/cpu')
+    allow(@plugin).to receive(:collect_os).and_return(:windows)
+
+    @double_wmi = double(WmiLite::Wmi)
+    @double_wmi_instance = instance_double(WmiLite::Wmi)
+
+    @processors = [{ 'description' => 'Intel64 Family 6 Model 70 Stepping 1',
+                     'deviceid' => 'CPU0',
+                     'family' => 2,
+                     'l2cachesize' => 0,
+                     'manufacturer' => 'GenuineIntel',
+                     'maxclockspeed' => 2793,
+                     'numberofcores' => 1,
+                     'revision' => 17_921,
+                     'stepping' => 9,
+                     'l2cachesize' => 64 },
+
+                   { 'description' => 'Intel64 Family 6 Model 70 Stepping 1',
+                     'deviceid' => 'CPU1',
+                     'family' => 2,
+                     'l2cachesize' => 0,
+                     'manufacturer' => 'GenuineIntel',
+                     'maxclockspeed' => 2793,
+                     'numberofcores' => 1,
+                     'revision' => 17_921,
+                     'stepping' => 9,
+                     'l2cachesize' => 64 }]
+
+    allow(WmiLite::Wmi).to receive(:new).and_return(@double_wmi_instance)
+
+    allow(@double_wmi_instance).to receive(:instances_of)
+      .with('Win32_Processor')
+      .and_return(@processors)
+
+    @plugin.run
+  end
+
+  it 'should set total cpu to 2' do
+    expect(@plugin[:cpu][:total]).to eq(2)
+  end
+
+  it 'should set real cpu to 2' do
+    expect(@plugin[:cpu][:real]).to eq(2)
+  end
+
+  it 'should set 2 distinct cpus numbered 0 and 1' do
+    expect(@plugin[:cpu]).to have_key('0')
+    expect(@plugin[:cpu]).to have_key('1')
+  end
+
+  it_behaves_like 'a cpu', 0
+  it_behaves_like 'a cpu', 1
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.6.0
+  version: 8.7.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -275,6 +275,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -465,6 +466,7 @@ files:
 - spec/unit/mixin/ec2_metadata_spec.rb
 - spec/unit/mixin/softlayer_metadata_spec.rb
 - spec/unit/plugin_config_spec.rb
+- spec/unit/plugins/abort_spec.rb
 - spec/unit/plugins/aix/cpu_spec.rb
 - spec/unit/plugins/aix/filesystem_spec.rb
 - spec/unit/plugins/aix/hostname_spec.rb
@@ -562,6 +564,7 @@ files:
 - spec/unit/plugins/solaris2/zpools_spec.rb
 - spec/unit/plugins/ssh_host_keys_spec.rb
 - spec/unit/plugins/vmware_spec.rb
+- spec/unit/plugins/windows/cpu_spec.rb
 - spec/unit/plugins/windows/memory_spec.rb
 - spec/unit/plugins/windows/virtualization_spec.rb
 - spec/unit/provides_map_spec.rb
@@ -594,4 +597,3 @@ signing_key:
 specification_version: 4
 summary: Ohai profiles your system and emits JSON
 test_files: []
-has_rdoc: