specinfra 2.43.2 → 2.43.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba5e509312bc453ede783a0444e76483d5e8e93
-  data.tar.gz: 3502f86d6b5127387d4eb8003a5723436d1b7194
+  metadata.gz: 95b470a3c79b70d4ad58ea8f7e7fc91b39479a7b
+  data.tar.gz: 13898b2f4af620e05d1377fab1c1c65f0ab7945c
 SHA512:
-  metadata.gz: 53e34b71036e7d22cbb24bdd7255670191017198c55e239f61e0a00d1c9cc603bf8f1ba6f8ae468e2fac18df397933937d3eb8d1175b11e59aa123baaafa4e5d
-  data.tar.gz: 9aaeb553165501eab0953caeab9bae0af6571e07feb2705d758c2ce54bf92a85f5942fcd5de1778d20fc739993db81a1ef09c850f4249dfe4d314a98aad11e3e
+  metadata.gz: e7a5dffb749f8d90fb700c3b01fb350b3baf07af22b51705758fe3b277884fa3107ac004541579176e8fcf97cded126934ba9f1d1643ef2cfdfacc2c006661f3
+  data.tar.gz: 81ed9e06277284cacc36ab274c2fd8ceb20a18756b2027ed9549db5cd719c9373575535bcbbfde04e064c566bf8d560431e176b7367e0447abdec0674b520301

data/lib/specinfra/command/freebsd/base/interface.rb

@@ -33,19 +33,10 @@ class Specinfra::Command::Freebsd::Base::Interface < Specinfra::Command::Base::I
     end
 
     def get_link_state(interface)
-      str = %Q{ ifconfig #{interface} link | \
-            awk '/flags/{ \
-                   split($0,line,/ /) ; \
-                   split(line[2],flags,/[,<>]/); \
-                   for (idx in flags) { \
-                     if (flags[idx] == "UP"){ \
-                       print "up"; \
-                       exit 0 ; \
-                     } \
-                   }; \
-                   print "down"; \
-                 }'}
-      str
+      # Checks if interfaces is administratively up with the -u arg.
+      # L1 check via status. Virtual interfaces like tapX missing the status will report up.
+      # Emulates operstate in linux with exception of the unknown status.
+      %Q{ifconfig -u #{interface} 2>&1 | awk -v s=up '/status:/ && $2 != "active" { s="down" }; END {print s}'}
     end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.43.2"
+  VERSION = "2.43.3"
 end

data/spec/command/freebsd/interface_spec.rb

@@ -26,3 +26,7 @@ end
 describe get_command(:check_interface_has_ipv4_address, 'vtnet0', '192.168.0.123/24') do
   it { should eq "ifconfig vtnet0 inet | grep 'inet 192\\.168\\.0\\.123 '" }
 end
+
+describe get_command(:get_interface_link_state, 'vtnet0') do
+  it { should eq %Q{ifconfig -u vtnet0 2>&1 | awk -v s=up '/status:/ && $2 != "active" { s="down" }; END {print s}'} }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.43.2
+  version: 2.43.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -626,4 +626,3 @@ test_files:
 - spec/host_inventory/openbsd/filesystem_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/spec_helper.rb
-has_rdoc: