ctdb-tests: Factor out new function get_test_ip_mask_and_iface()

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 548b1e19c049bf690810bc728b4822bbf7f5d8cc..d40582955b87c172415f5584fdaa80f7b87a9e72 100644 (file)
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -202,6 +202,25 @@ select_test_node_and_ips ()
     return 0
 }
 
+# Sets: mask, iface
+get_test_ip_mask_and_iface ()
+{
+    # Find the interface
+    try_command_on_node $test_node "$CTDB ip -v -Y | awk -F: -v ip=$test_ip '\$2 == ip { print \$4 }'"
+    iface="$out"
+
+    if [ -z "$TEST_LOCAL_DAEMONS" ] ; then
+       # Find the netmask
+       try_command_on_node $test_node ip addr show to $test_ip
+       mask="${out##*/}"
+       mask="${mask%% *}"
+    else
+       mask="24"
+    fi
+
+    echo "$test_ip/$mask is on $iface"
+}
+
 #######################################
 
 # Wait until either timeout expires or command succeeds.  The command

diff --git a/ctdb/tests/simple/60_recoverd_missing_ip.sh b/ctdb/tests/simple/60_recoverd_missing_ip.sh
index 8ba05702a978af0b2bb1eccf046d3178f894c103..d6d5310662ca4b1ebfe0abed5dcfad2bc6046db7 100755 (executable)
--- a/ctdb/tests/simple/60_recoverd_missing_ip.sh
+++ b/ctdb/tests/simple/60_recoverd_missing_ip.sh
@@ -22,19 +22,7 @@ select_test_node_and_ips
 
 echo "Running test against node $test_node and IP $test_ip"
 
-# Find the interface
-try_command_on_node $test_node "$CTDB ip -v -Y | awk -F: -v ip=$test_ip '\$2 == ip { print \$4 }'"
-iface="$out"
-
-if [ -z "$TEST_LOCAL_DAEMONS" ] ; then
-    # Find the netmask
-    try_command_on_node $test_node ip addr show to $test_ip
-    mask="${out##*/}"
-    mask="${mask%% *}"
-else
-    mask="24"
-fi
-
+get_test_ip_mask_and_iface
 echo "$test_ip/$mask is on $iface"
 
 echo "Deleting IP $test_ip from all nodes"