ohai 7.0.0.rc.1 → 7.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c20193b00541eb3fa82ee6c3bcd45c78636a73
-  data.tar.gz: fdc15bb6c846111f6208a280d1c0b6a0dd38e347
+  metadata.gz: 533f13f1b7eb1ff6e7dd001f5ca234c6332db38c
+  data.tar.gz: 440b071fec79b90937919a22f1182e717a41234e
 SHA512:
-  metadata.gz: 6ae37b1d6f17e5b02669d1f511e2af2f7292c6a3a985c938fd498899131a267758a3c9feea5ddb94feb60c9ae70fe83bc3af05717546f9110063557bb23d29cd
-  data.tar.gz: c940b03c17459ecb3190c1b801144017d888e38941512b5929d1ffab8bc78018d9067e9cb619d4987c6b92d7d20a0b56d972e1dc96e8bee60888a9cdfa662630
+  metadata.gz: 54ed83d812f3c567ba2da77867eedfe269d8914a200cac7922d6c7ff05a05e2ee95a27d5af6f06a26f94052bbf244ae3494f2bd682b6b746aa4f2cd1dc259c3f
+  data.tar.gz: b66322b8b5d3acf70e43f3efb39ae8a25da7b56cc3be84f5d2d46802908fb13bf908a9227852e51cbc7ffd876184d7e382eaf5f5d3600157e07cdcd37f6fea2b

data/lib/ohai/plugins/cloud.rb

@@ -207,7 +207,9 @@ Ohai.plugin(:Cloud) do
   def get_azure_values
     cloud[:vm_name] = azure["vm_name"]
     cloud[:public_ips] << azure['public_ip']
+    cloud[:public_ipv4] = azure['public_ip']
     cloud[:public_fqdn] = azure['public_fqdn']
+    cloud[:public_hostname] = azure['public_fqdn']
     cloud[:public_ssh_port] = azure['public_ssh_port'] if azure['public_ssh_port']
     cloud[:public_winrm_port] = azure['public_winrm_port'] if azure['public_winrm_port']
     cloud[:provider] = "azure"

data/lib/ohai/plugins/cloud_v2.rb

