specinfra 2.11.4 → 2.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aacdf6b994a79f02d4157a364bcf4ba47c90ca0
-  data.tar.gz: 59364cf037cf07ae4869da6972602c720ed6d9cd
+  metadata.gz: 705f64c5443fd691f24ab9abb7ba9fa16f130db6
+  data.tar.gz: 6431a874a82046901a43ed5e4e9e56afd4cd8dff
 SHA512:
-  metadata.gz: e24ca3bf76141ed96f90124cec7e92db7661b140d251d22590d43cf033ff990707feb5b3ed8a94aae80d3474fe6e1b2975d3f57a8f3251a4fdd757e686cfa165
-  data.tar.gz: 5099f90bf58fb356dadbd01286248f60bed6eb80af824640fe6af6a28de02762ac5e52fb7e9df52319b1182f7a48fa205f886e555fdd532b9d26190192df3d63
+  metadata.gz: 8e58430ecb3ffee31460c561918bdc03517138adaeab30ef2eb19548123b660bd90e452d996204adea5a4250c0d3f30d19e2569144c90dfee9519c8abcc7b97c
+  data.tar.gz: d76edde501300a5cbdf0efc423bd84dc275cd9ae4cfea2f3941ad81e504ca01a451f2ff4b5f3600ad5331acff69277a42661cb4e132ef1003031af44d2b9ace8

data/lib/specinfra/command/base/routing_table.rb

@@ -1,7 +1,7 @@
 class Specinfra::Command::Base::RoutingTable < Specinfra::Command::Base
   class << self
     def check_has_entry(destination)
-      "ip route | grep -E '^#{destination} '"
+      "ip route show #{destination} | grep #{destination}"
     end
 
     alias :get_entry :check_has_entry

data/lib/specinfra/processor.rb

@@ -133,12 +133,34 @@ module Specinfra
 	  :interface   => expected_attr[:interface] ? $3 : nil
 	}
       else
-        ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
-        actual_attr = {
-          :destination => $1,
-          :gateway     => $2 ? $2 : $4,
-          :interface   => expected_attr[:interface] ? $3 : nil
-        }
+        matches = ret.stdout.scan(/^(\S+)(?: via (\S+))? dev (\S+).+\n|^(\S+).+\n|\s+nexthop via (\S+)\s+dev (\S+).+/)
+        if matches.length > 1
+          # ECMP route
+          destination = nil
+          matches.each do |groups|
+            if groups[3]
+              destination = groups[3]
+              next
+            else
+              next unless expected_attr[:interface] == groups[5]
+            end
+
+            actual_attr = {
+              :destination => destination,
+              :gateway => groups[4],
+              :interface => groups[5]
+            }
+          end
+        elsif matches.length == 1
+          # Non-ECMP route
+          groups = matches[0]
+          actual_attr = {
+            :destination => groups[0],
+            :gateway     => groups[1] ? groups[1] : groups[3],
+            :interface   => expected_attr[:interface] ? groups[2] : nil
+          }
+        end
+
       end
 
       expected_attr.each do |key, val|

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.11.4"
+  VERSION = "2.11.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.5
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh