ohai 6.24.2 → 7.0.0.rc.0

data/spec/unit/plugins/root_group_spec.rb

@@ -18,11 +18,9 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-ORIGINAL_CONFIG_HOST_OS = ::RbConfig::CONFIG['host_os']
-
 describe Ohai::System, 'root_group' do
   before(:each) do
-    @ohai = Ohai::System.new
+    @plugin = get_plugin("root_group")
   end
 
   describe 'unix platform', :unix_only do
@@ -31,49 +29,49 @@ describe Ohai::System, 'root_group' do
       # apparently didn't apply to this api. we're just trying to fake
       # Etc.getgrgid(Etc.getpwnam('root').gid).name
       @pwnam = Object.new
-      @pwnam.stub!(:gid).and_return(0)
-      Etc.stub!(:getpwnam).with('root').and_return(@pwnam)
+      @pwnam.stub(:gid).and_return(0)
+      Etc.stub(:getpwnam).with('root').and_return(@pwnam)
       @grgid = Object.new
-      Etc.stub!(:getgrgid).and_return(@grgid)
+      Etc.stub(:getgrgid).and_return(@grgid)
     end
 
     describe 'with wheel group' do
       before(:each) do
-        @grgid.stub!(:name).and_return('wheel')
+        @grgid.stub(:name).and_return('wheel')
       end
       it 'should have a root_group of wheel' do
-        @ohai._require_plugin('root_group')
-        @ohai[:root_group].should == 'wheel'
+        @plugin.run
+        @plugin[:root_group].should == 'wheel'
       end
     end
 
     describe 'with root group' do
       before(:each) do
-        @grgid.stub!(:name).and_return('root')
+        @grgid.stub(:name).and_return('root')
       end
       it 'should have a root_group of root' do
-        @ohai._require_plugin('root_group')
-        @ohai[:root_group].should == 'root'
+        @plugin.run
+        @plugin[:root_group].should == 'root'
       end
     end
 
     describe 'platform hpux with sys group' do
       before(:each) do
-        @pwnam.stub!(:gid).and_return(3)
-        @grgid.stub!(:name).and_return('sys')
+        @pwnam.stub(:gid).and_return(3)
+        @grgid.stub(:name).and_return('sys')
       end
       it 'should have a root_group of sys' do
-        @ohai._require_plugin('root_group')
-        @ohai[:root_group].should == 'sys'
+        @plugin.run
+        @plugin[:root_group].should == 'sys'
       end
     end
     describe 'platform aix with system group' do
       before(:each) do
-        @grgid.stub!(:name).and_return('system')
+        @grgid.stub(:name).and_return('system')
       end
       it 'should have a root_group of system' do
-        @ohai._require_plugin('root_group')
-        @ohai[:root_group].should == 'system'
+        @plugin.run
+        @plugin[:root_group].should == 'system'
       end
     end
   end

data/spec/unit/plugins/ruby_spec.rb

@@ -19,17 +19,16 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
-ruby_bin = File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])
+ruby_bin = File.join(::RbConfig::CONFIG['bindir'], ::RbConfig::CONFIG['ruby_install_name'])
 
 describe Ohai::System, "plugin ruby" do
 
   before(:all) do
-    @ohai = Ohai::System.new
-    @ohai[:languages] = Mash.new
+    @plugin = get_plugin("ruby")
+    @plugin[:languages] = Mash.new
+    @plugin.run
 
-    @ohai.require_plugin("ruby")
-
-    @ruby_ohai_data_pristine = @ohai[:languages][:ruby]
+    @ruby_ohai_data_pristine = @plugin[:languages][:ruby]
   end
 
   before(:each) do
@@ -40,16 +39,16 @@ describe Ohai::System, "plugin ruby" do
     :platform => RUBY_PLATFORM,
     :version => RUBY_VERSION,
     :release_date => RUBY_RELEASE_DATE,
