ohai 0.6.12 → 0.6.14.rc.1

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

@@ -66,10 +66,10 @@ describe Ohai::System, "Linux plugin platform" do
       @ohai[:platform].should == "ubuntu"
       @ohai[:platform_family].should == "debian"
     end
-    it "should set platform to mint and platform_family to debian [:lsb][:id] contains Mint" do
-      @ohai[:lsb][:id] = "Mint"
+    it "should set platform to linuxmint and platform_family to debian [:lsb][:id] contains LinuxMint" do
+      @ohai[:lsb][:id] = "LinuxMint"
       @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "mint"
+      @ohai[:platform].should == "linuxmint"
       @ohai[:platform_family].should == "debian"
     end
     it "should set platform to debian and platform_family to debian [:lsb][:id] contains Debian" do
@@ -354,59 +354,79 @@ describe Ohai::System, "Linux plugin platform" do
 
   describe "on suse" do
     before(:each) do
-      @ohai.lsb = nil
       File.should_receive(:exists?).with("/etc/SuSE-release").and_return(true)
     end
-  
-    it "should check for the existance of SuSE-release" do
-      @ohai._require_plugin("linux::platform")
-    end
-  
-    it "should set platform and platform_family to suse and bogus verion to 10.0" do
-      File.should_receive(:read).with("/etc/SuSE-release").at_least(:once).and_return("VERSION = 10.0")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "suse"
-      @ohai[:platform_family].should == "suse"
-    end
-  
-    it "should read the version as 10.1 for bogus SLES 10" do
-      File.should_receive(:read).with("/etc/SuSE-release").and_return("SUSE Linux Enterprise Server 10 (i586)\nVERSION = 10\nPATCHLEVEL = 1\n")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "suse"
-      @ohai[:platform_version].should == "10.1"
-      @ohai[:platform_family].should == "suse"
-    end
-  
-    it "should read the version as 11.2" do
-      File.should_receive(:read).with("/etc/SuSE-release").and_return("SUSE Linux Enterprise Server 11.2 (i586)\nVERSION = 11\nPATCHLEVEL = 2\n")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "suse"
-      @ohai[:platform_version].should == "11.2"
-      @ohai[:platform_family].should == "suse"
-    end
-    
-    it "[OHAI-272] should read the version as 11.3" do
-      File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("openSUSE 11.3 (x86_64)\nVERSION = 11.3")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "suse"
-      @ohai[:platform_version].should == "11.3"
-      @ohai[:platform_family].should == "suse"
-    end
-    
-    it "[OHAI-272] should read the version as 9.1" do
-      File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("SuSE Linux 9.1 (i586)\nVERSION = 9.1")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "suse"
-      @ohai[:platform_version].should == "9.1"
-      @ohai[:platform_family].should == "suse"
+
+    describe "with lsb_release results" do
+      before(:each) do
+        @ohai[:lsb][:id] = "SUSE LINUX"
+      end
+      
+      it "should read the platform as suse" do
+        @ohai[:lsb][:release] = "12.1"
+        File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("openSUSE 12.1 (x86_64)\nVERSION = 12.1\nCODENAME = Asparagus\n")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "suse"
+        @ohai[:platform_version].should == "12.1"
+        @ohai[:platform_family].should == "suse"
+      end
     end
