ohai 6.24.2 → 7.0.0.rc.0

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

@@ -6,9 +6,9 @@
 # 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.
@@ -21,14 +21,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "FreeBSD hostname plugin" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:os] = "freebsd"
-    @ohai.stub!(:from).with("hostname -s").and_return("katie")
-    @ohai.stub!(:from).with("hostname -f").and_return("katie.bethell")
+    @plugin = get_plugin("hostname")
+    @plugin.stub(:collect_os).and_return(:freebsd)
+    @plugin.stub(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie", ""))
+    @plugin.stub(:shell_out).with("hostname -f").and_return(mock_shell_out(0, "katie.bethell", ""))
+    @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
   end
-  
+
   it_should_check_from("freebsd::hostname", "hostname", "hostname -s", "katie")
-  
+
   it_should_check_from("freebsd::hostname", "fqdn", "hostname -f", "katie.bethell")
+
+  it_should_check_from("freebsd::hostname", "machinename", "hostname", "katie.local")
 end

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

@@ -21,17 +21,17 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "FreeBSD kernel plugin" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai.stub!(:from).with("uname -i").and_return("foo")
-    @ohai.stub!(:from_with_regex).with("sysctl kern.securelevel").and_return("kern.securelevel: 1")
-    @ohai[:kernel] = Mash.new
-    @ohai[:kernel][:name] = "freebsd"
+    @plugin = get_plugin("kernel")
+    @plugin.stub(:collect_os).and_return(:freebsd)
+    @plugin.stub(:init_kernel).and_return({:name => "freebsd"})
+    @plugin.stub(:shell_out).with("uname -i").and_return(mock_shell_out(0, "foo\n", ""))
+    @plugin.stub(:shell_out).with("sysctl kern.securelevel").and_return(mock_shell_out(0, "kern.securelevel: 1", ""))
+    @plugin.stub(:shell_out).with( Ohai.abs_path( "/sbin/kldstat" )).and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))
   end
 
   it "should set the kernel_os to the kernel_name value" do
-    @ohai._require_plugin("freebsd::kernel")
-    @ohai[:kernel][:os].should == @ohai[:kernel][:name]
+    @plugin.run
+    @plugin[:kernel][:os].should == @plugin[:kernel][:name]
   end
 
 end

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

@@ -21,20 +21,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "FreeBSD plugin platform" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai.stub!(:from).with("uname -s").and_return("FreeBSD")
-    @ohai.stub!(:from).with("uname -r").and_return("7.1")
-    @ohai[:os] = "freebsd"
+    @plugin = get_plugin("freebsd/platform")
+    @plugin.stub(:shell_out).with("uname -s").and_return(mock_shell_out(0, "FreeBSD\n", ""))
+    @plugin.stub(:shell_out).with("uname -r").and_return(mock_shell_out(0, "7.1\n", ""))
+    @plugin.stub(:collect_os).and_return(:freebsd)
   end
-  
+
   it "should set platform to lowercased lsb[:id]" do
-    @ohai._require_plugin("freebsd::platform")        
-    @ohai[:platform].should == "freebsd"
+    @plugin.run        
+    @plugin[:platform].should == "freebsd"
   end
   
   it "should set platform_version to lsb[:release]" do
-    @ohai._require_plugin("freebsd::platform")
-    @ohai[:platform_version].should == "7.1"
+    @plugin.run
+    @plugin[:platform_version].should == "7.1"
   end
 end  

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

@@ -21,74 +21,74 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "FreeBSD virtualization plugin" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:os] = "freebsd"
-    @stderr = StringIO.new
-    @stdin = StringIO.new
-    @status = 0
-    @pid = 42
-    @ohai.stub(:popen4).with("/sbin/kldstat")
-    @ohai.stub(:from)
+    @plugin = get_plugin("freebsd/virtualization")
+    @plugin.stub(:collect_os).and_return(:freebsd)
+    @plugin.stub(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "0", ""))
+    @plugin.stub(:shell_out).with("#{ Ohai.abs_path( "/sbin/kldstat" )}").and_return(mock_shell_out(0, "", ""))
+    @plugin.stub(:shell_out).with("jls -n").and_return(mock_shell_out(0, "",""))
+    @plugin.stub(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, "", ""))
   end
 
   context "jails" do
     it "detects we are in a jail" do
