ohai 6.24.2 → 7.0.0.rc.0

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

@@ -20,16 +20,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Solaris plugin platform" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.extend(SimpleFromFile)
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:os] = "solaris2"
-    @ohai.stub!(:popen4).with("/sbin/uname -X")
+    @plugin = get_plugin("solaris2/platform")
+    @plugin.stub(:collect_os).and_return(:solaris2)
+    @plugin.stub(:shell_out).with("/sbin/uname -X")
   end
   
   describe "on SmartOS" do
     before(:each) do
-      uname_x = <<-UNAME_X
+      @uname_x = <<-UNAME_X
 System = SunOS
 Node = node.example.com
 Release = 5.11
@@ -42,34 +40,27 @@ OEM# = 0
 Origin# = 1
 NumCPU = 16
 UNAME_X
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @status = 0
 
-      @uname_x_lines = uname_x.split("\n")
-
-      File.stub!(:exists?).with("/sbin/uname").and_return(true)
-      @ohai.stub(:popen4).with("/sbin/uname -X").and_yield(@pid, @stdin, @uname_x_lines, @stderr).and_return(@status)
+      File.stub(:exists?).with("/sbin/uname").and_return(true)
+      @plugin.stub(:shell_out).with("/sbin/uname -X").and_return(mock_shell_out(0, @uname_x, ""))
       
       @release = StringIO.new("  SmartOS 20120130T201844Z x86_64\n")
-      @mock_file.stub!(:close).and_return(0)
-      File.stub!(:open).with("/etc/release").and_yield(@release)
+      File.stub(:open).with("/etc/release").and_yield(@release)
     end
 
     it "should run uname and set platform and build" do 
-      @ohai._require_plugin("solaris2::platform")
-      @ohai[:platform_build].should == "joyent_20120130T201844Z"
+      @plugin.run
+      @plugin[:platform_build].should == "joyent_20120130T201844Z"
     end
 
     it "should set the platform" do
-      @ohai._require_plugin("solaris2::platform")
-      @ohai[:platform].should == "smartos"
+      @plugin.run
+      @plugin[:platform].should == "smartos"
     end
     
     it "should set the platform_version" do
-      @ohai._require_plugin("solaris2::platform")
-      @ohai[:platform_version].should == "5.11"
+      @plugin.run
+      @plugin[:platform_version].should == "5.11"
     end
 
   end

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

@@ -20,60 +20,55 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "Solaris virtualization platform" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:os] = "solaris2"
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai.extend(SimpleFromFile)
+    @psrinfo_pv = <<-PSRINFO_PV
+The physical processor has 1 virtual processor (0)
+  x86 (GenuineIntel family 6 model 2 step 3 clock 2667 MHz)
+        Intel Pentium(r) Pro
+PSRINFO_PV
+
+    @plugin = get_plugin("solaris2/virtualization")
+    @plugin.stub(:collect_os).and_return(:solaris2)
 
     # default to all requested Files not existing
-    File.stub!(:exists?).with("/usr/sbin/psrinfo").and_return(false)
-    File.stub!(:exists?).with("/usr/sbin/smbios").and_return(false)
-    File.stub!(:exists?).with("/usr/sbin/zoneadm").and_return(false)
+    File.stub(:exists?).with("/usr/sbin/psrinfo").and_return(false)
+    File.stub(:exists?).with("/usr/sbin/smbios").and_return(false)
+    File.stub(:exists?).with("/usr/sbin/zoneadm").and_return(false)
+    @plugin.stub(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, "", ""))
+    @plugin.stub(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "", ""))
   end
 
   describe "when we are checking for kvm" do
     before(:each) do
       File.should_receive(:exists?).with("/usr/sbin/psrinfo").and_return(true)
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 10
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
     end
 
     it "should run psrinfo -pv" do
-      @ohai.should_receive(:popen4).with("/usr/sbin/psrinfo -pv").and_return(true)
-      @ohai._require_plugin("solaris2::virtualization")
+      @plugin.should_receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv")
+      @plugin.run
     end
 
     it "Should set kvm guest if psrinfo -pv contains QEMU Virtual CPU" do
-      @stdout.stub!(:read).and_return("QEMU Virtual CPU") 
-      @ohai.stub!(:popen4).with("/usr/sbin/psrinfo -pv").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("solaris2::virtualization")
-      @ohai[:virtualization][:system].should == "kvm"
-      @ohai[:virtualization][:role].should == "guest"
+      @plugin.stub(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, "QEMU Virtual CPU", ""))
+      @plugin.run
+      @plugin[:virtualization][:system].should == "kvm"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should not set virtualization if kvm isn't there" do
-      @ohai.should_receive(:popen4).with("/usr/sbin/psrinfo -pv").and_return(true)
-      @ohai._require_plugin("solaris2::virtualization")
-      @ohai[:virtualization].should == {}
+      @plugin.should_receive(:shell_out).with("#{ Ohai.abs_path( "/usr/sbin/psrinfo" )} -pv").and_return(mock_shell_out(0, @psrinfo_pv, ""))
+      @plugin.run
+      @plugin[:virtualization].should == {}
     end
   end
 
   describe "when we are parsing smbios" do
     before(:each) do
       File.should_receive(:exists?).with("/usr/sbin/smbios").and_return(true)
-      @stdin = mock("STDIN", { :close => true })
-      @pid = 20
-      @stderr = mock("STDERR")
-      @stdout = mock("STDOUT")
-      @status = 0
     end
 
     it "should run smbios" do
-      @ohai.should_receive(:popen4).with("/usr/sbin/smbios").and_return(true)
-      @ohai._require_plugin("solaris2::virtualization")
+      @plugin.should_receive(:shell_out).with("/usr/sbin/smbios")
+      @plugin.run
     end
 
     it "should set virtualpc guest if smbios detects Microsoft Virtual Machine" do
@@ -89,12 +84,10 @@ ID    SIZE TYPE
   UUID: D29974A4-BE51-044C-BDC6-EFBC4B87A8E9
   Wake-Up Event: 0x6 (power switch)
 MSVPC
-      @stdout.stub!(:read).and_return(ms_vpc_smbios) 
-       
-      @ohai.stub!(:popen4).with("/usr/sbin/smbios").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("solaris2::virtualization")
-      @ohai[:virtualization][:system].should == "virtualpc"
-      @ohai[:virtualization][:role].should == "guest"
+      @plugin.stub(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, ms_vpc_smbios, ""))
+      @plugin.run
+      @plugin[:virtualization][:system].should == "virtualpc"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should set vmware guest if smbios detects VMware Virtual Platform" do
@@ -110,23 +103,22 @@ ID    SIZE TYPE
   UUID: a86cc405-e1b9-447b-ad05-6f8db39d876a
   Wake-Up Event: 0x6 (power switch)
 VMWARE
-      @stdout.stub!(:read).and_return(vmware_smbios)
-      @ohai.stub!(:popen4).with("/usr/sbin/smbios").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
-      @ohai._require_plugin("solaris2::virtualization")
-      @ohai[:virtualization][:system].should == "vmware"
-      @ohai[:virtualization][:role].should == "guest"
+      @plugin.stub(:shell_out).with("/usr/sbin/smbios").and_return(mock_shell_out(0, vmware_smbios, ""))
+      @plugin.run
+      @plugin[:virtualization][:system].should == "vmware"
+      @plugin[:virtualization][:role].should == "guest"
     end
 
     it "should run smbios and not set virtualization if nothing is detected" do
-      @ohai.should_receive(:popen4).with("/usr/sbin/smbios").and_return(true)
-      @ohai._require_plugin("solaris2::virtualization")
-      @ohai[:virtualization].should == {}
+      @plugin.should_receive(:shell_out).with("/usr/sbin/smbios")
+      @plugin.run
+      @plugin[:virtualization].should == {}
     end
   end
 
   it "should not set virtualization if no tests match" do
-    @ohai._require_plugin("solaris2::virtualization")
-    @ohai[:virtualization].should == {}
+    @plugin.run
+    @plugin[:virtualization].should == {}
   end
 end
 

data/spec/unit/plugins/ssh_host_keys_spec.rb

@@ -21,12 +21,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_he
 describe Ohai::System, "ssh_host_key plugin" do
 
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:keys] = Mash.new
-    @ohai.stub(:require_plugin).and_return(true)
-
-    # Avoid using the real from_file to load the plugin => less stubbing required
-    @ohai.extend(SimpleFromFile)
+    @plugin = get_plugin("ssh_host_key")
+    @plugin[:keys] = Mash.new
 
     File.stub(:exists?).with("/etc/ssh/sshd_config").and_return(true)
     File.stub(:open).with("/etc/ssh/sshd_config").and_yield(sshd_config_file)
@@ -50,21 +46,21 @@ describe Ohai::System, "ssh_host_key plugin" do
 
   shared_examples "loads keys" do
     it "reads the key and sets the dsa attribute correctly" do