-    
-    it "[OHAI-272] should read the version as 11.4" do
-      File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("openSUSE 11.4 (i586)\nVERSION = 11.4\nCODENAME = Celadon")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "suse"
-      @ohai[:platform_version].should == "11.4"
-      @ohai[:platform_family].should == "suse"
+
+    describe "without lsb_release results" do
+      before(:each) do
+        @ohai.lsb = nil
+      end
+      
+      it "should check for the existance of SuSE-release" do
+        @ohai._require_plugin("linux::platform")
+      end
+      
+      it "should set platform and platform_family to suse and bogus verion to 10.0" do
+        File.should_receive(:read).with("/etc/SuSE-release").at_least(:once).and_return("VERSION = 10.0")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "suse"
+        @ohai[:platform_family].should == "suse"
+      end
+      
+      it "should read the version as 10.1 for bogus SLES 10" do
+        File.should_receive(:read).with("/etc/SuSE-release").and_return("SUSE Linux Enterprise Server 10 (i586)\nVERSION = 10\nPATCHLEVEL = 1\n")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "suse"
+        @ohai[:platform_version].should == "10.1"
+        @ohai[:platform_family].should == "suse"
+      end
+      
+      it "should read the version as 11.2" do
+        File.should_receive(:read).with("/etc/SuSE-release").and_return("SUSE Linux Enterprise Server 11.2 (i586)\nVERSION = 11\nPATCHLEVEL = 2\n")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "suse"
+        @ohai[:platform_version].should == "11.2"
+        @ohai[:platform_family].should == "suse"
+      end
+      
+      it "[OHAI-272] should read the version as 11.3" do
+        File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("openSUSE 11.3 (x86_64)\nVERSION = 11.3")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "suse"
+        @ohai[:platform_version].should == "11.3"
+        @ohai[:platform_family].should == "suse"
+      end
+      
+      it "[OHAI-272] should read the version as 9.1" do
+        File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("SuSE Linux 9.1 (i586)\nVERSION = 9.1")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "suse"
+        @ohai[:platform_version].should == "9.1"
+        @ohai[:platform_family].should == "suse"
+      end
+      
+      it "[OHAI-272] should read the version as 11.4" do
+        File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("openSUSE 11.4 (i586)\nVERSION = 11.4\nCODENAME = Celadon")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "suse"
+        @ohai[:platform_version].should == "11.4"
+        @ohai[:platform_family].should == "suse"
+      end
     end
   end
 

data/spec/ohai/plugins/linux/virtualization_spec.rb

@@ -32,7 +32,8 @@ describe Ohai::System, "Linux virtualization platform" do
     File.stub!(:exists?).with("/proc/cpuinfo").and_return(false)
     File.stub!(:exists?).with("/usr/sbin/dmidecode").and_return(false)
     File.stub!(:exists?).with("/proc/self/status").and_return(false)
-    File.stub!(:exists?).with("/proc/user_beancounters").and_return(false)
+    File.stub!(:exists?).with("/proc/bc/0").and_return(false)
+    File.stub!(:exists?).with("/proc/vz").and_return(false)
   end
 
   describe "when we are checking for xen" do
@@ -216,24 +217,24 @@ VMWARE
     end
   end
 	describe "when we are checking for openvz" do
-		it "should set openvz host if /proc/user_beancounters contains 0:" do
-			File.should_receive(:exists?).with("/proc/user_beancounters").and_return(true)
-			File.stub!(:read).with("/proc/user_beancounters").and_return("\n 0: ")
+		it "should set openvz host if /proc/bc/0 exists" do
+			File.should_receive(:exists?).with("/proc/bc/0").and_return(true)
 			@ohai._require_plugin("linux::virtualization")
-			@ohai[:virtualization][:emulator].should == "openvz"
+			@ohai[:virtualization][:system].should == "openvz"
 			@ohai[:virtualization][:role].should == "host"
 		end
 
-		it "should set openvz guest if /proc/user_beancounters doesn't contain 0:" do
-			File.should_receive(:exists?).with("/proc/user_beancounters").and_return(true)
-			File.stub!(:read).with("/proc/user_beancounters").and_return("101:")
+		it "should set openvz guest if /proc/bc/0 doesn't exist and /proc/vz exists" do
+			File.should_receive(:exists?).with("/proc/bc/0").and_return(false)
+			File.should_receive(:exists?).with("/proc/vz").and_return(true)
 			@ohai._require_plugin("linux::virtualization")
-			@ohai[:virtualization][:emulator].should == "openvz"
+			@ohai[:virtualization][:system].should == "openvz"
 			@ohai[:virtualization][:role].should == "guest"
 		end
 
 		it "should not set virtualization if openvz isn't there" do
