ohai 6.24.2 → 7.0.0.rc.0

data/spec/unit/plugins/nodejs_spec.rb

@@ -1,6 +1,8 @@
 #
 # Author:: Jacques Marneweck (<jacques@powertrip.co.za>)
+# Author:: Theodore Nordsieck (<theo@opscode.com>)
 # Copyright:: Copyright (c) Jacques Marneweck
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,31 +23,27 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_he
 describe Ohai::System, "plugin nodejs" do
 
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai[:languages] = Mash.new
-    @ohai.stub!(:require_plugin).and_return(true)
-    @status = 0
+    @plugin = get_plugin("nodejs")
+    @plugin[:languages] = Mash.new
     @stdout = "v0.8.11\n"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"node -v"}).and_return([@status, @stdout, @stderr])
+    @plugin.stub(:shell_out).with("node -v").and_return(mock_shell_out(0, @stdout, ""))
   end
 
   it "should get the nodejs version from running node -v" do
-    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"node -v"}).and_return([0, "v0.8.11\n", ""])
-    @ohai._require_plugin("nodejs")
+    @plugin.should_receive(:shell_out).with("node -v").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
   end
 
   it "should set languages[:nodejs][:version]" do
-    @ohai._require_plugin("nodejs")
-    @ohai.languages[:nodejs][:version].should eql("0.8.11")
+    @plugin.run
+    @plugin.languages[:nodejs][:version].should eql("0.8.11")
   end
 
   it "should not set the languages[:nodejs] tree up if node command fails" do
-    @status = 1
     @stdout = "v0.8.11\n"
-    @stderr = ""
-    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"node -v"}).and_return([@status, @stdout, @stderr])
-    @ohai._require_plugin("nodejs")
-    @ohai.languages.should_not have_key(:nodejs)
+    @plugin.stub(:shell_out).with("node -v").and_return(mock_shell_out(1, @stdout, ""))
+    @plugin.run
+    @plugin.languages.should_not have_key(:nodejs)
   end
+
 end

data/spec/unit/plugins/ohai_spec.rb

@@ -22,12 +22,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin ohai" do
   before(:each) do
-    @ohai = Ohai::System.new
-    @ohai.stub!(:require_plugin).and_return(true)
+    @plugin = get_plugin("ohai")
   end
   
   it "should set [:chef_packages][:ohai][:version] to the current version" do
-    @ohai._require_plugin("ohai")
-    @ohai[:chef_packages][:ohai][:version].should == Ohai::VERSION
+    @plugin.run
+    @plugin[:chef_packages][:ohai][:version].should == Ohai::VERSION
   end
 end

data/spec/unit/plugins/ohai_time_spec.rb

@@ -21,26 +21,25 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::System, "plugin ohai_time" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
+    @plugin = get_plugin("ohai_time")
   end
   
   it "should get the current time" do
     Time.should_receive(:now)
-    @ohai._require_plugin("ohai_time")
+    @plugin.run
   end
   
   it "should turn the time into a floating point number" do
     time = Time.now
     time.should_receive(:to_f)
-    Time.stub!(:now).and_return(time)
-    @ohai._require_plugin("ohai_time")
+    Time.stub(:now).and_return(time)
+    @plugin.run
   end
   
   it "should set ohai_time to the current time" do
     time = Time.now
-    Time.stub!(:now).and_return(time)
-    @ohai._require_plugin("ohai_time")
-    @ohai[:ohai_time].should == time.to_f    
+    Time.stub(:now).and_return(time)
+    @plugin.run
+    @plugin[:ohai_time].should == time.to_f    
   end
-end
+end

data/spec/unit/plugins/openbsd/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,24 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "OpenBSD hostname plugin" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:os] = "openbsd"
-    @ohai.stub!(:from).with("hostname -s").and_return("katie")
-    @ohai.stub!(:from).with("hostname").and_return("katie.bethell")
+    @plugin = get_plugin("hostname")
+    @plugin.stub(:collect_os).and_return(:openbsd)
+    @plugin.stub(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie\n", ""))
+    @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
+    @plugin.stub(:resolve_fqdn).and_return("katie.bethell")
+  end
+
+  it_should_check_from("linux::hostname", "hostname", "hostname -s", "katie")
+
+  it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
+
+  it "should use #resolve_fqdn to find the fqdn" 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_check_from("openbsd::hostname", "hostname", "hostname -s", "katie")
-  
-  it_should_check_from("openbsd::hostname", "fqdn", "hostname", "katie.bethell")
 end

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

@@ -21,17 +21,17 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "OpenBSD 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] = "openbsd"
+    @plugin = get_plugin("kernel")
+    @plugin.stub(:collect_os).and_return(:openbsd)
+    @plugin.stub(:init_kernel).and_return({})
+    @plugin.stub(:shell_out).with("uname -i").and_return(mock_shell_out(0, "foo", ""))
+    @plugin.stub(:shell_out).with("sysctl kern.securelevel").and_return(mock_shell_out(0, "kern.securelevel: 1\n", ""))
+    @plugin.stub(:shell_out).with( Ohai.abs_path( "/usr/bin/modstat" )).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("openbsd::kernel")
-    @ohai[:kernel][:os].should == @ohai[:kernel][:name]
+    @plugin.run
+    @plugin[:kernel][:os].should == @plugin[:kernel][:name]
   end
 
 end

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

@@ -21,20 +21,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
 describe Ohai::System, "OpenBSD 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("OpenBSD")
-    @ohai.stub!(:from).with("uname -r").and_return("4.5")
-    @ohai[:os] = "openbsd"
-  end
-  
-  it "should set platform to lowercased lsb[:id]" do
-    @ohai._require_plugin("openbsd::platform")        
-    @ohai[:platform].should == "openbsd"
+    @plugin = get_plugin("openbsd/platform")
+    @plugin.stub(:shell_out).with("uname -s").and_return(mock_shell_out(0, "OpenBSD\n", ""))
+    @plugin.stub(:shell_out).with("uname -r").and_return(mock_shell_out(0, "4.5\n", ""))
+    @plugin.stub(:collect_os).and_return(:openbsd)
   end
   
   it "should set platform_version to lsb[:release]" do
-    @ohai._require_plugin("openbsd::platform")
-    @ohai[:platform_version].should == "4.5"
+    @plugin.run
+    @plugin[:platform_version].should == "4.5"
   end
 end  

data/spec/unit/plugins/openstack_spec.rb

@@ -0,0 +1,214 @@
+#
+# Author:: Daniel DeLeo (dan@getchef.com)
+# Copyright:: Copyright (c) 2014 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 CONDIT"Net::HTTP Response"NS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'ohai/plugins/openstack'
+
+describe "OpenStack Plugin" do
+
+  let(:openstack_hint) { false }
+  let(:hp_hint) { false }
+
+  let(:ohai_system) { Ohai::System.new }
+  let(:ohai_data) { ohai_system.data }
+
+  let(:openstack_plugin) do
+    plugin = get_plugin("openstack", ohai_system)
+    plugin.stub(:hint?).with("openstack").and_return(openstack_hint)
+    plugin.stub(:hint?).with("hp").and_return(hp_hint)
+    plugin
+  end
+
+  before do
+  end
+
+  context "when there is no relevant hint" do
+
+    it "does not set any openstack data" do
+      openstack_plugin.run
+      expect(ohai_data).to_not have_key("openstack")
+    end
+
+  end
+
+  context "when there is an `openstack` hint" do
+    let(:openstack_hint) { true }
+
+    context "and the metadata service is not available" do
+
+      before do
+        openstack_plugin.should_receive(:can_metadata_connect?).
+          with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80).
+          and_return(false)
+      end
+
+      it "does not set any openstack data" do
+        openstack_plugin.run
+        expect(ohai_data).to_not have_key("openstack")
+      end
+    end
+
+    context "and the metadata service is available" do
+
+      let(:metadata_version) { "2009-04-04" }
+
+      let(:metadata_root) do
+        <<EOM
+reservation-id
+public-keys/
+security-groups
+public-ipv4
+ami-manifest-path
+instance-type
+instance-id
+local-ipv4
+ari-id
+local-hostname
+placement/
+ami-launch-index
+public-hostname
+hostname
+ami-id
+instance-action
+aki-id
+block-device-mapping/
+EOM
+      end
+
+      let(:metadata_values) do
+        {
+          "reservation-id" => "r-4tjvl99h",
+          "public-keys/" => "0=dan-default",
+          "public-keys/0/" => "openssh-key",
+          "public-keys/0/openssh-key" => "SSH KEY DATA",
+          "security-groups" => "default",
+          "public-ipv4" => "",
+          "ami-manifest-path" => "FIXME",
+          "instance-type" => "opc-tester",
+          "instance-id" => "i-0000162a",
+          "local-ipv4" => "172.31.7.23",
+          "ari-id" => "ari-00000037",
+          "local-hostname" => "ohai-7-system-test.opscode.us",
+          "placement/" => "availability-zone",
+          "placement/availability-zone" => "nova",
+          "ami-launch-index" => "0",
+          "public-hostname" => "ohai-7-system-test.opscode.us",
+          "hostname" => "ohai-7-system-test.opscode.us",
+          "ami-id" => "ami-00000035",
+          "instance-action" => "none",
+          "aki-id" => "aki-00000036",
+          "block-device-mapping/" => "ami\nroot",
+          "block-device-mapping/ami" => "vda",
+          "block-device-mapping/root" => "/dev/vda"
+        }
+      end
+
+      let(:http_client) { double("Net::HTTP", :read_timeout= => nil) }
+
+      def expect_get(url, response_body)
+        http_client.should_receive(:get).
+          with(url).
+          and_return(double("HTTP Response", :code => "200", :body => response_body))
+      end
+
+      before do
+        openstack_plugin.should_receive(:can_metadata_connect?).
+          with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80).
+          and_return(true)
+
+        Net::HTTP.stub(:start).
+          with(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR).
+          and_return(http_client)
+
+        openstack_plugin.stub(:best_api_version).and_return(metadata_version)
+
+        expect_get("/#{metadata_version}/meta-data/", metadata_root)
+
+        metadata_values.each do |md_id, md_value|
+          expect_get("/#{metadata_version}/meta-data/#{md_id}", md_value)
+        end
+
+        openstack_plugin.run
+      end
+
+      it "reads the reservation_id from the metadata service" do
+        expect(ohai_data['openstack']['reservation_id']).to eq("r-4tjvl99h")
+      end
+      it "reads the public_keys_0_openssh_key from the metadata service" do
+        expect(ohai_data['openstack']['public_keys_0_openssh_key']).to eq("SSH KEY DATA")
+      end
+      it "reads the security_groups from the metadata service" do
+        expect(ohai_data['openstack']['security_groups']).to eq(["default"])
+      end
+      it "reads the public_ipv4 from the metadata service" do
+        expect(ohai_data['openstack']['public_ipv4']).to eq("")
+      end
+      it "reads the ami_manifest_path from the metadata service" do
+        expect(ohai_data['openstack']['ami_manifest_path']).to eq("FIXME")
+      end
+      it "reads the instance_type from the metadata service" do
+        expect(ohai_data['openstack']['instance_type']).to eq("opc-tester")
+      end
+      it "reads the instance_id from the metadata service" do
+        expect(ohai_data['openstack']['instance_id']).to eq("i-0000162a")
+      end
+      it "reads the local_ipv4 from the metadata service" do
+        expect(ohai_data['openstack']['local_ipv4']).to eq("172.31.7.23")
+      end
+      it "reads the ari_id from the metadata service" do
+        expect(ohai_data['openstack']['ari_id']).to eq("ari-00000037")
+      end
+      it "reads the local_hostname from the metadata service" do
+        expect(ohai_data['openstack']['local_hostname']).to eq("ohai-7-system-test.opscode.us")
+      end
+      it "reads the placement_availability_zone from the metadata service" do
+        expect(ohai_data['openstack']['placement_availability_zone']).to eq("nova")
+      end
+      it "reads the ami_launch_index from the metadata service" do
+        expect(ohai_data['openstack']['ami_launch_index']).to eq("0")
+      end
+      it "reads the public_hostname from the metadata service" do
+        expect(ohai_data['openstack']['public_hostname']).to eq("ohai-7-system-test.opscode.us")
+      end
+      it "reads the hostname from the metadata service" do
+        expect(ohai_data['openstack']['hostname']).to eq("ohai-7-system-test.opscode.us")
+      end
+      it "reads the ami_id from the metadata service" do
+        expect(ohai_data['openstack']['ami_id']).to eq("ami-00000035")
+      end
+      it "reads the instance_action from the metadata service" do
+        expect(ohai_data['openstack']['instance_action']).to eq("none")
+      end
+      it "reads the aki_id from the metadata service" do
+        expect(ohai_data['openstack']['aki_id']).to eq("aki-00000036")
+      end
+      it "reads the block_device_mapping_ami from the metadata service" do
+        expect(ohai_data['openstack']['block_device_mapping_ami']).to eq("vda")
+      end
+      it "reads the block_device_mapping_root from the metadata service" do
+        expect(ohai_data['openstack']['block_device_mapping_root']).to eq("/dev/vda")
+      end
+      it "reads the provider from the metadata service" do
+        expect(ohai_data['openstack']['provider']).to eq("openstack")
+      end
+    end
+
+
+  end
+end
+

data/spec/unit/plugins/os_spec.rb

@@ -23,12 +23,9 @@ ORIGINAL_CONFIG_HOST_OS = ::RbConfig::CONFIG['host_os']
 
 describe Ohai::System, "plugin os" do
   before(:each) do
-    @ohai = Ohai::System.new    
-    @ohai.stub!(:require_plugin).and_return(true)
-    @ohai[:languages] = Mash.new
-    @ohai[:languages][:ruby] = Mash.new
-    @ohai[:kernel] = Mash.new
-    @ohai[:kernel][:release] = "kings of leon"
+    @plugin = get_plugin("os")
+    @plugin[:kernel] = Mash.new
+    @plugin[:kernel][:release] = "kings of leon"
   end
   
   after do
@@ -36,8 +33,8 @@ describe Ohai::System, "plugin os" do
   end
 
   it "should set os_version to kernel_release" do
-    @ohai._require_plugin("os")
-    @ohai[:os_version].should == @ohai[:kernel][:release]
+    @plugin.run
+    @plugin[:os_version].should == @plugin[:kernel][:release]
   end
   
   describe "on linux" do
@@ -46,8 +43,8 @@ describe Ohai::System, "plugin os" do
     end
     
     it "should set the os to linux" do
-      @ohai._require_plugin("os")
-      @ohai[:os].should == "linux"
+      @plugin.run
+      @plugin[:os].should == "linux"
     end
   end
   
@@ -57,8 +54,8 @@ describe Ohai::System, "plugin os" do
     end
     
     it "should set the os to darwin" do
-      @ohai._require_plugin("os")
-      @ohai[:os].should == "darwin"
+      @plugin.run
+      @plugin[:os].should == "darwin"
     end
   end
   
@@ -68,8 +65,8 @@ describe Ohai::System, "plugin os" do
     end
     
     it "sets the os to solaris2" do
-      @ohai._require_plugin("os")
-      @ohai[:os].should == "solaris2"
+      @plugin.run
+      @plugin[:os].should == "solaris2"
     end
   end
 
@@ -79,8 +76,8 @@ describe Ohai::System, "plugin os" do
     end
 
     it "sets the os to the ruby 'host_os'" do
-      @ohai._require_plugin("os")
-      @ohai[:os].should == "tron"
+      @plugin.run
+      @plugin[:os].should == "tron"
     end
   end
 end