-      @ohai._require_plugin("ssh_host_key")
-      @ohai[:keys][:ssh][:host_dsa_public].should eql(@dsa_key.split[1])
-      @ohai[:keys][:ssh][:host_dsa_type].should be_nil
+      @plugin.run
+      @plugin[:keys][:ssh][:host_dsa_public].should eql(@dsa_key.split[1])
+      @plugin[:keys][:ssh][:host_dsa_type].should be_nil
     end
 
     it "reads the key and sets the rsa attribute correctly" do
-      @ohai._require_plugin("ssh_host_key")
-      @ohai[:keys][:ssh][:host_rsa_public].should eql(@rsa_key.split[1])
-      @ohai[:keys][:ssh][:host_rsa_type].should be_nil
+      @plugin.run
+      @plugin[:keys][:ssh][:host_rsa_public].should eql(@rsa_key.split[1])
+      @plugin[:keys][:ssh][:host_rsa_type].should be_nil
     end
 
     it "reads the key and sets the ecdsa attribute correctly" do
-      @ohai._require_plugin("ssh_host_key")
-      @ohai[:keys][:ssh][:host_ecdsa_public].should eql(@ecdsa_key.split[1])
-      @ohai[:keys][:ssh][:host_ecdsa_type].should eql(@ecdsa_key.split[0])
+      @plugin.run
+      @plugin[:keys][:ssh][:host_ecdsa_public].should eql(@ecdsa_key.split[1])
+      @plugin[:keys][:ssh][:host_ecdsa_type].should eql(@ecdsa_key.split[0])
     end
   end
 

data/spec/unit/provides_map_spec.rb

@@ -0,0 +1,208 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, 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 expressed 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::ProvidesMap do
+
+  let(:ohai_system) { Ohai::System.new }
+  let(:provides_map) { Ohai::ProvidesMap.new }
+  let(:plugin_1) { Ohai::DSL::Plugin.new(ohai_system.data) }
+  let(:plugin_2) { Ohai::DSL::Plugin.new(ohai_system.data) }
+  let(:plugin_3) { Ohai::DSL::Plugin.new(ohai_system.data) }
+  let(:plugin_4) { Ohai::DSL::Plugin.new(ohai_system.data) }
+
+  describe "when looking up providing plugins for a single attribute" do
+    describe "when the attribute does not exist" do
+      it "should raise Ohai::Exceptions::AttributeNotFound error" do
+        expect{ provides_map.find_providers_for(["single"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound, "No such attribute: 'single'")
+      end
+    end
+
+    describe "when the attribute does not have a provider" do
+      it "should raise Ohai::Exceptions::ProviderNotFound error" do
+        provides_map.set_providers_for(plugin_1, ["first/second"])
+        expect{ provides_map.find_providers_for(["first"]) }.to raise_error(Ohai::Exceptions::ProviderNotFound, "Cannot find plugin providing attribute: 'first'")
+      end
+    end
+
+    describe "when only one plugin provides the attribute" do
+      before do
+        provides_map.set_providers_for(plugin_1, ["single"])
+      end
+
+      it "should return the provider" do
+        expect(provides_map.find_providers_for(["single"])).to eq([plugin_1])
+      end
+    end
+
+    describe "when multiple plugins provide the attribute" do
+      before do
+        provides_map.set_providers_for(plugin_1, ["single"])
+        provides_map.set_providers_for(plugin_2, ["single"])
+      end
+
+      it "should return all providers" do
+        expect(provides_map.find_providers_for(["single"])).to eq([plugin_1, plugin_2])
+      end
+    end
+  end
+
+  describe "when looking up providing plugins for multiple attributes" do
+    describe "when a different plugin provides each attribute" do
+
+      before do
+        provides_map.set_providers_for(plugin_1, ["one"])
+        provides_map.set_providers_for(plugin_2, ["two"])
+      end
+
+      it "should return each provider" do
+        expect(provides_map.find_providers_for(["one", "two"])).to eq([plugin_1, plugin_2])
+      end
+    end
+
+    describe "when one plugin provides both requested attributes" do
+
+      before do
+        provides_map.set_providers_for(plugin_1, ["one"])
+        provides_map.set_providers_for(plugin_1, ["one_again"])
+      end
+
+      it "should return unique providers" do
+        expect(provides_map.find_providers_for(["one", "one_again"])).to eq([plugin_1])
+      end
+    end
+  end
+
+  describe "when looking up providers for multi-level attributes" do
+    describe "when the full attribute exists in the map" do
+      before do
+        provides_map.set_providers_for(plugin_1, ["top/middle/bottom"])
+      end
+
+      it "should collect the provider" do
+        expect(provides_map.find_providers_for(["top/middle/bottom"])).to eq([plugin_1])
+      end
+    end
+  end
+
+  describe "when setting multi-level attributes" do
+    describe "when the attribute contains //" do
+      it "should raise an Ohai::Exceptions::AttributeSyntaxError" do
+        expect{ provides_map.set_providers_for(plugin_1, ["this/plugin//is/bad"]) }.to raise_error(Ohai::Exceptions::AttributeSyntaxError, "Attribute contains duplicate '/' characters: this/plugin//is/bad")
+      end
+    end
+
+    describe "when the attribute has a trailing slash" do
+      it "should raise an Ohai::Exceptions::AttributeSyntaxError" do
+        expect{ provides_map.set_providers_for(plugin_1, ["this/plugin/is/bad/"]) }.to raise_error(Ohai::Exceptions::AttributeSyntaxError, "Attribute contains a trailing '/': this/plugin/is/bad/")
+      end
+    end
+  end
+
+  describe "when looking for providers of attributes specified in CLI" do
+    before do
+      provides_map.set_providers_for(plugin_1, ["cat/whiskers"])
+      provides_map.set_providers_for(plugin_2, ["cat/paws", "cat/paws/toes"])
+      provides_map.set_providers_for(plugin_3, ["cat/mouth/teeth"])
+    end
+
+    it "should find providers for subattributes if any exists when the attribute doesn't have a provider" do
+      providers = provides_map.deep_find_providers_for(["cat"])
+      expect(providers).to have(3).plugins
+      expect(providers).to include(plugin_1)
+      expect(providers).to include(plugin_2)
+      expect(providers).to include(plugin_3)
+    end
+
+    it "should find providers for the first parent attribute when the attribute or any subattributes doesn't have a provider" do
+      providers = provides_map.deep_find_providers_for(["cat/paws/front"])
+      expect(providers).to eq([plugin_2])
+    end
+  end
+
+  describe "when looking for the closest providers" do
+    describe "and the full attribute is provided" do
+      before do
+        provides_map.set_providers_for(plugin_1, ["do/not/eat/metal"])
+      end
+
+      it "should return the provider of the full attribute" do
+        expect(provides_map.find_closest_providers_for(["do/not/eat/metal"])).to eql([plugin_1])
+      end
+    end
+
+    describe "and the full attribute is not provided" do
+      before do
+        provides_map.set_providers_for(plugin_1, ["do/not/eat"])
+      end
+
+      it "should not raise error if a parent attribute is provided" do
+        expect{ provides_map.find_closest_providers_for(["do/not/eat/plastic"]) }.not_to raise_error
+      end
+
+      it "should return the providers of the closest parent attribute" do
+        provides_map.set_providers_for(plugin_2, ["do/not"]) # set a less-specific parent
+        expect(provides_map.find_closest_providers_for(["do/not/eat/glass"])).to eql([plugin_1])
+      end
+
+      it "should raise error if the least-specific parent is not an attribute" do
+        expect{ provides_map.find_closest_providers_for(["please/eat/your/vegetables"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound, "No such attribute: 'please/eat/your/vegetables'")
+      end
+
+      it "should raise error if no parent attribute has a provider" do
+        expect{ provides_map.find_closest_providers_for(["do/not"]) }.to raise_error(Ohai::Exceptions::ProviderNotFound, "Cannot find plugin providing attribute: 'do/not'")
+      end
+    end
+  end
+
+  describe "when listing all plugins" do
+    before(:each) do
+      provides_map.set_providers_for(plugin_1, ["one"])
+      provides_map.set_providers_for(plugin_2, ["two"])
+      provides_map.set_providers_for(plugin_3, ["stub/three"])
+      provides_map.set_providers_for(plugin_4, ["foo/bar/four", "also/this/four"])
+    end
+
+    it "should find all the plugins providing attributes" do
+      all_plugins = provides_map.all_plugins
+      expect(all_plugins).to have(4).plugins
+      expect(all_plugins).to include(plugin_1)
+      expect(all_plugins).to include(plugin_2)
+      expect(all_plugins).to include(plugin_3)
+      expect(all_plugins).to include(plugin_4)
+    end
+
+    describe "with an attribute filter" do
+      it "finds plugins with a single level of attribute" do
+        expect(provides_map.all_plugins("one")).to eq([plugin_1])
+      end
+
+      it "finds plugins with an exact match for multiple levels of attribute" do
+        expect(provides_map.all_plugins("stub/three")).to eq([plugin_3])
+      end
+
+      it "finds plugins that provide subattributes of the requested path" do
+        expect(provides_map.all_plugins("stub")).to eq([plugin_3])
+        expect(provides_map.all_plugins("foo/bar")).to eq([plugin_4])
+      end
+    end
+  end
+
+end