-			File.should_receive(:exists?).at_least(:once).and_return(false)
+			File.should_receive(:exists?).with("/proc/bc/0").and_return(false)
+			File.should_receive(:exists?).with("/proc/vz").and_return(false)
 			@ohai._require_plugin("linux::virtualization")
 			@ohai[:virtualization].should == {}
 		end

data/spec/ohai/plugins/os_spec.rb

@@ -72,4 +72,15 @@ describe Ohai::System, "plugin os" do
       @ohai[:os].should == "solaris2"
     end
   end
+
+  describe "on something we have never seen before, but ruby has" do
+    before do
+      ::RbConfig::CONFIG['host_os'] = "tron"
+    end
+
+    it "sets the os to the ruby 'host_os'" do
+      @ohai._require_plugin("os")
+      @ohai[:os].should == "tron"
+    end
+  end
 end

data/spec/ohai/plugins/platform_spec.rb

@@ -35,7 +35,7 @@ describe Ohai::System, "plugin platform" do
   it "should set the platform and platform family to the os if it was not set earlier" do
     @ohai._require_plugin("platform")
     @ohai[:platform].should eql("monkey")
-    @ohai[:platform_family].should eql ("monkey")
+    @ohai[:platform_family].should eql("monkey")
   end
   
   it "should not set the platform to the os if it was set earlier" do
@@ -48,14 +48,14 @@ describe Ohai::System, "plugin platform" do
     @ohai[:platform] = 'lars'
     @ohai[:platform_family] = 'jack'
     @ohai._require_plugin("platform")
-    @ohai[:platform_family].should eql ("jack")
+    @ohai[:platform_family].should eql("jack")
   end
  
   it "should not set the platform_family if the platform_family was set earlier." do
     @ohai[:platform] = 'lars'
     @ohai._require_plugin("platform")
     @ohai[:platform].should eql("lars")
-    @ohai[:platform_family].should eql ("lars")
+    @ohai[:platform_family].should eql("lars")
   end
 
   it "should set the platform_version to the os_version if it was not set earlier" do

data/spec/ohai/plugins/rackspace_spec.rb

@@ -22,38 +22,38 @@ describe Ohai::System, "plugin rackspace" do
     @ohai = Ohai::System.new
     @ohai.stub!(:require_plugin).and_return(true)
     @ohai[:network] = {:interfaces => {:eth0 => {"addresses"=> {
-          "1.2.3.4"=> {
-            "broadcast"=> "67.23.20.255",
-            "netmask"=> "255.255.255.0",
-            "family"=> "inet"
-          },
-          "fe80::4240:95ff:fe47:6eed"=> {
-            "scope"=> "Link",
-            "prefixlen"=> "64",
-            "family"=> "inet6"
-          },
-          "40:40:95:47:6E:ED"=> {
-            "family"=> "lladdr"
-          }
-        }}
+      "1.2.3.4"=> {
+        "broadcast"=> "67.23.20.255",
+        "netmask"=> "255.255.255.0",
+        "family"=> "inet"
+      },
+      "fe80::4240:95ff:fe47:6eed"=> {
+        "scope"=> "Link",
+        "prefixlen"=> "64",
+        "family"=> "inet6"
+      },
+      "40:40:95:47:6E:ED"=> {
+        "family"=> "lladdr"
       }
+      }}
     }
-
-    @ohai[:network][:interfaces][:eth1] = {:addresses => {
-         "fe80::4240:f5ff:feab:2836" => {
-            "scope"=> "Link",
-            "prefixlen"=> "64",
-            "family"=> "inet6"
-          },
-          "5.6.7.8"=> {
-            "broadcast"=> "10.176.191.255",
-            "netmask"=> "255.255.224.0",
-            "family"=> "inet"
-          },
-          "40:40:F5:AB:28:36" => {
-            "family"=> "lladdr"
-          }
-        }}
+  }
+
+  @ohai[:network][:interfaces][:eth1] = {:addresses => {
+    "fe80::4240:f5ff:feab:2836" => {
+      "scope"=> "Link",
+      "prefixlen"=> "64",
+      "family"=> "inet6"
+    },
+    "5.6.7.8"=> {
+      "broadcast"=> "10.176.191.255",
+      "netmask"=> "255.255.224.0",
+      "family"=> "inet"
+    },
+    "40:40:F5:AB:28:36" => {
+      "family"=> "lladdr"
+    }
+    }}
   end
 
   shared_examples_for "!rackspace"  do
