ohai 7.2.2 → 7.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4329545c173368396f653fe483a8c05a0bbfcbf7
-  data.tar.gz: 82c031fc26ba2f9fd0a1c0a91d68eb344c3d44f5
+  metadata.gz: 4a1d023b6ada45bf854a31175dc2619b818ad414
+  data.tar.gz: c8814f952653d4d0f575cf555000f5f78109621d
 SHA512:
-  metadata.gz: eece99b024c9d7e9ee89cd3eaa6213f92bc39586a520e914226e9127f3368edf1c3b11c3d5756c14533742e778f2c0cc80cf951dc1632fe9616615274f140071
-  data.tar.gz: 9c681cd6d5f724a472e8181d4924265edf463a7bc99ccf71f200fc9ca53c4208062e25a40d0f8f890eb6fdce31a423fc0a18e24d14506ceb08f3e5e50293b7c4
+  metadata.gz: 16f20dda963e4624a86939379bdbb17862d6c76fdaff24f608763105e07fda9beafffb3640d0cbc8fd74f301fbd1c401bf4f7766ea5eb88e922992b513b19c41
+  data.tar.gz: aa955999197d306f23741d20c0c961285fc5094bb34ac461a7c24b39f67598f7bb4c080366213594507aae2ac467b37cd387af47aed290e9e105ec85bab6ee80

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

@@ -200,12 +200,21 @@ Ohai.plugin(:Network) do
         #    the routing table source field.
         # 3) and since we're at it, let's populate some :routes attributes
         # (going to do that for both inet and inet6 addresses)
-        so = shell_out("ip -f #{family[:name]} route show")
+        so = shell_out("ip -o -f #{family[:name]} route show")
         so.stdout.lines do |line|
-          if line =~ /^([^\s]+)\s(.*)$/
+          line.strip!
+          Ohai::Log.debug("Parsing #{line}")
+          if line =~ /\\/
+            parts = line.split('\\')
+            route_dest = parts.shift.strip
+            route_endings = parts
+          elsif line =~ /^([^\s]+)\s(.*)$/
             route_dest = $1
-            route_ending = $2
-            #
+            route_endings = [$2]
+          else
+            next
+          end
+          route_endings.each do |route_ending|
             if route_ending =~ /\bdev\s+([^\s]+)\b/
               route_int = $1
             else

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '7.2.2'
+  VERSION = '7.2.4'
 end

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

@@ -31,8 +31,8 @@ def do_stubs
   @plugin.stub(:shell_out).with("ip -d -s link").and_return(mock_shell_out(0, @linux_ip_link_s_d, ""))
   @plugin.stub(:shell_out).with("ip -f inet neigh show").and_return(mock_shell_out(0, @linux_ip_neighbor_show, ""))
   @plugin.stub(:shell_out).with("ip -f inet6 neigh show").and_return(mock_shell_out(0, @linux_ip_inet6_neighbor_show, ""))
-  @plugin.stub(:shell_out).with("ip -f inet route show").and_return(mock_shell_out(0, @linux_ip_route, ""))
-  @plugin.stub(:shell_out).with("ip -f inet6 route show").and_return(mock_shell_out(0, @linux_ip_route_inet6, ""))
+  @plugin.stub(:shell_out).with("ip -o -f inet route show").and_return(mock_shell_out(0, @linux_ip_route, ""))
+  @plugin.stub(:shell_out).with("ip -o -f inet6 route show").and_return(mock_shell_out(0, @linux_ip_route_inet6, ""))
   @plugin.stub(:shell_out).with("route -n").and_return(mock_shell_out(0, @linux_route_n, ""))
   @plugin.stub(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, @linux_ifconfig, ""))
   @plugin.stub(:shell_out).with("arp -an").and_return(mock_shell_out(0, @linux_arp_an, ""))
@@ -245,6 +245,7 @@ NEIGHBOR_SHOW
 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
+10.5.4.0/24 \\ nexthop via 10.5.4.1 dev eth0 weight 1\\ nexthop via 10.5.4.2 dev eth0 weight 1
 default via 10.116.201.1 dev eth0
 IP_ROUTE_SCOPE
 
@@ -555,6 +556,8 @@ ROUTE_N
       it "adds routes" do
         @plugin.run
         @plugin['network']['interfaces']['eth0']['routes'].should include Mash.new( :destination => "10.116.201.0/24", :proto => "kernel", :family =>"inet" )
+        @plugin['network']['interfaces']['eth0']['routes'].should include Mash.new( :destination => "10.5.4.0/24", :family =>"inet", :via => "10.5.4.1")
+        @plugin['network']['interfaces']['eth0']['routes'].should include Mash.new( :destination => "10.5.4.0/24", :family =>"inet", :via => "10.5.4.2")
         @plugin['network']['interfaces']['foo:veth0@eth0']['routes'].should include Mash.new( :destination => "192.168.212.0/24", :proto => "kernel", :src => "192.168.212.2", :family =>"inet" )
         @plugin['network']['interfaces']['eth0']['routes'].should include Mash.new( :destination => "fe80::/64", :metric => "256", :proto => "kernel", :family => "inet6" )
         @plugin['network']['interfaces']['eth0.11']['routes'].should include Mash.new( :destination => "1111:2222:3333:4444::/64", :metric => "1024", :family => "inet6" )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 7.2.2
+  version: 7.2.4
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types