-      @ohai.stub(:from).with("sysctl -n security.jail.jailed").and_return("1")
-      @ohai._require_plugin("freebsd::virtualization")
-      @ohai[:virtualization][:system].should == "jail"
-      @ohai[:virtualization][:role].should == "guest"
+      @plugin.stub(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "1", ""))
+      @plugin.run
+      @plugin[:virtualization][:system].should == "jail"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
-    it "detects we are hosing jails" do
-      @ohai.stub(:from).with("jls -n \| wc -l").and_return("1")
-      @ohai._require_plugin("freebsd::virtualization")
-      @ohai[:virtualization][:system].should == "jail"
-      @ohai[:virtualization][:role].should == "host"
+    it "detects we are hosting jails" do
+      # from http://www.freebsd.org/doc/handbook/jails-application.html
+    @jails = "JID  IP Address      Hostname                      Path\n     3  192.168.3.17    ns.example.org                /home/j/ns\n     2  192.168.3.18    mail.example.org              /home/j/mail\n     1  62.123.43.14    www.example.org               /home/j/www"
+      @plugin.stub(:shell_out).with("jls -n").and_return(mock_shell_out(0, @jails, ""))
+      @plugin.run
+      @plugin[:virtualization][:system].should == "jail"
+      @plugin[:virtualization][:role].should == "host"
     end
   end
 
 
   context "when on a virtualbox guest" do
     before do
-      @stdout = StringIO.new(<<-OUT)
+      @vbox_guest = <<-OUT
 Id Refs Address Size Name
 1 40 0xffffffff80100000 d20428 kernel
 7 3 0xffffffff81055000 41e88 vboxguest.ko
 OUT
-      @ohai.stub(:popen4).with("/sbin/kldstat").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @plugin.stub(:shell_out).with("#{ Ohai.abs_path( "/sbin/kldstat" )}").and_return(mock_shell_out(0, @vbox_guest, ""))
     end
 
     it "detects we are a guest" do
-      @ohai._require_plugin("freebsd::virtualization")
-      @ohai[:virtualization][:system].should == "vbox"
-      @ohai[:virtualization][:role].should == "guest"
+      @plugin.run
+      @plugin[:virtualization][:system].should == "vbox"
+      @plugin[:virtualization][:role].should == "guest"
     end
   end
 
   context "when on a virtualbox host" do
     before do
-      @stdout = StringIO.new(<<-OUT)
+      @stdout = <<-OUT
 Id Refs Address Size Name
 1 40 0xffffffff80100000 d20428 kernel
 7 3 0xffffffff81055000 41e88 vboxdrv.ko
 OUT
-      @ohai.stub(:popen4).with("/sbin/kldstat").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @plugin.stub(:shell_out).with("/sbin/kldstat").and_return(mock_shell_out(0, @stdout, ""))
     end
 
     it "detects we are a host" do
-      @ohai._require_plugin("freebsd::virtualization")
-      @ohai[:virtualization][:system].should == "vbox"
-      @ohai[:virtualization][:role].should == "host"
+      @plugin.run
+      @plugin[:virtualization][:system].should == "vbox"
+      @plugin[:virtualization][:role].should == "host"
     end
   end
 
   context "when on a QEMU guest" do
     it "detects we are a guest" do
-      @ohai.stub(:from).with("sysctl -n hw.model").and_return('QEMU Virtual CPU version (cpu64-rhel6) ("GenuineIntel" 686-class)')
-      @ohai._require_plugin("freebsd::virtualization")
-      @ohai[:virtualization][:system].should == "kvm"
-      @ohai[:virtualization][:role].should == "guest"
+      @qemu_guest = 'QEMU Virtual CPU version (cpu64-rhel6) ("GenuineIntel" 686-class)'
+      @plugin.stub(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, @qemu_guest, ""))
+      @plugin.run
+      @plugin[:virtualization][:system].should == "kvm"
+      @plugin[:virtualization][:role].should == "guest"
     end
   end
 

data/spec/unit/plugins/gce_spec.rb

@@ -16,24 +16,24 @@
 #
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
-require 'ohai/mixin/gce_metadata'
+require 'open-uri'
 
 describe Ohai::System, "plugin gce" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub(:require_plugin).and_return(true)
+    @plugin = get_plugin("gce")
   end
 
   shared_examples_for "!gce" do
-    it 'should not behave like gce' do
-      @ohai[:gce].should be_nil
+    it "should NOT attempt to fetch the gce metadata" do
+      @plugin.should_not_receive(:http_client)
+      @plugin.run
     end
   end
 
   shared_examples_for "gce" do
     before(:each) do
       @http_client = double("Net::HTTP client")
-      Ohai::Mixin::GCEMetadata.stub(:http_client).and_return(@http_client)
+      @plugin.stub(:http_client).and_return(@http_client)
       IO.stub(:select).and_return([[],[1],[]])
       t = double("connection")
       t.stub(:connect_nonblock).and_raise(Errno::EINPROGRESS)
@@ -46,14 +46,15 @@ describe Ohai::System, "plugin gce" do
         with("/computeMetadata/v1beta1/?recursive=true/").
         and_return(double("Net::HTTP Response", :body => '{"instance":{"hostname":"test-host"}}', :code=>"200"))
 
-      @ohai._require_plugin("gce")
+      @plugin.run
 
