ohai 0.6.12.rc.1 → 0.6.12.rc.2

data/lib/ohai/plugins/ec2.rb

@@ -30,9 +30,10 @@ extend Ohai::Mixin::Ec2Metadata
 def has_ec2_mac?
   network[:interfaces].values.each do |iface|
     unless iface[:arp].nil?
-      has_mac = iface[:arp].value?("fe:ff:ff:ff:ff:ff")
-      Ohai::Log.debug("has_ec2_mac? == true")
-      return true if has_mac
+      if iface[:arp].value?("fe:ff:ff:ff:ff:ff")
+        Ohai::Log.debug("has_ec2_mac? == true")
+        return true
+      end
     end
   end
   Ohai::Log.debug("has_ec2_mac? == false")

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

@@ -106,7 +106,7 @@ if File.exist?("/sbin/ip")
     end
   end
 
-  popen4("ip link -s") do |pid, stdin, stdout, stderr|
+  popen4("ip -s link") do |pid, stdin, stdout, stderr|
     stdin.close
     tmp_int = nil
     on_rx = true

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

@@ -80,9 +80,9 @@ end
 case platform
   when /debian/, /ubuntu/, /mint/
     platform_family "debian"
-  when /fedora/, /amazon/
+  when /fedora/
     platform_family "fedora"
-  when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/
+  when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/
     platform_family "rhel"
   when /suse/
     platform_family "suse"

data/lib/ohai/plugins/network.rb

@@ -16,6 +16,8 @@
 # limitations under the License.
 #
 
+require 'ipaddress'
+
 provides "network", "counters/network"
 
 network Mash.new unless network
@@ -26,22 +28,33 @@ counters[:network] = Mash.new unless counters[:network]
 require_plugin "hostname"
 require_plugin "#{os}::network"
 
-def find_ip_and_mac(addresses)
+def find_ip_and_mac(addresses, match = nil)
   ip = nil; mac = nil
   addresses.keys.each do |addr|
-    ip = addr if addresses[addr]["family"].eql?("inet")
+    if match.nil?
+      ip = addr if addresses[addr]["family"].eql?("inet")
+    else
+      ip = addr if addresses[addr]["family"].eql?("inet") && network_contains_address(match, addr, addresses[addr][:netmask])
+    end
     mac = addr if addresses[addr]["family"].eql?("lladdr")
     break if (ip and mac)
   end
+  Ohai::Log.debug("Found IPv4 address #{ip} with MAC #{mac} #{match.nil? ? '' : 'matching address ' + match}")
   [ip, mac]
 end
 
+def network_contains_address(address_to_match, network_ip, network_mask)
+  network = IPAddress "#{network_ip}/#{network_mask}"
+  host = IPAddress address_to_match
+  network.include?(host)
+end
+
 # If we have a default interface that has addresses, populate the short-cut attributes
 if network[:default_interface] and
     network["interfaces"][network[:default_interface]] and
     network["interfaces"][network[:default_interface]]["addresses"]
   Ohai::Log.debug("Using default interface for default ip and mac address")
-  im = find_ip_and_mac(network["interfaces"][network[:default_interface]]["addresses"])
+  im = find_ip_and_mac(network["interfaces"][network[:default_interface]]["addresses"], network[:default_gateway])
   ipaddress im.shift
   macaddress im.shift
 else

data/lib/ohai/version.rb

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

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

@@ -51,6 +51,8 @@ ENDIFCONFIG
 2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000
     link/ether 12:31:3d:02:be:a2 brd ff:ff:ff:ff:ff:ff
     inet 10.116.201.76/24 brd 10.116.201.255 scope global eth0
+    inet 10.116.201.75/32 scope global eth0
+    inet 10.116.201.74/24 scope global secondary eth0
     inet6 fe80::1031:3dff:fe02:bea2/64 scope link 
        valid_lft forever preferred_lft forever
 IP_ADDR
@@ -122,7 +124,7 @@ IP_ROUTE
         @ohai.stub!(:popen4).with("arp -an").and_yield(nil, @stdin_arp, @arp_lines, nil)
         @ohai.stub!(:popen4).with("ip neighbor show").and_yield(nil, @stdin_ipneighbor, @ipneighbor_lines, nil)
         @ohai.stub!(:popen4).with("ip addr").and_yield(nil, @stdin_ipaddr, @ipaddr_lines, nil)
-        @ohai.stub!(:popen4).with("ip link -s").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
+        @ohai.stub!(:popen4).with("ip -s link").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
         @ohai._require_plugin("network")
         @ohai._require_plugin("linux::network")
       end
@@ -219,7 +221,7 @@ IP_ROUTE
         @ohai.stub!(:popen4).with("arp -an").and_yield(nil, @stdin_arp, @arp_lines, nil)
         @ohai.stub!(:popen4).with("ip neighbor show").and_yield(nil, @stdin_ipneighbor, @ipneighbor_lines, nil)
         @ohai.stub!(:popen4).with("ip addr").and_yield(nil, @stdin_ipaddr, @ipaddr_lines, nil)
-        @ohai.stub!(:popen4).with("ip link -s").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
+        @ohai.stub!(:popen4).with("ip -s link").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
         @ohai._require_plugin("network")
         @ohai._require_plugin("linux::network")
       end
@@ -265,7 +267,7 @@ IP_ROUTE
         @ohai.stub!(:popen4).with("arp -an").and_yield(nil, @stdin_arp, @arp_lines, nil)
         @ohai.stub!(:popen4).with("ip neighbor show").and_yield(nil, @stdin_ipneighbor, @ipneighbor_lines, nil)
         @ohai.stub!(:popen4).with("ip addr").and_yield(nil, @stdin_ipaddr, @ipaddr_lines, nil)
-        @ohai.stub!(:popen4).with("ip link -s").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
+        @ohai.stub!(:popen4).with("ip -s link").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
         @ohai._require_plugin("network")
         @ohai._require_plugin("linux::network")
       end

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

@@ -86,12 +86,12 @@ describe Ohai::System, "Linux plugin platform" do
       @ohai[:platform_family].should == "rhel"
     end
 
-    it "should set platform to amazon and platform_family to fedora when [:lsb][:id] contains Amazon" do
+    it "should set platform to amazon and platform_family to rhel when [:lsb][:id] contains Amazon" do
       @ohai[:lsb][:id] = "AmazonAMI"
       @ohai[:lsb][:release] = "2011.09"
       @ohai._require_plugin("linux::platform")
       @ohai[:platform].should == "amazon"
-      @ohai[:platform_family].should == "fedora"
+      @ohai[:platform_family].should == "rhel"
     end
 
     it "should set platform to scientific when [:lsb][:id] contains ScientificSL" do
@@ -196,10 +196,10 @@ describe Ohai::System, "Linux plugin platform" do
 	@ohai[:platform_family].should == "rhel"
       end
 
-      it "should set the platform_family to fedora if the LSB name is amazon-ish" do
+      it "should set the platform_family to rhel if the LSB name is amazon-ish" do
         @ohai[:lsb][:id] = "Amazon"
         @ohai._require_plugin("linux::platform")
-	@ohai[:platform_family].should == "fedora"
+	@ohai[:platform_family].should == "rhel"
       end
 
       it "should set the platform_family to fedora if the LSB name is fedora-ish" do

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  hash: 15424023
   prerelease: 7
-  segments: 
-  - 0
-  - 6
-  - 12
-  - rc
-  - 1
-  version: 0.6.12.rc.1
+  version: 0.6.12.rc.2
 platform: ruby
 authors: 
 - Adam Jacob
@@ -17,36 +10,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-03-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: systemu
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: systemu
+  name: yajl-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,9 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -71,9 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -85,68 +64,64 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec-core
+  name: ipaddress
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec-expectations
+  name: rspec-core
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec-mocks
+  name: rspec-expectations
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rspec_junit_formatter
+  name: rspec-mocks
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rspec_junit_formatter
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Ohai profiles your system and emits JSON
 email: adam@opscode.com
 executables: 
@@ -374,20 +349,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []