ohai 7.4.1 → 7.6.0.rc.0

data/lib/ohai/plugins/linux/platform.rb

@@ -55,6 +55,10 @@ Ohai.plugin(:Platform) do
         end
         platform_version File.read("/etc/debian_version").chomp
       end
+    elsif File.exists?("/etc/parallels-release")
+      contents = File.read("/etc/parallels-release").chomp
+      platform get_redhatish_platform(contents)
+      platform_version contents.match(/(\d\.\d\.\d)/)[0]
     elsif File.exists?("/etc/redhat-release")
       contents = File.read("/etc/redhat-release").chomp
       platform get_redhatish_platform(contents)
@@ -109,7 +113,7 @@ Ohai.plugin(:Platform) do
       platform_family "debian"
     when /fedora/
       platform_family "fedora"
-    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/, /cloudlinux/, /ibm_powerkvm/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
+    when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
       platform_family "rhel"
     when /suse/
       platform_family "suse"

data/lib/ohai/plugins/openstack.rb

@@ -22,6 +22,26 @@ Ohai.plugin(:Openstack) do
 
   include Ohai::Mixin::Ec2Metadata
 
+  def collect_openstack_metadata(addr = Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, api_version = '2013-04-04')
+    path = "/openstack/#{api_version}/meta_data.json"
+    uri = "http://#{addr}#{path}"
+    begin
+      response = http_client.get_response(URI.parse(uri),nil,nil)
+      case response.code
+      when '200'
+        FFI_Yajl::Parser.parse(response.body)
+      when '404'
+        Ohai::Log.debug("Encountered 404 response retreiving OpenStack specific metadata path: #{path} ; continuing.")
+        nil
+      else
+        raise "Encountered error retrieving OpenStack specific metadata (#{path} returned #{response.code} response)"
+      end
+    rescue => e
+      Ohai::Log.debug("Encountered error retrieving OpenStack specific metadata (#{uri}), due to #{e.class}")
+      nil
+    end
+  end
+
   collect_data do
     # Adds openstack Mash
     if hint?('openstack') || hint?('hp')
@@ -36,6 +56,8 @@ Ohai.plugin(:Openstack) do
           openstack['provider'] = 'hp'
         else
           openstack['provider'] = 'openstack'
+          Ohai::Log.debug("connecting to the OpenStack specific metadata service")
+          openstack['metadata'] = collect_openstack_metadata
         end
 
       else

data/lib/ohai/plugins/passwd.rb

@@ -32,7 +32,11 @@ Ohai.plugin(:Passwd) do
     end
 
     unless current_user
-      current_user fix_encoding(Etc.getlogin)
+      current_user fix_encoding(Etc.getpwuid(Process.euid).name)
     end
   end
+
+  collect_data(:windows) do
+    # Etc returns nil on Windows
+  end
 end

data/lib/ohai/plugins/python.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.
@@ -26,7 +26,7 @@ Ohai.plugin(:Python) do
 
     python = Mash.new
 
-    so = shell_out("python -c \"import sys; print sys.version\"")
+    so = shell_out("python -c \"import sys; print (sys.version)\"")
 
     if so.exitstatus == 0
       output = so.stdout.split

data/lib/ohai/plugins/solaris2/zpools.rb

@@ -26,7 +26,7 @@ Ohai.plugin(:Zpools) do
     so = shell_out("zpool list -H -o name,size,alloc,free,cap,dedup,health,version")
     so.stdout.lines do |line|
       case line
-      when /^([-_0-9A-Za-z]*)\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+(\d+%)\s+([.0-9]+x)\s+([-_0-9A-Za-z]+)\s+(\d+)$/
+      when /^([-_0-9A-Za-z]*)\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+(\d+%)\s+([.0-9]+x)\s+([-_0-9A-Za-z]+)\s+(\d+|-)$/
         pools[$1] = Mash.new
         pools[$1][:pool_size] = $2
         pools[$1][:pool_allocated] = $3

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '7.4.1'
+  VERSION = '7.6.0.rc.0'
 end

data/spec/unit/mixin/cloudstack_metadata_spec.rb