-      @ohai[:gce].should_not be_nil
-      @ohai[:gce]['instance'].should eq("hostname"=>"test-host")
+      @plugin[:gce].should_not be_nil
+      @plugin[:gce]['instance'].should eq("hostname"=>"test-host")
     end
+
   end
 
-  describe "with hint file" do
+  describe "with hint file and with metadata connection" do
     it_should_behave_like "gce"
 
     before(:each) do
@@ -64,26 +65,19 @@ describe Ohai::System, "plugin gce" do
     end
   end
 
-  describe "without hint file" do
+  describe "without hint file and without metadata connection" do
     it_should_behave_like "!gce"
 
     before(:each) do
       File.stub(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(false)
       File.stub(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(false)
-    end
-  end
-  
-  describe "with ec2 cloud file" do
-    it_should_behave_like "!gce"
-  
-    before(:each) do
-      File.stub(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(false)
-      File.stub(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(false)
-      
-      File.stub(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
-      File.stub(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
-      File.stub(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
-      File.stub(:read).with('C:\chef\ohai\hints/ec2.json').and_return('')
+
+      # Raise Errno::ENOENT to simulate the scenario in which metadata server 
+      # can not be connected
+      t = double("connection")
+      t.stub(:connect_nonblock).and_raise(Errno::ENOENT)
+      Socket.stub(:new).and_return(t)
+      Socket.stub(:pack_sockaddr_in).and_return(nil)
     end
   end
 

data/spec/unit/plugins/groovy_spec.rb

@@ -22,32 +22,26 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_he
 describe Ohai::System, "plugin groovy" do
 
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:languages] = Mash.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @status = 0
+    @plugin = get_plugin("groovy")
+    @plugin[:languages] = Mash.new
     @stdout = "Groovy Version: 1.6.3 JVM: 1.6.0_0\n"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"groovy -v"}).and_return([@status, @stdout, @stderr])
+    @plugin.stub(:shell_out).with("groovy -v").and_return(mock_shell_out(0, @stdout, ""))
   end
 
   it "should get the groovy version from running groovy -v" do
-    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"groovy -v"}).and_return([0, "Groovy Version: 1.6.3 JVM: 1.6.0_0\n", ""])
-    @ohai._require_plugin("groovy")
+    @plugin.should_receive(:shell_out).with("groovy -v").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
   end
 
   it "should set languages[:groovy][:version]" do
-    @ohai._require_plugin("groovy")
-    @ohai.languages[:groovy][:version].should eql("1.6.3")
+    @plugin.run
+    @plugin.languages[:groovy][:version].should eql("1.6.3")
   end
 
   it "should not set the languages[:groovy] tree up if groovy command fails" do
-    @status = 1
-    @stdout = "Groovy Version: 1.6.3 JVM: 1.6.0_0\n"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"groovy -v"}).and_return([@status, @stdout, @stderr])
-    @ohai._require_plugin("groovy")
-    @ohai.languages.should_not have_key(:groovy)
+    @plugin.stub(:shell_out).with("groovy -v").and_return(mock_shell_out(1, @stdout, ""))
+    @plugin.run
+    @plugin.languages.should_not have_key(:groovy)
   end
 
 end

data/spec/unit/plugins/hostname_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -21,29 +21,54 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "hostname plugin" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
+    @plugin = get_plugin("hostname")
+    @plugin.stub(:collect_os).and_return(:default)
+    @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
   end
 
-  it "should set the domain to everything after the first dot of the fqdn" do
-    @ohai[:fqdn] = "katie.bethell"
-    @ohai._require_plugin("hostname")
-    @ohai.domain.should == "bethell"
-  end
+  context "when sigar is not installed" do
+    before(:each) do
+      @plugin.stub(:sigar_is_available?).and_return(false)
+      @plugin.should_not_receive(:get_fqdn_from_sigar)
+      @plugin.stub(:resolve_fqdn).and_return("katie.bethell")
+    end
+    it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
 
-  it "should not set a domain if fqdn is not set" do
-    @ohai._require_plugin("hostname")
-    @ohai.domain.should == nil
-  end
+    it "should use #resolve_fqdn to find the fqdn" do
+      @plugin.run
+      @plugin[:fqdn].should == "katie.bethell"
+    end
 
-  it "should require the os plugin" do
-    @ohai.should_receive(:require_plugin).with("os").and_return(true)
-    @ohai._require_plugin("hostname")
+    it "should set the domain to everything after the first dot of the fqdn" do
+      @plugin.run
+      @plugin[:domain].should == "bethell"
+    end
+
+    it "should set the [short] hostname to everything before the first dot of the fqdn" do
+      @plugin.run
+      @plugin[:hostname].should == "katie"
+    end
   end
 