@@ -0,0 +1,289 @@
+#
+# Author:: Cary Penniman (<cary@rightscale.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.
+
+Ohai.plugin(:CloudV2) do
+  provides "cloud_v2"
+
+  depends "ec2"
+  depends "gce"
+  depends "rackspace"
+  depends "eucalyptus"
+  depends "linode"
+  depends "openstack"
+  depends "azure"
+
+  # Class to help enforce the interface exposed to node[:cloud] (OHAI-542)
+  #
+  # cloud[:provider] - (String) the cloud provider the VM is running on.
+  #
+  # cloud[:public_hostname] - (String) a fully qualified hostname
+  # cloud[:local_hostname] - (String) a hostname resolvable on the internal (private) network
+  #
+  # cloud[:public_ipv4_addrs] - (Array) a list of all publicly accessible IPv4 addresses
+  # cloud[:local_ipv4_addrs] - (Array) a list of all private IPv4 addresses
+  # cloud[:public_ipv4] - (String) the first public IPv4 address detected
+  # cloud[:local_ipv4] - (String) the first private IPv4 address detected
+  #
+  # cloud[:public_ipv6_addrs] - (Array) a list of all publicly accessible IPv6 addresses
+  # cloud[:local_ipv6_addrs] - (Array) a list of all private IPv6 addresses
+  # cloud[:public_ipv6] - (String) the first public IPv6 address detected
+  # cloud[:local_ipv6] - (String) the first private IPv6 address detected
+  #
+  class CloudAttrs
+    attr_writer :provider, :public_hostname, :local_hostname
+
+    def initialize
+      @cloud = Mash.new
+    end
+
+    def add_ipv4_addr(ip, accessibility)
+      return if ip.nil? # just skip if ip is nil
+      ipaddr = validate_ip_addr(ip, :ipv4)
+
+      case accessibility
+      when :public
+        @cloud[:public_ipv4_addrs] ||= Array.new
+        @cloud[:public_ipv4_addrs] << ipaddr.to_s
+      when :private
+        @cloud[:local_ipv4_addrs] ||= Array.new
+        @cloud[:local_ipv4_addrs] << ipaddr.to_s
+      else
+        raise "ERROR: in valid accessibility param of '#{accessibility}'. must be :public or :private."
+      end
+    end
+
+    def add_ipv6_addr(ip, accessibility)
+      return if ip.nil? # just skip if ip is nil
+      ipaddr = validate_ip_addr(ip, :ipv6)
+
+      raise "ERROR: invalid ipv6 address of '#{ip}' detected. " unless ipaddr.ipv6?
+      case accessibility
+      when :public
+        @cloud[:public_ipv6_addrs] ||= Array.new
+        @cloud[:public_ipv6_addrs] << ipaddr.to_s
+      when :private
+        @cloud[:local_ipv6_addrs] ||= Array.new
+        @cloud[:local_ipv6_addrs] << ipaddr.to_s
+      else
+        raise "ERROR: in valid accessibility param of '#{accessibility}'. must be :public or :private."
+      end
+    end
+
+    def cloud_mash
+      @cloud[:provider] = @provider if @provider
+
+      @cloud[:public_hostname] = @public_hostname if @public_hostname
+      @cloud[:local_hostname] = @local_hostname if @local_hostname
+
+      @cloud[:public_ipv4] = @cloud[:public_ipv4_addrs][0] if @cloud[:public_ipv4_addrs]
+      @cloud[:local_ipv4] = @cloud[:local_ipv4_addrs][0] if @cloud[:local_ipv4_addrs]
+
+      @cloud[:public_ipv6] = @cloud[:public_ipv6_addrs][0] if @cloud[:public_ipv6_addrs]
+      @cloud[:local_ipv6] = @cloud[:local_ipv6_addrs][0] if @cloud[:local_ipv6_addrs]
+
+      # if empty, return nil
+      (@cloud.empty?) ? nil : @cloud
+    end
+
+    private
+
+    def validate_ip_addr(ip, address_family = :ipv4)
+      ipaddr = ""
+      begin
+        ipaddr = IPAddr.new(ip)
+        raise ArgumentError, "not valid #{address_family} address" unless (address_family == :ipv4) ? ipaddr.ipv4? : ipaddr.ipv6?
+      rescue ArgumentError => e
+        raise "ERROR: the ohai 'cloud' plugin failed with an IP address of '#{ip}' : #{e.message}"
+      end
+      ipaddr
+    end
+  end
+
+
+  #---------------------------------------
+  # Google Compute Engine (gce)
+  #--------------------------------------
+
+  def on_gce?
+    gce != nil
+  end
+
+  def get_gce_values
+    public_ips = gce['instance']['networkInterfaces'].collect do |interface|
+      if interface.has_key?('accessConfigs')
+        interface['accessConfigs'].collect{|ac| ac['externalIp']}
+      end
+    end.flatten.compact
+
+    private_ips = gce['instance']['networkInterfaces'].collect do |interface|
+      interface['ip']
+    end.compact
+
+    public_ips.each { |ipaddr|  @cloud_attr_obj.add_ipv4_addr(ipaddr, :public) }
+    private_ips.each { |ipaddr|  @cloud_attr_obj.add_ipv4_addr(ipaddr, :private) }
+    @cloud_attr_obj.local_hostname = gce['instance']['hostname']
+    @cloud_attr_obj.provider = "gce"
+  end
+
+  # ----------------------------------------
+  # ec2
+  # ----------------------------------------
+
+  # Is current cloud ec2?
+  #
+  # === Return
+  # true:: If ec2 Hash is defined
+  # false:: Otherwise
+  def on_ec2?
+    ec2 != nil
+  end
+
+  # Fill cloud hash with ec2 values
+  def get_ec2_values
+    @cloud_attr_obj.add_ipv4_addr(ec2['public_ipv4'], :public)
+    @cloud_attr_obj.add_ipv4_addr(ec2['local_ipv4'], :private)
+    @cloud_attr_obj.public_hostname = ec2['public_hostname']
+    @cloud_attr_obj.local_hostname = ec2['local_hostname']
+    @cloud_attr_obj.provider = "ec2"
+  end
+
+  # ----------------------------------------
+  # rackspace
+  # ----------------------------------------
+
+  # Is current cloud rackspace?
+  #
+  # === Return
+  # true:: If rackspace Hash is defined
+  # false:: Otherwise
+  def on_rackspace?
+    rackspace != nil
+  end
+
+  # Fill cloud hash with rackspace values
+  def get_rackspace_values
+    @cloud_attr_obj.add_ipv4_addr(rackspace['public_ipv4'], :public)
+    @cloud_attr_obj.add_ipv4_addr(rackspace['local_ipv4'], :private)
+    @cloud_attr_obj.add_ipv6_addr(rackspace['public_ipv6'], :public)
+    @cloud_attr_obj.add_ipv6_addr(rackspace['local_ipv6'], :private)
+    @cloud_attr_obj.public_hostname = rackspace['public_hostname']
+    @cloud_attr_obj.local_hostname = rackspace['local_hostname']
+    @cloud_attr_obj.provider = "rackspace"
+  end
+
+  # ----------------------------------------
+  # linode
+  # ----------------------------------------
+
+  # Is current cloud linode?
+  #
+  # === Return
+  # true:: If linode Hash is defined
+  # false:: Otherwise
+  def on_linode?
+    linode != nil
+  end
+
+  # Fill cloud hash with linode values
+  def get_linode_values
+    @cloud_attr_obj.add_ipv4_addr(linode['public_ip'], :public)
+    @cloud_attr_obj.add_ipv4_addr(linode['private_ip'], :private)
+    @cloud_attr_obj.public_hostname = linode['public_hostname']
+    @cloud_attr_obj.local_hostname = linode['local_hostname']
+    @cloud_attr_obj.provider = "linode"
+  end
+
+  # ----------------------------------------
+  # eucalyptus
+  # ----------------------------------------
+
+  # Is current cloud eucalyptus?
+  #
+  # === Return
+  # true:: If eucalyptus Hash is defined
+  # false:: Otherwise
+  def on_eucalyptus?
+    eucalyptus != nil
+  end
+
+  def get_eucalyptus_values
+    @cloud_attr_obj.add_ipv4_addr(eucalyptus['public_ipv4'], :public)
+    @cloud_attr_obj.add_ipv4_addr(eucalyptus['local_ipv4'], :private)
+    @cloud_attr_obj.public_hostname = eucalyptus['public_hostname']
+    @cloud_attr_obj.local_hostname = eucalyptus['local_hostname']
+    @cloud_attr_obj.provider = "eucalyptus"
+  end
+
+  # ----------------------------------------
+  # openstack
+  # ----------------------------------------
+
+  # Is current cloud openstack-based?
+  #
+  # === Return
+  # true:: If openstack Hash is defined
+  # false:: Otherwise
+  def on_openstack?
+    openstack != nil
+  end
+
+  # Fill cloud hash with openstack values
+  def get_openstack_values
+    @cloud_attr_obj.add_ipv4_addr(openstack['public_ipv4'], :public)
+    @cloud_attr_obj.add_ipv4_addr(openstack['local_ipv4'], :private)
+    @cloud_attr_obj.public_hostname = openstack['public_hostname']
+    @cloud_attr_obj.local_hostname = openstack['local_hostname']
+    @cloud_attr_obj.provider = "openstack"
+  end
+
+  # ----------------------------------------
+  # azure
+  # ----------------------------------------
+
+  # Is current cloud azure?
+  #
+  # === Return
+  # true:: If azure Hash is defined
+  # false:: Otherwise
+  def on_azure?
+    azure != nil
+  end
+
+  # Fill cloud hash with azure values
+  def get_azure_values
+    @cloud_attr_obj.add_ipv4_addr(azure['public_ip'], :public)
+    @cloud_attr_obj.add_ipv4_addr(azure['private_ip'], :private)
+    @cloud_attr_obj.public_hostname = azure['public_fqdn']
+    @cloud_attr_obj.provider = "azure"
+  end
+
+  collect_data do
+    require "ipaddr"
+
+    @cloud_attr_obj = CloudAttrs.new()
+
+    get_gce_values if on_gce?
+    get_ec2_values if on_ec2?
+    get_rackspace_values if on_rackspace?
+    get_linode_values if on_linode?
+    get_eucalyptus_values if on_eucalyptus?
+    get_openstack_values if on_openstack?
+    get_azure_values if on_azure?
+
+    # set node[:cloud] hash here
+    cloud_v2 @cloud_attr_obj.cloud_mash
+  end
+end

data/lib/ohai/plugins/freebsd/os.rb

@@ -0,0 +1,33 @@
+#
+# Authors:: Adam Jacob (<adam@opscode.com>)
+#           Richard Manyanza (<liseki@nyikacraftsmen.com>)
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2014 Richard Manyanza.
+# 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 'ohai/mixin/os'
+
+Ohai.plugin(:OS) do
+  provides "os", "os_version"
+
+  collect_data(:freebsd) do
+    os collect_os
+
+    # This is __FreeBSD_version. See sys/param.h or 
+    # http://www.freebsd.org/doc/en/books/porters-handbook/freebsd-versions.html.
+    os_version shell_out("sysctl -n kern.osreldate").stdout.split($/)[0]
+  end
+end

data/lib/ohai/plugins/java.rb

@@ -22,7 +22,7 @@ Ohai.plugin(:Java) do
 
   def get_java_info
     java = Mash.new
-    so = shell_out("java -version")
+    so = shell_out("java -mx64m -version")
     if so.exitstatus == 0
       so.stderr.split(/\r?\n/).each do |line|
         case line

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

@@ -126,5 +126,33 @@ Ohai.plugin(:Virtualization) do
         end
       end
     end
+
+    # Detect LXC/Docker
+    #
+    # /proc/self/cgroup will look like this inside a docker container:
+    # <index #>:<subsystem>:/lxc/<hexadecimal container id>
+    #
+    # /proc/self/cgroup could have a name including alpha/digit/dashes
+    # <index #>:<subsystem>:/lxc/<named container id>
+    #
+    # /proc/self/cgroup could have a non-lxc cgroup name indicating other uses 
+    # of cgroups.  This is probably not LXC/Docker.
+    # <index #>:<subsystem>:/Charlie
+    #
+    # A host which supports cgroups, and has capacity to host lxc containers,
+    # will show the subsystems and root (/) namespace.
+    # <index #>:<subsystem>:/
+    #
+    # Full notes, https://tickets.opscode.com/browse/OHAI-551
+    # Kernel docs, https://www.kernel.org/doc/Documentation/cgroups
+    if File.exists?("/proc/self/cgroup")
+      if File.read("/proc/self/cgroup") =~ %r{^\d+:.+:/lxc/.+$}
+        virtualization[:system] = "lxc"
+        virtualization[:role] = "guest"
+      elsif File.read("/proc/self/cgroup") =~ %r{\d:.+:/$}
+        virtualization[:system] = "lxc"
+        virtualization[:role] = "host"
+      end
+    end
   end
 end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '7.0.0.rc.1'
+  VERSION = '7.0.0.rc.2'
 end

data/spec/unit/plugins/cloud_spec.rb

@@ -165,6 +165,7 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:azure]['public_ip'] = "174.129.150.8"
       @plugin.run
       @plugin[:cloud][:public_ips][0].should == @plugin[:azure]['public_ip']
+      @plugin[:cloud][:public_ipv4].should == @plugin[:azure]['public_ip']
     end
 
     it "populates cloud vm_name" do
@@ -177,6 +178,7 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:azure]['public_fqdn'] = "linux-vm-svc.cloudapp.net"
       @plugin.run
       @plugin[:cloud][:public_fqdn].should == @plugin[:azure]['public_fqdn']
+      @plugin[:cloud][:public_hostname].should == @plugin[:azure]['public_fqdn']
     end
 
     it "populates cloud public_ssh_port" do

data/spec/unit/plugins/cloud_v2_spec.rb

@@ -0,0 +1,292 @@
+#
+# Author:: Cary Penniman (<cary@rightscale.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.dirname(__FILE__) + '/../../spec_helper.rb')
+require 'ipaddr'
+
+describe "CloudAttrs object" do
+  before(:each) do
+    @plugin = get_plugin("cloud_v2")
+  end
+
+  let(:cloud_node) do
+    {"public_ipv4_addrs"=>["1.2.3.1"],
+     "local_ipv4_addrs"=>["1.2.4.1"],
+     "public_ipv6_addrs"=>["3ffe:505:2::1"],
+     "local_ipv6_addrs"=>["3ffe:506:2::1"],
+     "public_ipv4"=>"1.2.3.1",
+     "local_ipv4"=>"1.2.4.1",
+     "public_ipv6"=>"3ffe:505:2::1",
+     "local_ipv6"=>"3ffe:506:2::1",
+     "public_hostname"=>"myhost.somewhere.com",
+     "local_hostname"=>"my-localhost",
+     "provider"=>"my_awesome_cloud"
+     }
+  end
+
+  it "populates cloud mash" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    @cloud_attr_obj.add_ipv4_addr("1.2.3.1", :public)
+    @cloud_attr_obj.add_ipv4_addr("1.2.4.1", :private)
+    @cloud_attr_obj.add_ipv6_addr("3ffe:505:2::1", :public)
+    @cloud_attr_obj.add_ipv6_addr("3ffe:506:2::1", :private)
+    @cloud_attr_obj.public_hostname = "myhost.somewhere.com"
+    @cloud_attr_obj.local_hostname = "my-localhost"
+    @cloud_attr_obj.provider = "my_awesome_cloud"
+    @cloud_attr_obj.cloud_mash.should == cloud_node
+  end
+
+  it "throws exception with a bad ipv4 address" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    lambda {  @cloud_attr_obj.add_ipv6_addr("somebogusstring", :public) }.should raise_error
+  end
+
+  it "throws exception with a bad ipv6 address" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    lambda {  @cloud_attr_obj.add_ipv6_addr("FEED:B0B:DEAD:BEEF", :public)  }.should raise_error
+  end
+
+  it "throws exception with ipv6 address passed to ipv4" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    lambda {  @cloud_attr_obj.add_ipv4_addr("3ffe:506:2::1", :public) }.should raise_error
+  end
+
+  it "throws exception with ipv4 address passed to ipv6" do
+    @cloud_attr_obj = ::CloudAttrs.new()
+    lambda {  @cloud_attr_obj.add_ipv6_addr("1.2.3.4", :public) }.should raise_error
+  end
+
+
+end
+
+describe Ohai::System, "plugin cloud" do
+  before(:each) do
+    @plugin = get_plugin("cloud_v2")
+  end
+
+  describe "with no cloud mashes" do
+    it "doesn't populate the cloud data" do
+      @plugin[:ec2] = nil
+      @plugin[:rackspace] = nil
+      @plugin[:eucalyptus] = nil
+      @plugin[:linode] = nil
+      @plugin[:azure] = nil
+      @plugin[:gce] = nil
+      @plugin.run
+      @plugin[:cloud_v2].should be_nil
+    end
+  end
+
+  describe "with EC2 mash" do
+    before do
+      @plugin[:ec2] = Mash.new()
+    end
+
+    it "populates cloud public ip" do
+      @plugin[:ec2]['public_ipv4'] = "174.129.150.8"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == @plugin[:ec2]['public_ipv4']
+    end
+
+    it "populates cloud private ip" do
+      @plugin[:ec2]['local_ipv4'] = "10.252.42.149"
+      @plugin.run
+      @plugin[:cloud_v2][:local_ipv4_addrs][0].should == @plugin[:ec2]['local_ipv4']
+    end
+
+    it "populates cloud provider" do
+      @plugin.run
+      @plugin[:cloud_v2][:provider].should == "ec2"
+    end
+  end
+
+  describe "with GCE mash" do
+    before do
+      @plugin[:gce] = Mash.new()
+      @plugin[:gce]['instance'] = Mash.new()
+      @plugin[:gce]['instance']['networkInterfaces'] = [
+        {
+          "accessConfigs" => [ {"externalIp" => "8.35.198.173", "type"=>"ONE_TO_ONE_NAT"} ],
+          "ip" => "10.240.0.102",
+          "network"=> "projects/foo/networks/default"
+        }
+      ]
+    end
+
+    it "populates cloud public ip" do
+      @plugin.run
+      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == "8.35.198.173"
+    end
+
+    it "populates cloud private ip" do
+      @plugin.run
+      @plugin[:cloud_v2][:local_ipv4_addrs][0].should == "10.240.0.102"
+    end
+
+    it "populates cloud provider" do
+      @plugin.run
+      @plugin[:cloud_v2][:provider].should == "gce"
+    end
+  end
+
+  describe "with rackspace" do
+    before do
+      @plugin[:rackspace] = Mash.new()
+    end
+
+    it "populates cloud public ip" do
+      @plugin[:rackspace][:public_ipv4] = "174.129.150.8"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ipv4].should == @plugin[:rackspace][:public_ipv4]
+    end
+
+    it "populates cloud public ipv6" do
+      @plugin[:rackspace][:public_ipv6] = "2a00:1a48:7805:111:e875:efaf:ff08:75"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ipv6].should == @plugin[:rackspace][:public_ipv6]
+    end
+
+    it "populates cloud private ip" do
+      @plugin[:rackspace][:local_ipv4] = "10.252.42.149"
+      @plugin.run
+      @plugin[:cloud_v2][:local_ipv4].should == @plugin[:rackspace][:local_ipv4]
+    end
+
+    it "populates cloud private ipv6" do
+      @plugin[:rackspace][:local_ipv6] = "2a00:1a48:7805:111:e875:efaf:ff08:75"
+      @plugin.run
+      @plugin[:cloud_v2][:local_ipv6].should == @plugin[:rackspace][:local_ipv6]
+    end
+
+    it "populates first cloud public ip" do
+      @plugin[:rackspace][:public_ipv4] = "174.129.150.8"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ipv4_addrs].first.should == @plugin[:rackspace][:public_ipv4]
+    end
+
+    it "populates first cloud public ip" do
+      @plugin[:rackspace][:local_ipv4] = "174.129.150.8"
+      @plugin.run
+      @plugin[:cloud_v2][:local_ipv4_addrs].first.should == @plugin[:rackspace][:local_ipv4]
+    end
+
+    it "populates cloud provider" do
+      @plugin.run
+      @plugin[:cloud_v2][:provider].should == "rackspace"
+    end
+  end
+
+  describe "with linode mash" do
+    before do
+      @plugin[:linode] = Mash.new()
+    end
+
+    it "populates cloud public ip" do
+      @plugin[:linode]['public_ip'] = "174.129.150.8"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == @plugin[:linode][:public_ip]
+    end
+
+    it "populates cloud private ip" do
+      @plugin[:linode]['private_ip'] = "10.252.42.149"
+      @plugin.run
+      @plugin[:cloud_v2][:local_ipv4_addrs][0].should == @plugin[:linode][:private_ip]
+    end
+
+    it "populates first cloud public ip" do
+      @plugin[:linode]['public_ip'] = "174.129.150.8"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ipv4_addrs].first.should == @plugin[:linode][:public_ip]
+    end
+
+    it "populates cloud provider" do
+      @plugin.run
+      @plugin[:cloud_v2][:provider].should == "linode"
+    end
+  end
+
+  describe "with eucalyptus mash" do
+    before do
+      @plugin[:eucalyptus] = Mash.new()
+    end
+
+    it "populates cloud public ip" do
+      @plugin[:eucalyptus]['public_ipv4'] = "174.129.150.8"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == @plugin[:eucalyptus]['public_ipv4']
+    end
+
+    it "populates cloud private ip" do
+      @plugin[:eucalyptus]['local_ipv4'] = "10.252.42.149"
+      @plugin.run
+      @plugin[:cloud_v2][:local_ipv4_addrs][0].should == @plugin[:eucalyptus]['local_ipv4']
+    end
+
+    it "populates cloud provider" do
+      @plugin.run
+      @plugin[:cloud_v2][:provider].should == "eucalyptus"
+    end
+  end
+
+  describe "with Azure mash" do
+    before do
+      @plugin[:azure] = Mash.new()
+    end
+
+    it "populates cloud public ip" do
+      @plugin[:azure]['public_ip'] = "174.129.150.8"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == @plugin[:azure]['public_ip']
+    end
+
+    it "doesn't populates cloud vm_name" do
+      @plugin[:azure]['vm_name'] = "linux-vm"
+      @plugin.run
+      @plugin[:cloud_v2][:vm_name].should_not == @plugin[:azure]['vm_name']
+    end
+
+    it "populates cloud public_hostname" do
+      @plugin[:azure]['public_fqdn'] = "linux-vm-svc.cloudapp.net"
+      @plugin.run
+      @plugin[:cloud_v2][:public_hostname].should == @plugin[:azure]['public_fqdn']
+    end
+
+    it "doesn't populate cloud public_ssh_port" do
+      @plugin[:azure]['public_ssh_port'] = "22"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ssh_port].should be_nil
+    end
+
+    it "should not populate cloud public_ssh_port when winrm is used" do
+      @plugin[:azure]['public_winrm_port'] = "5985"
+      @plugin.run
+      @plugin[:cloud_v2][:public_ssh_port].should be_nil
+    end
+
+    it "populates cloud public_winrm_port" do
+      @plugin[:azure]['public_winrm_port'] = "5985"
+      @plugin.run
+      @plugin[:cloud_v2][:public_winrm_port].should be_nil
+    end
+
+    it "populates cloud provider" do
+      @plugin.run
+      @plugin[:cloud_v2][:provider].should == "azure"
+    end
+  end
+
+end

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

