summaryrefslogtreecommitdiffstats
path: root/ctdb/tests/scripts/integration.bash
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-11-29 20:01:20 +1100
committerMartin Schwenke <martins@samba.org>2014-12-05 21:02:40 +0100
commita7e7d95de9cf09652cef63d65484bbb0faa42e1c (patch)
treebe76df6958264b0d79919110fa856bf89d992a6d /ctdb/tests/scripts/integration.bash
parent0f3d9752c4677b2f3b5ee47a0b8f973b4260ef57 (diff)
downloadsamba-a7e7d95de9cf09652cef63d65484bbb0faa42e1c.tar.gz
samba-a7e7d95de9cf09652cef63d65484bbb0faa42e1c.tar.xz
samba-a7e7d95de9cf09652cef63d65484bbb0faa42e1c.zip
ctdb-tests: Use ip neigh command instead of arp
Extend select_test_node_and_ips() to set $test_prefix in addition to $test_ip. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests/scripts/integration.bash')
-rw-r--r--ctdb/tests/scripts/integration.bash5
1 files changed, 5 insertions, 0 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 2ae03425f4..6bec78ef98 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -186,6 +186,11 @@ _select_test_node_and_ips ()
echo "Selected node ${test_node} with IPs: ${test_node_ips}."
test_ip="${test_node_ips%% *}"
+ case "$test_ip" in
+ *:*) test_prefix="${test_ip}/128" ;;
+ *) test_prefix="${test_ip}/32" ;;
+ esac
+
[ -n "$test_node" ] || return 1
}