@@ -0,0 +1,33 @@
+#
+# Author:: Olle Lundberg (<geek@nerd.sh>)
+# 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 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 File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+require 'ohai/mixin/cloudstack_metadata'
+
+describe Ohai::Mixin::CloudstackMetadata do
+  let(:mixin) {
+    metadata_object = Object.new.extend(Ohai::Mixin::CloudstackMetadata)
+    metadata_object
+  }
+
+  context "#best_api_version" do
+    it "returns the string latest" do
+      mixin.best_api_version.should == "latest"
+    end
+  end
+end

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

@@ -25,8 +25,7 @@ describe Ohai::System, "AIX kernel plugin" do
     @plugin.stub(:shell_out).with("uname -r").and_return(mock_shell_out(0, "1", nil))
     @plugin.stub(:shell_out).with("uname -v").and_return(mock_shell_out(0, "6", nil))
     @plugin.stub(:shell_out).with("uname -p").and_return(mock_shell_out(0, "powerpc", nil))
-    @modules = Mash.new
-    @plugin.stub(:modules).and_return(@modules)
+    @plugin.stub(:shell_out).with("genkex -d").and_return(mock_shell_out(0, "    Text address     Size     Data address     Size File\nf1000000c0338000    77000 f1000000c0390000    1ec8c /usr/lib/drivers/cluster\n         6390000    20000          63a0000      ba8 /usr/lib/drivers/if_en", nil))
     @plugin.run
   end
 
@@ -47,6 +46,10 @@ describe Ohai::System, "AIX kernel plugin" do
   end
 
   it "detects the modules" do
-    @plugin[:kernel][:modules].should == @modules
+    @plugin[:kernel][:modules]["/usr/lib/drivers/cluster"]["text"].should == { "address" => "f1000000c0338000", "size" => "77000" }
+    @plugin[:kernel][:modules]["/usr/lib/drivers/cluster"]["data"].should == { "address" => "f1000000c0390000", "size" => "1ec8c" }
+    @plugin[:kernel][:modules]["/usr/lib/drivers/if_en"]["text"].should == { "address" => "6390000", "size" => "20000"}
+    @plugin[:kernel][:modules]["/usr/lib/drivers/if_en"]["data"].should == { "address" => "63a0000", "size" => "ba8"}
+
   end
 end

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

@@ -183,7 +183,7 @@ ARP_AN
         before do
           @plugin.stub(:shell_out).with("ifconfig en0").and_return(mock_shell_out(0, "inet6 ::1%1/0", nil))
           @plugin.run
-          @inet_entry = @plugin['network']['interfaces']['en0'][:addresses]["::1%1"]
+          @inet_entry = @plugin['network']['interfaces']['en0'][:addresses]["::1"]
         end
 
         it "detects the prefixlen" do

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

@@ -0,0 +1,53 @@
+#
+# Author:: Julian C. Dunn (<jdunn@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 CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+describe Ohai::System, "AIX virtualization plugin" do
+
+  context "inside an LPAR" do
+    let(:plugin) do
+      p = get_plugin("aix/virtualization")
+      allow(p).to receive(:collect_os).and_return(:aix)
+      allow(p).to receive(:shell_out).with("uname -L").and_return(mock_shell_out(0, "29 l273pp027", nil))
+      allow(p).to receive(:shell_out).with("uname -W").and_return(mock_shell_out(0, "0", nil))
+      p.run
+      p
+    end
+
+    it "uname -L detects the LPAR number and name" do
+      plugin[:virtualization][:lpar_no].should == "29"
+      plugin[:virtualization][:lpar_name].should == "l273pp027"
+    end
+  end
+
+  context "inside a WPAR" do
+    let(:plugin) do
+      p = get_plugin("aix/virtualization")
+      allow(p).to receive(:collect_os).and_return(:aix)
+      allow(p).to receive(:shell_out).with("uname -L").and_return(mock_shell_out(0, "43 l33t", nil))
+      allow(p).to receive(:shell_out).with("uname -W").and_return(mock_shell_out(0, "42", nil))
+      p.run
+      p
+    end
+
+    it "uname -W detects the WPAR number" do
+      plugin[:virtualization][:wpar_no].should == "42"
+    end
+  end
+
+end

data/spec/unit/plugins/cloud_spec.rb

@@ -29,6 +29,7 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:eucalyptus] = nil
       @plugin[:linode] = nil
       @plugin[:azure] = nil
+      @plugin[:cloudstack] = nil
       @plugin.run
       @plugin[:cloud].should be_nil
     end
@@ -205,4 +206,34 @@ describe Ohai::System, "plugin cloud" do
     end
   end
 
+  describe "with cloudstack mash" do
+    before do
+      @plugin[:cloudstack] = Mash.new()
+    end
+
+    it "populates cloud public ip" do
+      @plugin[:cloudstack]['public_ipv4'] = "174.129.150.8"
+      @plugin.run
+      @plugin[:cloud][:public_ips][0].should == @plugin[:cloudstack]['public_ipv4']
+    end
+
+    it "populates cloud private ip" do
+      @plugin[:cloudstack]['local_ipv4'] = "10.252.42.149"
+      @plugin.run
+      @plugin[:cloud][:private_ips][0].should == @plugin[:cloudstack]['local_ipv4']
+    end
+
+    it "populates cloud provider" do
+      @plugin.run
+      @plugin[:cloud][:provider].should == "cloudstack"
+    end
+
+    it "populates vm id" do
+      @plugin[:cloudstack]['vm_id'] = "8983fb85-fb7f-46d6-8af1-c1b6666fec39"
+      @plugin.run
+      @plugin[:cloud][:vm_id].should == @plugin[:cloudstack]['vm_id']
+    end
+  end
+
+
 end

data/spec/unit/plugins/cloudstack_spec.rb

@@ -0,0 +1,155 @@
+#
+# Author:: Olle Lundberg (<geek@nerd.sh>)
+# 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/cloudstack'
+
+describe "Cloudstack Plugin" do
+
+  let(:cloudstack_hint) { false }
+
+  let(:ohai_system) { Ohai::System.new }
+  let(:ohai_data) { ohai_system.data }
+
+  let(:cloudstack_plugin) do
+    plugin = get_plugin("cloudstack", ohai_system)
+    plugin.stub(:hint?).with("cloudstack").and_return(cloudstack_hint)
+    plugin
+  end
+
+  before do
+    stub_const("Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR", '10.10.10.10')
+  end
+
+  context "when there is no relevant hint" do
+
+    it "does not set any cloudstack data" do
+      cloudstack_plugin.run
+      expect(ohai_data).to_not have_key("cloudstack")
+    end
+
+  end
+
+  context "when there is a `cloudstack` hint" do
+    let(:cloudstack_hint) { true }
+
+    context "and the metadata service is not available" do
+
+      before do
+        cloudstack_plugin.should_receive(:can_metadata_connect?).
+          with(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR,80).
+          and_return(false)
+      end
+
+      it "does not set any cloudstack data" do
+        cloudstack_plugin.run
+        expect(ohai_data).to_not have_key("cloudstack")
+      end
+    end
+
+    context "and the metadata service is available" do
+
+      let(:metadata_version) { "latest" }
+
+      let(:metadata_root) do
+        <<EOM
+availability-zone
+cloud-identifier
+instance-id
+local-hostname
+local-ipv4
+public-hostname
+public-ipv4
+service-offering
+vm-id
+EOM
+      end
+
+      let(:metadata_values) do
+        {
+          "local-ipv4" =>"10.235.34.23",
+          "local-hostname" =>"VM-8983fb85-fb7f-46d6-8af1-c1b6666fec39",
+          "public-hostname" =>"awesome-doge",
+          "availability-zone" =>"TCS7",
+          "service-offering" =>"2vCPU, 1GHz, 2GB RAM",
+          "public-ipv4" =>"10.235.34.23",
+          "vm-id"=>"8983fb85-fb7f-46d6-8af1-c1b6666fec39",
+          "cloud-identifier"=>"CloudStack-{e84ff39d-ef64-4812-a8a9-7932f7b67f17}",
+          "instance-id"=>"8983fb85-fb7f-46d6-8af1-c1b6666fec39"
+        }
+      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
+        cloudstack_plugin.should_receive(:can_metadata_connect?).
+          with(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR,80).
+          and_return(true)
+
+        Net::HTTP.stub(:start).
+          with(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR).
+          and_return(http_client)
+
+        cloudstack_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
+
+        cloudstack_plugin.run
+      end
+
+     it "reads the local ipv4 from the metadata service" do
+        expect(ohai_data['cloudstack']['local_ipv4']).to eq("10.235.34.23")
+      end
+     it "reads the local hostname from the metadata service" do
+        expect(ohai_data['cloudstack']['local_hostname']).to eq("VM-8983fb85-fb7f-46d6-8af1-c1b6666fec39")
+      end
+     it "reads the public hostname from the metadata service" do
+        expect(ohai_data['cloudstack']['public_hostname']).to eq("awesome-doge")
+      end
+     it "reads the availability zone from the metadata service" do
+        expect(ohai_data['cloudstack']['availability_zone']).to eq("TCS7")
+      end
+     it "reads the service offering from the metadata service" do
+        expect(ohai_data['cloudstack']['service_offering']).to eq("2vCPU, 1GHz, 2GB RAM")
+      end
+     it "reads the public ipv4 from the metadata service" do
+        expect(ohai_data['cloudstack']['public_ipv4']).to eq("10.235.34.23")
+      end
+     it "reads the vm id from the metadata service" do
+        expect(ohai_data['cloudstack']['vm_id']).to eq("8983fb85-fb7f-46d6-8af1-c1b6666fec39")
+      end
+     it "reads the cloud identifier from the metadata service" do
+        expect(ohai_data['cloudstack']['cloud_identifier']).to eq("CloudStack-{e84ff39d-ef64-4812-a8a9-7932f7b67f17}")
+      end
+     it "reads the instance id from the metadata service" do
+        expect(ohai_data['cloudstack']['instance_id']).to eq("8983fb85-fb7f-46d6-8af1-c1b6666fec39")
+      end
+    end
+  end
+end
+

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

