ohai 0.6.12.rc.4 → 0.6.12.rc.5

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

@@ -196,6 +196,27 @@ if File.exist?("/sbin/ip")
     end
   end
 
+  popen4("ip route show scope link") do |pid, stdin, stdout, stderr|
+    stdin.close
+    stdout.each do |line|
+      if line =~ /^([^\s]+)\s+dev\s+([^\s]+).*\s+src\s+([^\s]+)\b/
+        tmp_route_cidr = $1
+        tmp_int = $2
+        tmp_source_addr = $3
+        unless iface[tmp_int]
+          Ohai::Log.debug("Skipping previously unseen interface from 'ip route show scope link': #{tmp_int}")
+          next
+        end
+        iface[tmp_int][:routes] = Mash.new unless iface[tmp_int][:routes]
+        iface[tmp_int][:routes][tmp_route_cidr] = Mash.new( :scope => "Link", :src => tmp_source_addr )
+        if (network[:default_interface] == tmp_int ) && (IPAddr.new(tmp_route_cidr).include? network[:default_gateway])
+          ipaddress tmp_source_addr
+          macaddress iface[tmp_int][:addresses].select{|k,v| v["family"]=="lladdr"}.first.first
+        end
+      end
+    end
+  end
+
 else
 
   begin

data/lib/ohai/plugins/network.rb

@@ -25,9 +25,16 @@ network[:interfaces] = Mash.new unless network[:interfaces]
 counters Mash.new unless counters
 counters[:network] = Mash.new unless counters[:network]
 
+ipaddress nil
+macaddress nil
+
 require_plugin "hostname"
 require_plugin "#{os}::network"
 
+# ipaddress and macaddress can be set from the #{os}::network plugin
+# both ipaddress and macaddress have to be set in that case
+return unless ipaddress.nil? or macaddress.nil?
+
 def find_ip_and_mac(addresses, match = nil)
   ip = nil; mac = nil
   addresses.keys.each do |addr|

data/lib/ohai/version.rb

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

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

@@ -176,11 +176,20 @@ NEIGHBOR_SHOW
 default via 10.116.201.1 dev eth0
 IP_ROUTE
 
+    linux_ip_route_scope_link = <<-IP_ROUTE_SCOPE
+10.116.201.0/24 dev eth0  proto kernel  src 10.116.201.76
+192.168.5.0/24 dev eth0  proto kernel  src 192.168.5.1
+192.168.212.0/24 dev foo:veth0@eth0  proto kernel  src 192.168.212.2
+172.16.151.0/24 dev eth0  proto kernel  src 172.16.151.100
+192.168.0.0/24 dev eth0  proto kernel  src 192.168.0.2
+IP_ROUTE_SCOPE
+
     @stdin_ifconfig = StringIO.new
     @stdin_arp = StringIO.new
     @stdin_ipaddr = StringIO.new
     @stdin_iplink = StringIO.new
     @stdin_ipneighbor = StringIO.new
+    @stdin_ip_route_scope_link = StringIO.new
 
     @ifconfig_lines = linux_ifconfig.split("\n")
     @route_lines = linux_route_n.split("\n")
@@ -189,6 +198,7 @@ IP_ROUTE
     @iplink_lines = linux_ip_link_s_d.split("\n")
     @ipneighbor_lines = linux_ip_neighbor_show.split("\n")
     @iproute_lines = linux_ip_route_show_exact
+    @ip_route_scope_link_lines = linux_ip_route_scope_link.split("\n")
 
     @ohai = Ohai::System.new
     @ohai.stub!(:require_plugin).and_return(true)
@@ -209,6 +219,7 @@ IP_ROUTE
         @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 -d -s link").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
+        @ohai.stub!(:popen4).with("ip route show scope link").and_yield(nil, @stdin_ip_route_scope_link, @ip_route_scope_link_lines, nil)
         @ohai._require_plugin("network")
         @ohai._require_plugin("linux::network")
       end
@@ -313,6 +324,7 @@ IP_ROUTE
         @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 -d -s link").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
+        @ohai.stub!(:popen4).with("ip route show scope link").and_yield(nil, @stdin_ip_route_scope_link, @ip_route_scope_link_lines, nil)
         @ohai._require_plugin("network")
         @ohai._require_plugin("linux::network")
       end
@@ -421,31 +433,77 @@ ROUTE_N
       @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 -d -s link").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
-      @ohai._require_plugin("network")
-      @ohai._require_plugin("linux::network")
+      @ohai.stub!(:popen4).with("ip route show scope link").and_yield(nil, @stdin_ip_route_scope_link, @ip_route_scope_link_lines, nil)
     end
 
     it "detects the ipv4 addresses of an ethernet interface with a crazy name" do
+      @ohai._require_plugin("network")
+      @ohai._require_plugin("linux::network")
       @ohai['network']['interfaces']['foo:veth0@eth0']['addresses'].keys.should include('192.168.212.2')
       @ohai['network']['interfaces']['foo:veth0@eth0']['addresses']['192.168.212.2']['netmask'].should == '255.255.255.0'
       @ohai['network']['interfaces']['foo:veth0@eth0']['addresses']['192.168.212.2']['family'].should == 'inet'
     end
 
     it "generates a fake interface for ip aliases for backward compatibility" do
+      @ohai._require_plugin("network")
+      @ohai._require_plugin("linux::network")
       @ohai['network']['interfaces']['eth0:5']['addresses'].keys.should include('192.168.5.1')
       @ohai['network']['interfaces']['eth0:5']['addresses']['192.168.5.1']['netmask'].should == '255.255.255.0'
       @ohai['network']['interfaces']['eth0:5']['addresses']['192.168.5.1']['family'].should == 'inet'
     end
 
     it "adds the vlan information of an interface" do
+      @ohai._require_plugin("network")
+      @ohai._require_plugin("linux::network")
       @ohai['network']['interfaces']['eth0.11']['vlan']['id'].should == '11'
       @ohai['network']['interfaces']['eth0.11']['vlan']['flags'].should == [ 'REORDER_HDR' ]
     end
 
     it "adds the state of an interface" do
+      @ohai._require_plugin("network")
+      @ohai._require_plugin("linux::network")
       @ohai['network']['interfaces']['eth0.11']['state'].should == 'up'
     end
 
+    it "adds link level routes" do
+      @ohai._require_plugin("network")
+      @ohai._require_plugin("linux::network")
+      @ohai['network']['interfaces']['eth0']['routes']['10.116.201.0/24'].should == Mash.new( :scope => "Link", :src => "10.116.201.76" )
+      @ohai['network']['interfaces']['foo:veth0@eth0']['routes']['192.168.212.0/24'].should == Mash.new( :scope => "Link", :src => "192.168.212.2" )
+    end
+
+    describe "checking for the source address to reach the default gateway" do
+      it "sets ipaddress" do
+        @ohai._require_plugin("network")
+        @ohai._require_plugin("linux::network")
+        @ohai['ipaddress'].should == "10.116.201.76"
+      end
+
+      it "sets macaddress" do
+        @ohai._require_plugin("network")
+        @ohai._require_plugin("linux::network")
+        @ohai['macaddress'].should == "12:31:3D:02:BE:A2"
+      end
+    end
+
+    # This should never happen in the real world.
+    describe "when encountering a surprise interface" do
+      before do
+        linux_ip_route_scope_link = <<-IP_ROUTE_SCOPE
+192.168.122.0/24 dev virbr0  proto kernel  src 192.168.122.1
+IP_ROUTE_SCOPE
+        @ip_route_scope_link_lines = linux_ip_route_scope_link.split("\n")
+        @ohai.stub!(:popen4).with("ip route show scope link").and_yield(nil, @stdin_ip_route_scope_link, @ip_route_scope_link_lines, nil)
+      end
+      
+      it "logs a message and skips previously unseen interfaces in 'ip route show scope link'" do
+        Ohai::Log.should_receive(:debug).with("Skipping previously unseen interface from 'ip route show scope link': virbr0").once
+        Ohai::Log.should_receive(:debug).any_number_of_times # Catches the 'Loading plugin network' type messages
+        @ohai._require_plugin("network")
+        @ohai._require_plugin("linux::network")
+      end
+    end
   end 
+
 end
 

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  hash: 15424029
   prerelease: 7
-  segments: 
-  - 0
-  - 6
-  - 12
-  - rc
-  - 4
-  version: 0.6.12.rc.4
+  version: 0.6.12.rc.5
 platform: ruby
 authors: 
 - Adam Jacob
@@ -17,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-13 00:00:00 Z
+date: 2012-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: systemu
@@ -27,9 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -41,9 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -55,9 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -69,9 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -83,9 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -97,9 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
@@ -111,9 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -125,9 +97,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -139,9 +108,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -153,9 +119,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -386,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: []