@@ -84,32 +84,63 @@ describe Ohai::System, "plugin rackspace" do
 
   end
 
-    describe "with rackspace mac and hostname" do
-      it_should_behave_like "rackspace"
+  describe "with rackspace mac and hostname" do
+    it_should_behave_like "rackspace"
 
-      before(:each) do
-        IO.stub!(:select).and_return([[],[1],[]])
-        @ohai[:hostname] = "slice74976"
-        @ohai[:network][:interfaces][:eth0][:arp] = {"67.23.20.1" => "00:00:0c:07:ac:01"}
-      end
+    before(:each) do
+      IO.stub!(:select).and_return([[],[1],[]])
+      @ohai[:hostname] = "slice74976"
+      @ohai[:network][:interfaces][:eth0][:arp] = {"67.23.20.1" => "00:00:0c:07:ac:01"}
     end
+  end
 
-    describe "without rackspace mac" do
-      it_should_behave_like "!rackspace"
+  describe "without rackspace mac" do
+    it_should_behave_like "!rackspace"
 
-      before(:each) do
-        @ohai[:hostname] = "slice74976"
-        @ohai[:network][:interfaces][:eth0][:arp] = {"169.254.1.0"=>"fe:ff:ff:ff:ff:ff"}
-      end
+    before(:each) do
+      @ohai[:hostname] = "slice74976"
+      @ohai[:network][:interfaces][:eth0][:arp] = {"169.254.1.0"=>"fe:ff:ff:ff:ff:ff"}
     end
+  end
+
+  describe "without rackspace hostname" do
+    it_should_behave_like "rackspace"
 
-    describe "without rackspace hostname" do
-      it_should_behave_like "rackspace"
+    before(:each) do
+      @ohai[:hostname] = "bubba"
+      @ohai[:network][:interfaces][:eth0][:arp] = {"67.23.20.1" => "00:00:0c:07:ac:01"}
+    end
+  end
+  
+  describe "with rackspace cloud file" do
+    it_should_behave_like "rackspace"
+
+    before(:each) do
+      File.stub!(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
+      File.stub!(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
+      File.stub!(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
+      File.stub!(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
+    end
+  end
 
-      before(:each) do
-        @ohai[:hostname] = "bubba"
-        @ohai[:network][:interfaces][:eth0][:arp] = {"67.23.20.1" => "00:00:0c:07:ac:01"}
-      end
+  describe "without cloud file" do
+    it_should_behave_like "!rackspace"
+  
+    before(:each) do
+      File.stub!(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(false)
+      File.stub!(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(false)
     end
+  end
+  
+  describe "with ec2 cloud file" do
+    it_should_behave_like "!rackspace"
+  
+    before(:each) do
+      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('')
+    end
+  end
 
 end

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

@@ -0,0 +1,77 @@
+#
+# Author:: Trevor O (<trevoro@joyent.com>)
+# Copyright:: Copyright (c) 2009 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 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, "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")
+  end
+  
+  describe "on SmartOS" do
+    before(:each) do
+      uname_x = <<-UNAME_X
+System = SunOS
+Node = node.example.com
+Release = 5.11
+KernelID = joyent_20120130T201844Z
+Machine = i86pc
+BusType = <unknown>
+Serial = <unknown>
+Users = <unknown>
+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)
+      
+      @release = StringIO.new("  SmartOS 20120130T201844Z x86_64\n")
+      @mock_file.stub!(:close).and_return(0)
+      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"
+    end
+
+    it "should set the platform" do
+      @ohai._require_plugin("solaris2::platform")
+      @ohai[:platform].should == "smartos"
+    end
+    
+    it "should set the platform_version" do
+      @ohai._require_plugin("solaris2::platform")
+      @ohai[:platform_version].should == "20120130T201844Z"
+    end
+
+  end
+
+end