-    :target => ::Config::CONFIG['target'],
-    :target_cpu => ::Config::CONFIG['target_cpu'],
-    :target_vendor => ::Config::CONFIG['target_vendor'],
-    :target_os => ::Config::CONFIG['target_os'],
-    :host => ::Config::CONFIG['host'],
-    :host_cpu => ::Config::CONFIG['host_cpu'],
-    :host_os => ::Config::CONFIG['host_os'],
-    :host_vendor => ::Config::CONFIG['host_vendor'],
-    :gems_dir => %x{#{ruby_bin} #{::Config::CONFIG['bindir']}/gem env gemdir}.chomp!,
-    :gem_bin => [ ::Gem.default_exec_format % 'gem', 'gem' ].map{|bin| "#{::Config::CONFIG['bindir']}/#{bin}"
+    :target => ::RbConfig::CONFIG['target'],
+    :target_cpu => ::RbConfig::CONFIG['target_cpu'],
+    :target_vendor => ::RbConfig::CONFIG['target_vendor'],
+    :target_os => ::RbConfig::CONFIG['target_os'],
+    :host => ::RbConfig::CONFIG['host'],
+    :host_cpu => ::RbConfig::CONFIG['host_cpu'],
+    :host_os => ::RbConfig::CONFIG['host_os'],
+    :host_vendor => ::RbConfig::CONFIG['host_vendor'],
+    :gems_dir => %x{#{ruby_bin} #{::RbConfig::CONFIG['bindir']}/gem env gemdir}.chomp!,
+    :gem_bin => [ ::Gem.default_exec_format % 'gem', 'gem' ].map{|bin| "#{::RbConfig::CONFIG['bindir']}/#{bin}"
       }.find{|bin| ::File.exists? bin},
     :ruby_bin => ruby_bin
   }.each do |attribute, value|

data/spec/unit/plugins/sigar/network_route_spec.rb

@@ -33,6 +33,8 @@ describe Ohai::System, "Sigar network route plugin" do
 
     before(:each) do
       @ohai = Ohai::System.new
+      @plugin = get_plugin("sigar/network", @ohai)
+      @plugin.stub(:collect_os).and_return(:sigar)
       @sigar = double("Sigar")
       @net_info_conf={
         :default_gateway => "192.168.1.254",
@@ -111,35 +113,32 @@ describe Ohai::System, "Sigar network route plugin" do
         net_arp.stub(k).and_return(v)
       end
       @sigar.stub(:fqdn).and_return("localhost.localdomain")
-      @sigar.should_receive(:net_info).at_least(2).times.and_return(net_info)
+      @sigar.should_receive(:net_info).once.times.and_return(net_info)
       @sigar.should_receive(:net_interface_list).once.and_return(["eth0"])
       @sigar.should_receive(:net_interface_config).with("eth0").and_return(net_conf)
       @sigar.should_receive(:net_interface_stat).with("eth0").and_return(net_stat)
       @sigar.should_receive(:arp_list).once.and_return([net_arp])
 
-      # Since we mock net_route_list here, flags never gets called
+      # Since we double net_route_list here, flags never gets called
       @sigar.should_receive(:net_route_list).once.and_return([net_route])
-      Sigar.should_receive(:new).at_least(2).times.and_return(@sigar)
-      @ohai.require_plugin("os")
-      @ohai[:os]="sigar"
-      Ohai::Log.should_receive(:warn).with(/unable to detect ip6address/).once
-      @ohai.require_plugin("network")
-      @ohai.require_plugin("sigar::network_route")
+      Sigar.should_receive(:new).once.and_return(@sigar)
+
+      @plugin.run
     end
 
     it "should set the routes" do
-      @ohai[:network][:interfaces][:eth0].should have_key(:route)
+      @plugin[:network][:interfaces][:eth0].should have_key(:route)
     end
 
     it "should set the route details" do
       @net_route_conf.each_pair do |k,v|
-        # Work around the above mocking of net_route_list skipping the call to flags()
+        # Work around the above doubleing of net_route_list skipping the call to flags()
         if k == :flags
           v="U"
-          @ohai[:network][:interfaces][:eth0][:route]["192.168.1.0"][k] = v
+          @plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"][k] = v
         end
-        @ohai[:network][:interfaces][:eth0][:route]["192.168.1.0"].should have_key(k)
-        @ohai[:network][:interfaces][:eth0][:route]["192.168.1.0"][k].should eql(v)
+        @plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"].should have_key(k)
+        @plugin[:network][:interfaces][:eth0][:route]["192.168.1.0"][k].should eql(v)
       end
     end
 

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

@@ -0,0 +1,82 @@
+#
+# 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, "Solaris2.X cpu plugin" do
+  before(:each) do
+    @plugin = get_plugin("solaris2/cpu")
+    @plugin.stub(:collect_os).and_return("solaris2")
+    @plugin.stub(:shell_out).with("psrinfo | wc -l").and_return(mock_shell_out(0, "32\n", ""))
+    @plugin.stub(:shell_out).with("psrinfo -p").and_return(mock_shell_out(0, "4\n", ""))
+
+    psrinfo_output = <<-END.strip
+    x86 (GenuineIntel 206D7 family 6 model 45 step 7 clock 2600 MHz)
+      Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz
+    x86 (CrazyTown 206D7 family 12 model 93 step 9 clock 2900 MHz)
+      Intel(r) Xeon(r) CPU E5-2690 0 @ 2.90GHz
+END
+    @plugin.stub(:shell_out).with('psrinfo -v -p | grep Hz').and_return(mock_shell_out(0, psrinfo_output, ""))
+  end
+  
+  it "should get the total virtual processor count" do
+    @plugin.run
+    @plugin['cpu']['total'].should eql(32)
+  end
+
+  it 'should get the total processor count' do
+    @plugin.run
+    @plugin['cpu']['real'].should eql(4)
+  end
+
+  describe 'per-cpu information' do
+    it "should include vendor_id for processors" do
+      @plugin.run
+      @plugin['cpu']['0']['vendor_id'].should eql('GenuineIntel')
+      @plugin['cpu']['1']['vendor_id'].should eql('CrazyTown')
+    end
+
+    it "should include family for processors" do
+      @plugin.run
+      @plugin['cpu']["0"]["family"].should eql("6")
+      @plugin['cpu']["1"]["family"].should eql("12")
+    end
+
+    it "should include model for processors" do
+      @plugin.run
+      @plugin['cpu']["0"]["model"].should eql("45")
+      @plugin['cpu']["1"]["model"].should eql("93")
+    end
+
+    it "should include stepping for processors" do
+      @plugin.run
+      @plugin['cpu']["0"]["stepping"].should eql("7")
+      @plugin['cpu']["1"]["stepping"].should eql("9")
+    end
+
+    it "should include model name for processors" do
+      @plugin.run
+      @plugin['cpu']["0"]["model_name"].should eql("Intel(r) Xeon(r) CPU E5-2670 0 @ 2.60GHz")
+      @plugin['cpu']["1"]["model_name"].should eql("Intel(r) Xeon(r) CPU E5-2690 0 @ 2.90GHz")
+    end
+
+    it "should include mhz name for processors" do
+      @plugin.run
+      @plugin['cpu']["0"]["mhz"].should eql("2600")
+      @plugin['cpu']["1"]["mhz"].should eql("2900")
+    end
+  end
+end

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

@@ -20,19 +20,18 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Solaris2.X hostname plugin" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:os] = "solaris2"
-    @ohai.stub!(:from).with("hostname").and_return("kitteh")
-    Socket.stub!(:getaddrinfo).and_return( [["AF_INET", 0, "kitteh.inurfridge.eatinurfoodz", "10.1.2.3", 2, 0, 0]] );
+    @plugin = get_plugin("hostname")
+    @plugin.stub(:collect_os).and_return(:solaris2)
+    @plugin.stub(:resolve_fqdn).and_return("kitteh.inurfridge.eatinurfoodz")
+    @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "kitteh\n", ""))
+#    Socket.stub(:getaddrinfo).and_return( [["AF_INET", 0, "kitteh.inurfridge.eatinurfoodz", "10.1.2.3", 2, 0, 0]] );
   end
-  
+
   it_should_check_from("solaris2::hostname", "hostname", "hostname", "kitteh")
-  
-  it "should get the fqdn value from socket getaddrinfo" do
-    Socket.should_receive(:getaddrinfo)
-    @ohai._require_plugin("solaris2::hostname")
-    @ohai["fqdn"].should == "kitteh.inurfridge.eatinurfoodz"
+
+  it "should get the fqdn value from #resolve_fqdn" do
+    @plugin.run
+    @plugin["fqdn"].should == "kitteh.inurfridge.eatinurfoodz"
   end
-  
-end
+
+end

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

@@ -134,31 +134,27 @@ describe Ohai::System, "Solaris2.X kernel plugin" do
   TOOMUCH
 
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:kernel] = Mash.new
-    @ohai.stub(:from).with("uname -s").and_return("SunOS")
+    @plugin = get_plugin("kernel")
+    @plugin.stub(:collect_os).and_return(:solaris2)
+    @plugin.stub(:init_kernel).and_return({})
+    @plugin.stub(:shell_out).with("uname -s").and_return(mock_shell_out(0, "SunOS\n", ""))
+    @plugin.stub(:shell_out).with("modinfo").and_return(mock_shell_out(0, MODINFO, ""))
   end
 