@@ -0,0 +1,33 @@
+#
+# Author:: Richard Manyanza (<liseki@nyikacraftsmen.com>)
+# Copyright:: Copyright (c) 2014 Richard Manyanza.
+# 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, "FreeBSD plugin os" do
+  before(:each) do
+    @plugin = get_plugin("freebsd/os")
+    @plugin.stub(:shell_out).with("sysctl -n kern.osreldate").and_return(mock_shell_out(0, "902001\n", ""))
+    @plugin.stub(:collect_os).and_return(:freebsd)
+  end
+
+  it "should set os_version to __FreeBSD_version" do
+    @plugin.run
+    @plugin[:os_version].should == "902001"
+  end
+end  

data/spec/unit/plugins/java_spec.rb

@@ -28,11 +28,11 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
   shared_examples_for "when the JRE is installed" do
     before do
       @stderr = "java version \"1.5.0_16\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_16-b06-284)\nJava HotSpot(TM) Client VM (build 1.5.0_16-133, mixed mode, sharing)"
-      @plugin.stub(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+      @plugin.stub(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
     end
 
-    it "should run java -version" do
-      @plugin.should_receive(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+    it "should run java -mx64m -version" do
+      @plugin.should_receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
       @plugin.run
     end
 
@@ -63,7 +63,7 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
 
     it "should not set the languages[:java] tree up if java command fails" do
       @stderr = "Some error output here"
-      @plugin.stub(:shell_out).with("java -version").and_return(mock_shell_out(1, "", @stderr))
+      @plugin.stub(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(1, "", @stderr))
       @plugin.run
       @plugin[:languages].should_not have_key(:java)
     end
@@ -73,11 +73,11 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
 
     before(:each) do
       @stderr = "java version \"1.6.0_22\"\nJava(TM) 2 Runtime Environment (build 1.6.0_22-b04)\nJava HotSpot(TM) Server VM (build 17.1-b03, mixed mode)"
-      @plugin.stub(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+      @plugin.stub(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
     end
 
-    it "should run java -version" do
-      @plugin.should_receive(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+    it "should run java -mx64m -version" do
+      @plugin.should_receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
       @plugin.run
     end
 
@@ -108,7 +108,7 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
 
     it "should not set the languages[:java] tree up if java command fails" do
       @stderr = "Some error output here"
-      @plugin.stub(:shell_out).with("java -version").and_return(mock_shell_out(0, "", @stderr))
+      @plugin.stub(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
       @plugin.run
       @plugin[:languages].should_not have_key(:java)
     end
@@ -159,7 +159,7 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
       end
 
       it "does not attempt to get java info" do
-        @plugin.should_not_receive(:shell_out).with("java -version")
+        @plugin.should_not_receive(:shell_out).with("java -mx64m -version")
         @plugin.run
         @plugin[:languages].should_not have_key(:java)
       end

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

@@ -32,6 +32,7 @@ describe Ohai::System, "Linux virtualization platform" do
     File.stub(:exists?).with("/proc/self/status").and_return(false)
     File.stub(:exists?).with("/proc/bc/0").and_return(false)
     File.stub(:exists?).with("/proc/vz").and_return(false)
+    File.stub(:exists?).with("/proc/self/cgroup").and_return(false)
   end
 
   describe "when we are checking for xen" do
@@ -262,6 +263,85 @@ VBOX
     end
   end
 
+  describe "when we are checking for lxc" do
+    it "should set lxc guest if /proc/self/cgroup exist and there are /lxc/<hexadecimal> mounts" do
+      self_cgroup=<<-CGROUP
+8:blkio:/lxc/baa660ed81bc81d262ac6e19486142aeec5fce2043e2a173eb2505c6fbed89bc
+7:net_cls:/lxc/baa660ed81bc81d262ac6e19486142aeec5fce2043e2a173eb2505c6fbed89bc
+6:freezer:/lxc/baa660ed81bc81d262ac6e19486142aeec5fce2043e2a173eb2505c6fbed89bc
+5:devices:/lxc/baa660ed81bc81d262ac6e19486142aeec5fce2043e2a173eb2505c6fbed89bc
+4:memory:/lxc/baa660ed81bc81d262ac6e19486142aeec5fce2043e2a173eb2505c6fbed89bc
+3:cpuacct:/lxc/baa660ed81bc81d262ac6e19486142aeec5fce2043e2a173eb2505c6fbed89bc
+2:cpu:/lxc/baa660ed81bc81d262ac6e19486142aeec5fce2043e2a173eb2505c6fbed89bc
+1:cpuset:/
+CGROUP
+      File.should_receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      File.stub(:read).with("/proc/self/cgroup").and_return(self_cgroup)
+      @plugin.run
+      @plugin[:virtualization][:system].should == "lxc"
+      @plugin[:virtualization][:role].should == "guest"
+    end
+
+    it "should set lxc guest if /proc/self/cgroup exist and there are /lxc/<name> mounts" do
+      self_cgroup=<<-CGROUP
+8:blkio:/lxc/vanilla
+7:net_cls:/lxc/vanilla
+6:freezer:/lxc/vanilla
+5:devices:/lxc/vanilla
+4:memory:/lxc/vanilla
+3:cpuacct:/lxc/vanilla
+2:cpu:/lxc/vanilla
+1:cpuset:/lxc/vanilla
+CGROUP
+      File.should_receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      File.stub(:read).with("/proc/self/cgroup").and_return(self_cgroup)
+      @plugin.run
+      @plugin[:virtualization][:system].should == "lxc"
+      @plugin[:virtualization][:role].should == "guest"
+    end
+
+    it "should set not set anyting if /proc/self/cgroup exist and the cgroup is named arbitrarily, it isn't necessarily lxc." do
+      self_cgroup=<<-CGROUP
+8:blkio:/Charlie
+7:net_cls:/Charlie
+6:freezer:/Charlie
+5:devices:/Charlie
+4:memory:/Charlie
+3:cpuacct:/Charlie
+2:cpu:/Charlie
+1:cpuset:/Charlie
+CGROUP
+      File.should_receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      File.stub(:read).with("/proc/self/cgroup").and_return(self_cgroup)
+      @plugin.run
+      @plugin[:virtualization].should == {}
+    end
+
+    it "should set lxc host if /proc/self/cgroup only has / mounts" do
+      self_cgroup=<<-CGROUP
+8:blkio:/
+7:net_cls:/
+6:freezer:/
+5:devices:/
+4:memory:/
+3:cpuacct:/
+2:cpu:/
+1:cpuset:/
+CGROUP
+      File.should_receive(:exists?).with("/proc/self/cgroup").and_return(true)
+      File.stub(:read).with("/proc/self/cgroup").and_return(self_cgroup)
+      @plugin.run
+      @plugin[:virtualization][:system].should == "lxc"
+      @plugin[:virtualization][:role].should == "host"
+    end
+
+    it "should not set virtualization if /proc/self/cgroup isn't there" do
+      File.should_receive(:exists?).with("/proc/self/cgroup").and_return(false)
+      @plugin.run
+      @plugin[:virtualization].should == {}
+    end
+  end
+
   it "should not set virtualization if no tests match" do
     @plugin.run
     @plugin[:virtualization].should == {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc.1
+  version: 7.0.0.rc.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -250,6 +250,7 @@ files:
 - lib/ohai/plugins/c.rb
 - lib/ohai/plugins/chef.rb
 - lib/ohai/plugins/cloud.rb
+- lib/ohai/plugins/cloud_v2.rb
 - lib/ohai/plugins/command.rb
 - lib/ohai/plugins/darwin/cpu.rb
 - lib/ohai/plugins/darwin/filesystem.rb
@@ -264,6 +265,7 @@ files:
 - lib/ohai/plugins/freebsd/filesystem.rb
 - lib/ohai/plugins/freebsd/memory.rb
 - lib/ohai/plugins/freebsd/network.rb
+- lib/ohai/plugins/freebsd/os.rb
 - lib/ohai/plugins/freebsd/platform.rb
 - lib/ohai/plugins/freebsd/virtualization.rb
 - lib/ohai/plugins/gce.rb
@@ -382,6 +384,7 @@ files:
 - spec/unit/plugins/c_spec.rb
 - spec/unit/plugins/chef_spec.rb
 - spec/unit/plugins/cloud_spec.rb
+- spec/unit/plugins/cloud_v2_spec.rb
 - spec/unit/plugins/darwin/cpu_spec.rb
 - spec/unit/plugins/darwin/hostname_spec.rb
 - spec/unit/plugins/darwin/kernel_spec.rb
@@ -396,6 +399,7 @@ files:
 - spec/unit/plugins/fail_spec.rb
 - spec/unit/plugins/freebsd/hostname_spec.rb
 - spec/unit/plugins/freebsd/kernel_spec.rb
+- spec/unit/plugins/freebsd/os_spec.rb
 - spec/unit/plugins/freebsd/platform_spec.rb
 - spec/unit/plugins/freebsd/virtualization_spec.rb
 - spec/unit/plugins/gce_spec.rb