specinfra 2.40.0 → 2.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a45c26015f312d20024e8ac669efc4a45832eb
-  data.tar.gz: 074bd53241292533b4f7f99218108e173d31fdfa
+  metadata.gz: 0bf6b02a4663c031ba89a9a46f3b40272d0d3c7b
+  data.tar.gz: 5ac48f5f97382998f0810693fa149fd6dc75c6ba
 SHA512:
-  metadata.gz: 22bc007008faf15f07afe3d0d12dc34e61eba875b8e748b4616a78dc1da080cccd3cd56de9b08e4fcea7aa0628a912d5a2f19b7e1eb32321d8a68462c89daee6
-  data.tar.gz: e5bca1a7d5f6c32275a69c8ee599cae8adb44da320612640ad42a55e2c05b9152a2ef4c086dc373a940aab837a55ff114eb42c77ca06bea81810953f6bbf7f4e
+  metadata.gz: 7ac723709ba251e0bd24aea998fc92ae050099efd08fcb6ebfa98e3ac0217081e61a89fde05cd0e16b9567d90328a59cc9dbc1f7ccf967c573bd6b6b91c01df9
+  data.tar.gz: a8b2d03196e2b6685ff2e31da51dcc790b5cfb3e387cfa35e94854a91a73bae440fd563fc67aa49b39010d46d0f4e073998038bfc3dea7cad94d4e944aab9786

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

@@ -5,11 +5,31 @@ class Specinfra::Command::Freebsd::Base::Interface < Specinfra::Command::Base::I
     end
 
     def check_has_ipv4_address(interface, ip_address)
-      "ifconfig #{interface} | grep -w inet | cut -d ' ' -f 2"
+      ip_address = ip_address.dup
+      if ip_address =~ /\/\d+$/
+        # remove the prefix - better would be to calculate the netmask
+        ip_address.gsub!(/\/\d+$/, "") 
+      end
+      ip_address << " "
+      ip_address.gsub!(".", "\\.")
+      "ifconfig #{interface} inet | grep 'inet #{ip_address}'"
     end
 
     def check_has_ipv6_address(interface, ip_address)