-  it_should_check_from_deep_mash("solaris2::kernel", "kernel", "os", "uname -s", "SunOS")
+  it_should_check_from_deep_mash("solaris2::kernel", "kernel", "os", "uname -s", [0, "SunOS\n", ""])
 
   it "gives excruciating detail about kernel modules" do
-    stdin = StringIO.new
-    @modinfo_stdout = StringIO.new(MODINFO)
-    @ohai.stub!(:popen4).with("modinfo").and_yield(nil, stdin, @modinfo_stdout, nil)
+    @plugin.run
 
-    @ohai._require_plugin("solaris2::kernel")
-
-    @ohai[:kernel][:modules].should have(107).modules
+    @plugin[:kernel][:modules].should have(107).modules
 
     # Teh daterz
     # Id Loadaddr   Size Info Rev Module Name
     #  6  1180000   4623   1   1  specfs (filesystem for specfs)
     teh_daterz = { "id" => 6, "loadaddr" => "1180000", "size" =>  17955, "description" => "filesystem for specfs"}
-    @ohai[:kernel][:modules].keys.should include("specfs")
-    @ohai[:kernel][:modules].keys.should_not include("Module")
-    @ohai[:kernel][:modules]["specfs"].should == teh_daterz
+    @plugin[:kernel][:modules].keys.should include("specfs")
+    @plugin[:kernel][:modules].keys.should_not include("Module")
+    @plugin[:kernel][:modules]["specfs"].should == teh_daterz
   end
 
