Merge pull request #228 from ryotarai/add-ipaddress-matcher

Add have_ipv4_address matcher to interface type.

lib/serverspec/commands/base.rb

@@ -248,6 +248,10 @@ def check_access_by_user(file, user, access)
       def check_kernel_module_loaded(name)
         raise NotImplementedError.new
       end
+
+      def check_ipv4_address(interface, ip_address)
+        raise NotImplementedError.new
+      end
     end
   end
 end

lib/serverspec/commands/linux.rb

@@ -32,6 +32,17 @@ def check_kernel_module_loaded(name)
       def get_interface_speed_of(name)
         "ethtool #{name} | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\\/s/,\"\\\\1\",\"\")}'"
       end
+
+      def check_ipv4_address(interface, ip_address)
+        ip_address = ip_address.dup
+        if ip_address =~ /\/\d+$/
+          ip_address << " "
+        else
+          ip_address << "/"
+        end
+        ip_address.gsub!(".", "\\.")
+        "ip addr show #{interface} | grep 'inet #{ip_address}'"
+      end
     end
   end
 end

lib/serverspec/type/interface.rb

@@ -7,6 +7,10 @@ def speed
         val = val.to_i if val.match(/^\d+$/)
         val
       end
+
+      def has_ipv4_address?(ip_address)
+        backend.check_ipv4_address(@name, ip_address)
+      end
     end
   end
 end

spec/debian/interface_spec.rb

@@ -8,6 +8,16 @@
   its(:command) { should eq "ethtool eth0 | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\/s/,\"\\\\1\",\"\")}'" }
 end
 
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/'" }
+end
+
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10/24") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/24 '" }
+end
+
 describe interface('invalid-interface') do
   let(:stdout) { '1000' }
   its(:speed) { should_not eq 100 }

spec/gentoo/interface_spec.rb

@@ -8,6 +8,16 @@
   its(:command) { should eq "ethtool eth0 | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\/s/,\"\\\\1\",\"\")}'" }
 end
 
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/'" }
+end
+
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10/24") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/24 '" }
+end
+
 describe interface('invalid-interface') do
   let(:stdout) { '1000' }
   its(:speed) { should_not eq 100 }

spec/redhat/interface_spec.rb

@@ -8,6 +8,16 @@
   its(:command) { should eq "ethtool eth0 | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\/s/,\"\\\\1\",\"\")}'" }
 end
 
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/'" }
+end
+
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10/24") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/24 '" }
+end
+
 describe interface('invalid-interface') do
   let(:stdout) { '1000' }
   its(:speed) { should_not eq 100 }