-      "ifconfig #{interface} | grep -w inet6 | cut -d ' ' -f 2"
+      ip_address = ip_address.dup
+      (ip_address, prefixlen) = ip_address.split(/\//)
+      ip_address.downcase!
+      if ip_address =~ /^fe80::/i
+        # link local needs the scope (interface) appended 
+        ip_address << "%#{interface}"
+      end 
+      unless prefixlen.to_s.empty? 
+        # append prefixlen 
+        ip_address << " prefixlen #{prefixlen}"
+      else 
+        ip_address << " "
+      end
+      "ifconfig #{interface} inet6 | grep 'inet6 #{ip_address}'"
     end
   end
-end
+end

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

@@ -16,7 +16,7 @@ class Specinfra::Command::Linux::Base::Interface < Specinfra::Command::Base::Int
         ip_address << "/"
       end
       ip_address.gsub!(".", "\\.")
-      "ip addr show #{interface} | grep 'inet #{ip_address}'"
+      "ip -4 addr show #{interface} | grep 'inet #{ip_address}'"
     end
 
     def check_has_ipv6_address(interface, ip_address)
@@ -27,7 +27,7 @@ class Specinfra::Command::Linux::Base::Interface < Specinfra::Command::Base::Int
         ip_address << "/"
       end
       ip_address.downcase!
-      "ip addr show #{interface} | grep 'inet6 #{ip_address}'"
+      "ip -6 addr show #{interface} | grep 'inet6 #{ip_address}'"
     end
 
     def get_link_state(name)

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

@@ -9,11 +9,32 @@ class Specinfra::Command::Openbsd::Base::Interface < Specinfra::Command::Base::I
     end
 
     def check_has_ipv4_address(interface, ip_address)
-      "ifconfig #{interface} | grep -w inet | cut -d ' ' -f 2"
+      ip_address = ip_address.dup
+      if ip_address =~ /\/\d+$/
+        # remove the prefix - better would be to calculate the netmask
+        ip_address.gsub!(/\/\d+$/, "") 
+      end
+      ip_address << " "
+      ip_address.gsub!(".", "\\.")
+      "ifconfig #{interface} inet | grep 'inet #{ip_address}'"
     end
 
     def check_has_ipv6_address(interface, ip_address)
-      "ifconfig #{interface} | grep -w inet6 | cut -d ' ' -f 2"
+      ip_address = ip_address.dup
+      (ip_address, prefixlen) = ip_address.split(/\//)
+      ip_address.downcase!
+      if ip_address =~ /^fe80::/i
+        # link local needs the scope (interface) appended 
+        ip_address << "%#{interface}"
+      end 
+      unless prefixlen.to_s.empty? 
+        # append prefixlen 
+        ip_address << " prefixlen #{prefixlen}"
+      else 
+        ip_address << " "
+      end
+      "ifconfig #{interface} inet6 | grep 'inet6 #{ip_address}'"
     end
+
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.40.0"
+  VERSION = "2.40.1"
 end

data/spec/command/freebsd/interface_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'freebsd'
+
+describe get_command(:check_interface_has_ipv6_address, 'vtnet0', '2001:0db8:bd05:01d2:288a:1fc0:0001:10ee') do
+  it { should eq "ifconfig vtnet0 inet6 | grep 'inet6 2001:0db8:bd05:01d2:288a:1fc0:0001:10ee '" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'vtnet0', '2001:0db8:bd05:01d2:288a:1fc0:0001:10ee/64') do
+  it { should eq "ifconfig vtnet0 inet6 | grep 'inet6 2001:0db8:bd05:01d2:288a:1fc0:0001:10ee prefixlen 64'" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'vtnet0', 'fe80::5054:ff:fe01:10ee/64') do
+  it { should eq "ifconfig vtnet0 inet6 | grep 'inet6 fe80::5054:ff:fe01:10ee%vtnet0 prefixlen 64'" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'vtnet0', 'fe80::5054:ff:fe01:10ee') do
+  it { should eq "ifconfig vtnet0 inet6 | grep 'inet6 fe80::5054:ff:fe01:10ee%vtnet0 '" }
+end
+
+describe get_command(:check_interface_has_ipv4_address, 'vtnet0', '192.168.0.123') do
+  it { should eq "ifconfig vtnet0 inet | grep 'inet 192\\.168\\.0\\.123 '" }
+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

data/spec/command/linux/interface_spec.rb

@@ -4,7 +4,19 @@ property[:os] = nil
 set :os, :family => 'linux'
 
 describe get_command(:check_interface_has_ipv6_address, 'eth0', '2001:0db8:bd05:01d2:288a:1fc0:0001:10ee') do
-  it { should eq "ip addr show eth0 | grep 'inet6 2001:0db8:bd05:01d2:288a:1fc0:0001:10ee/'" }
+  it { should eq "ip -6 addr show eth0 | grep 'inet6 2001:0db8:bd05:01d2:288a:1fc0:0001:10ee/'" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'eth0', '2001:0db8:bd05:01d2:288a:1fc0:0001:10ee/64') do
+  it { should eq "ip -6 addr show eth0 | grep 'inet6 2001:0db8:bd05:01d2:288a:1fc0:0001:10ee/64 '" }
+end
+
+describe get_command(:check_interface_has_ipv4_address, 'eth0', '192.168.0.123') do
+  it { should eq "ip -4 addr show eth0 | grep 'inet 192\\.168\\.0\\.123/'" }
+end
+
+describe get_command(:check_interface_has_ipv4_address, 'eth0', '192.168.0.123/24') do
+  it { should eq "ip -4 addr show eth0 | grep 'inet 192\\.168\\.0\\.123/24 '" }
 end
 
 describe get_command(:get_interface_link_state, 'eth0') do

data/spec/command/openbsd/interface_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'openbsd'
+
+describe get_command(:check_interface_has_ipv6_address, 'vio0', '2001:0db8:bd05:01d2:288a:1fc0:0001:10ee') do
+  it { should eq "ifconfig vio0 inet6 | grep 'inet6 2001:0db8:bd05:01d2:288a:1fc0:0001:10ee '" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'vio0', '2001:0db8:bd05:01d2:288a:1fc0:0001:10ee/64') do
+  it { should eq "ifconfig vio0 inet6 | grep 'inet6 2001:0db8:bd05:01d2:288a:1fc0:0001:10ee prefixlen 64'" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'vio0', 'fe80::5054:ff:fe01:10ee/64') do
+  it { should eq "ifconfig vio0 inet6 | grep 'inet6 fe80::5054:ff:fe01:10ee%vio0 prefixlen 64'" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'vio0', 'fe80::5054:ff:fe01:10ee') do
+  it { should eq "ifconfig vio0 inet6 | grep 'inet6 fe80::5054:ff:fe01:10ee%vio0 '" }
+end
+
+describe get_command(:check_interface_has_ipv4_address, 'vio0', '192.168.0.123') do
+  it { should eq "ifconfig vio0 inet | grep 'inet 192\\.168\\.0\\.123 '" }
+end
+
+describe get_command(:check_interface_has_ipv4_address, 'vio0', '192.168.0.123/24') do
+  it { should eq "ifconfig vio0 inet | grep 'inet 192\\.168\\.0\\.123 '" }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.40.0
+  version: 2.40.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -459,6 +459,7 @@ files:
 - spec/command/esxi/package_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb
+- spec/command/freebsd/interface_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/file_spec.rb
@@ -474,6 +475,7 @@ files:
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/openbsd/file_spec.rb
+- spec/command/openbsd/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
 - spec/command/redhat7/host_spec.rb
@@ -549,6 +551,7 @@ test_files:
 - spec/command/esxi/package_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb
+- spec/command/freebsd/interface_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/file_spec.rb
@@ -564,6 +567,7 @@ test_files:
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/openbsd/file_spec.rb
+- spec/command/openbsd/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
 - spec/command/redhat7/host_spec.rb