-
 end

data/{lib/ohai/plugins/openbsd/uptime.rb → spec/unit/plugins/solaris2/memory_spec.rb}

@@ -1,6 +1,4 @@
 #
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,17 +14,17 @@
 # limitations under the License.
 #
 
-provides "uptime", "uptime_seconds"
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
-# kern.boottime=Tue Nov  1 14:45:52 2011
+describe Ohai::System, "Solaris2.X memory plugin" do
+  before(:each) do
+    @plugin = get_plugin("solaris2/memory")
+    @plugin.stub(:collect_os).and_return("solaris2")
+    @plugin.stub(:shell_out).with("prtconf -m").and_return(mock_shell_out(0, "8194\n", ""))
+  end
 
-popen4("/sbin/sysctl kern.boottime") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /kern.boottime=(.+)/
-      uptime_seconds Time.new.to_i - Time.parse($1).to_i
-      uptime self._seconds_to_human(uptime_seconds)
-    end
+  it "should get the total memory" do
+    @plugin.run
+    @plugin['memory']['total'].should eql(8194)
   end
 end
-

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

@@ -21,7 +21,29 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "Solaris2.X network plugin" do
 
   before do
-    solaris_ifconfig = <<-ENDIFCONFIG
+    @solaris_arp_rn = <<-ARP_RN
+Net to Media Table: IPv4
+Device   IP Address               Mask      Flags   Phys Addr
+------ -------------------- --------------- ----- ---------------
+rtls0  172.31.4.1           255.255.255.255       00:14:69:81:0b:c0
+rtls0  172.31.4.44          255.255.255.255       00:0c:29:c4:9a:11
+rtls0  172.31.5.16          255.255.255.255       de:ad:be:ef:3b:ba
+rtls0  172.31.4.16          255.255.255.255       d8:d3:85:65:39:40
+rtls0  172.31.4.12          255.255.255.255       d8:d3:85:bb:43:b0
+rtls0  172.31.4.115         255.255.255.255       52:54:00:0d:b7:5b
+rtls0  172.31.4.126         255.255.255.255       52:54:00:2d:93:0c
+rtls0  172.31.4.125         255.255.255.255       02:08:20:2e:29:8d
+rtls0  172.31.4.121         255.255.255.255       52:54:00:25:8a:3f
+rtls0  172.31.4.103         255.255.255.255 SP    52:54:00:7f:22:e7
+rtls0  172.31.4.102         255.255.255.255       02:08:20:88:38:18
+rtls0  172.31.4.106         255.255.255.255       02:08:20:6d:cc:aa
+rtls0  172.31.4.83          255.255.255.255       02:08:20:05:8e:75
+rtls0  172.31.4.82          255.255.255.255       52:54:00:2d:93:0c
+rtls0  172.31.4.81          255.255.255.255       02:08:20:37:80:87
+rtls0  224.0.0.0            240.0.0.0       SM    01:00:5e:00:00:00
+ARP_RN
+
+    @solaris_ifconfig = <<-ENDIFCONFIG
 lo0:3: flags=2001000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4,VIRTUAL> mtu 8232 index 1
         inet 127.0.0.1 netmask ff000000
 e1000g0:3: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 3
@@ -61,7 +83,7 @@ vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 0
  inet6 fe80::203:baff:fe17:4444/128
 ENDIFCONFIG
 
-    solaris_netstat_rn = <<-NETSTAT_RN
+    @solaris_netstat_rn = <<-NETSTAT_RN
 Routing Table: IPv4
   Destination           Gateway           Flags  Ref     Use     Interface
 -------------------- -------------------- ----- ----- ---------- ---------
@@ -87,41 +109,43 @@ destination: default
        0         0         0         0         0         0      1500         0
 ROUTE_GET
 
-    @stdin = StringIO.new
-    @ifconfig_lines = solaris_ifconfig.split("\n")
+    @ifconfig_lines = @solaris_ifconfig.split("\n")
 
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:network] = Mash.new
+    @plugin = get_plugin("solaris2/network")
+    @plugin.stub(:collect_os).and_return(:solaris2)
+    @plugin[:network] = Mash.new
 
-    @ohai.stub(:popen4).with("ifconfig -a")
-    @ohai.stub(:popen4).with("arp -an")
+    @plugin.stub(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @solaris_route_get, ""))
+    @plugin.stub(:shell_out).with("arp -an").and_return(mock_shell_out(0, @solaris_arp_rn, ""))
+    @plugin.stub(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @soalris_route_get, ""))
   end
 
   describe "gathering IP layer address info" do
     before do
-      @ohai.stub!(:popen4).with("ifconfig -a").and_yield(nil, @stdin, @ifconfig_lines, nil)
-      @ohai._require_plugin("solaris2::network")
+      @stdout = double("Pipe, stdout, cmd=`route get default`", :read => @solaris_route_get)
+      @plugin.stub(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @solaris_route_get, ""))
+      @plugin.stub(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @solaris_ifconfig, ""))
+      @plugin.run
     end
 
     it "completes the run" do
-      @ohai['network'].should_not be_nil
+      @plugin['network'].should_not be_nil
     end
 
     it "detects the interfaces" do
-      @ohai['network']['interfaces'].keys.sort.should == ["e1000g0:3", "e1000g2:1", "eri0", "ip.tun0", "ip.tun0:1", "lo0", "lo0:3", "net0", "qfe1"]
+      @plugin['network']['interfaces'].keys.sort.should == ["e1000g0:3", "e1000g2:1", "eri0", "ip.tun0", "ip.tun0:1", "lo0", "lo0:3","net0", "qfe1"]
     end
 
     it "detects the ip addresses of the interfaces" do
-      @ohai['network']['interfaces']['e1000g0:3']['addresses'].keys.should include('72.2.115.28')
+      @plugin['network']['interfaces']['e1000g0:3']['addresses'].keys.should include('72.2.115.28')
     end
 
     it "detects the encapsulation type of the interfaces" do
-      @ohai['network']['interfaces']['e1000g0:3']['encapsulation'].should == 'Ethernet'
+      @plugin['network']['interfaces']['e1000g0:3']['encapsulation'].should == 'Ethernet'
     end
     
     it "detects the L3PROTECT network flag" do
-      @ohai['network']['interfaces']['net0']['flags'].should include('L3PROTECT')
+      @plugin['network']['interfaces']['net0']['flags'].should include('L3PROTECT')
     end
   end
 
@@ -129,13 +153,13 @@ ROUTE_GET
 
   describe "setting the node's default IP address attribute" do
     before do
-      @stdout = mock("Pipe, stdout, cmd=`route get default`", :read => @solaris_route_get)
-      @ohai.stub!(:popen4).with("route -n get default").and_yield(nil,@stdin, @stdout, nil)
-      @ohai._require_plugin("solaris2::network")
+      @stdout = double("Pipe, stdout, cmd=`route get default`", :read => @solaris_route_get)
+      @plugin.stub(:shell_out).with("route -n get default").and_return(mock_shell_out(0, @solaris_route_get, ""))
+      @plugin.run
     end
 
     it "finds the default interface by asking which iface has the default route" do
-      @ohai[:network][:default_interface].should == 'e1000g0'
+      @plugin[:network][:default_interface].should == 'e1000g0'
     end
   end
 end