@@ -26,8 +26,8 @@ describe Ohai::System, "Darwin cpu plugin" do
     @plugin.stub(:shell_out).with("sysctl -n hw.physicalcpu").and_return(mock_shell_out(0, "4", ""))
     @plugin.stub(:shell_out).with("sysctl -n hw.logicalcpu").and_return(mock_shell_out(0, "8", ""))
     @plugin.stub(:shell_out).with("sysctl -n hw.cpufrequency").and_return(mock_shell_out(0, "2300000000", ""))
-    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.vendor").and_return(mock_shell_out(0, "GenuineIntel", ""))
-    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.brand_string").and_return(mock_shell_out(0, "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz", ""))
+    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.vendor").and_return(mock_shell_out(0, "GenuineIntel\n", ""))
+    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.brand_string").and_return(mock_shell_out(0, "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz\n", ""))
     @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.model").and_return(mock_shell_out(0, "58", ""))
     @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.family").and_return(mock_shell_out(0, "6", ""))
     @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.stepping").and_return(mock_shell_out(0, "9", ""))

data/spec/unit/plugins/go_spec.rb

@@ -0,0 +1,44 @@
+# Author:: Christian Vozar (<christian@rogueethic.com>)
+# 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.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
+
+describe Ohai::System, "plugin go" do
+
+  before(:each) do
+    @plugin = get_plugin("go")
+    @plugin[:languages] = Mash.new
+    @stdout = "go version go1.1.2 darwin/amd64\n"
+    @plugin.stub(:shell_out).with("go version").and_return(mock_shell_out(0, @stdout, ""))
+  end
+
+  it "should get the go version" do
+    @plugin.should_receive(:shell_out).with("go version").and_return(mock_shell_out(0, @stdout, ""))
+    @plugin.run
+  end
+
+  it "should set languages[:go][:version]" do
+    @plugin.run
+    @plugin.languages[:go][:version].should eql("1.1.2")
+  end
+
+  it "should not set the languages[:go] tree up if go command fails" do
+    @stdout = "go version go1.1.2 darwin/amd64\n"
+    @plugin.stub(:shell_out).with("go version").and_return(mock_shell_out(1, @stdout, ""))
+    @plugin.run
+    @plugin.languages.should_not have_key(:go)
+  end
+
+end