-  it "should load a platform specific hostname plugin" do
-    @ohai[:os] = "linux"
-    @ohai.should_receive(:require_plugin).with("linux::hostname").and_return(true)
-    @ohai._require_plugin("hostname")
+  context "when sigar is installed" do
+    before(:each) do
+      @plugin.stub(:sigar_is_available?).and_return(true)
+      @plugin.stub(:get_fqdn_from_sigar).and_return("katie.bethell")
+    end
+    it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
+    it "should set the fqdn to the returned value from sigar" do
+      @plugin.run
+      @plugin[:fqdn].should == "katie.bethell"
+    end
+
+    it "should set the domain to everything after the first dot of the fqdn" do
+      @plugin.run
+      @plugin[:domain].should == "bethell"
+    end
+
+    it "should set the [short] hostname to everything before the first dot of the fqdn" do
+      @plugin.run
+      @plugin[:hostname].should == "katie"
+    end
   end
 end

data/spec/unit/plugins/ip_scopes_spec.rb

@@ -0,0 +1,97 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+
+begin
+  require 'ipaddr_extensions'
+rescue LoadError
+end
+
+describe Ohai::System, "plugin ip_scopes" do
+  let(:plugin) { get_plugin('ip_scopes') }
+  let(:network) { Mash.new(:interfaces => interfaces) }
+  let(:interfaces) { Hash[
+      interface1, { :addresses => addresses1, :type => interface1_type },
+      interface2, { :addresses => addresses2, :type => interface2_type }] }
+  let(:interface1) { :eth0 }
+  let(:interface2) { :eth1 }
+  let(:addresses1) { {} }
+  let(:addresses2) { {} }
+  let(:interface1_type) { 'eth' }
+  let(:interface2_type) { 'eth' }
+
+  before { plugin[:network] = network }
+
+  if defined?(IPAddrExtensions)
+    context 'with ipaddr_extensions gem' do
+      let(:ip1) { '10.0.0.1' }
+      let(:ip2) { '1.2.3.4' }
+      let(:ip3) { 'fe80::8638:35ff:fe4e:dc74' }
+
+      let(:addresses1) { Hash[ip1, {}] }
+      let(:addresses2) { Hash[ip2, {}, ip3, {}] }
+
+      it "adds ip_scope to each address's information hash" do
+        plugin.run
+        expect(plugin[:network][:interfaces][:eth0][:addresses]['10.0.0.1'][:ip_scope]).to eq('RFC1918 PRIVATE')
+        expect(plugin[:network][:interfaces][:eth1][:addresses]['1.2.3.4'][:ip_scope]).to eq('GLOBAL UNICAST')
+        expect(plugin[:network][:interfaces][:eth1][:addresses]['fe80::8638:35ff:fe4e:dc74'][:ip_scope]).to eq('LINK LOCAL UNICAST')
+      end
+
+      describe 'privateaddress attribute' do
+        before { plugin.run }
+
+        context 'when host has multiple RFC1918 ethernet addresses' do
+          let(:ip1) { '10.0.0.1' }
+          let(:ip2) { '192.168.1.1' }
+          let(:interface1_type) { 'eth' }
+          let(:interface2_type) { 'eth' }
+
+          it 'picks the last RFC1918 address' do
+            expect(plugin[:privateaddress]).to eq('192.168.1.1')
+          end
+        end
+
+        context 'when host has virtual and ethernet RFC1918 addresses' do
+          let(:ip1) { '10.0.0.1' }
+          let(:ip2) { '192.168.1.1' }
+          let(:interface1_type) { 'eth' }
+          let(:interface2_type) { 'ppp' }
+
+          it 'picks the non-virtual address' do
+            expect(plugin[:privateaddress]).to eq('10.0.0.1')
+          end
+        end
+
+        context 'when host only has virtual RFC1918 addresses' do
+          let(:ip1) { '10.0.0.1' }
+          let(:ip2) { '192.168.1.1' }
+          let(:interface1_type) { 'ppp' }
+          let(:interface2_type) { 'ppp' }
+
+          it 'ignores them' do
+            expect(plugin[:privateaddress]).to be nil
+          end
+        end
+      end
+    end
+  end
+
+  unless defined?(IPAddrExtensions)
+    context 'without the ipaddr_extensions gem' do
+      let(:addresses1) { Hash['10.0.0.1', {}] }
+
+      before do
+        # standin for raising on `require 'ipaddr_extensions'`
+        plugin[:network][:interfaces].stub(:keys).and_raise(LoadError)
+        plugin.run
+      end
+
+      it 'does not add ip_scope to addresses' do
+        expect(plugin[:network][:interfaces][:eth0][:addresses]['10.0.0.1'][:ip_scope]).to be nil
+      end
+
+      it 'does not add a privateaddress attribute' do
+        expect(plugin[:privateaddress]).to be nil
+      end
+    end
+  end
+end