ctdb-scripts: Compact server-end TCP connection killing output

[samba.git] / ctdb / tests / eventscripts / 10.interface.releaseip.011.sh

diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.011.sh b/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
index 6203b97e2f5285aa4623b9ddbb725286e08cf877..c129346db8eeda5e7cf04b254f48adecd53f3109 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
+++ b/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
@@ -8,31 +8,20 @@ setup_ctdb
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do
-    ip addr add "${ip}/${bits}" dev "$dev"
-
-    # Setup 10 fake connections...
-    count=10
-    out=""
-    nl="
-"
-    i=0
-    while [ $i -lt $count ] ; do
-       echo "${ip}:445 10.254.254.1:1230${i}"
-       # Expected output for killing this connection
-       out="${out}${out:+${nl}}Killing TCP connection 10.254.254.1:1230${i} ${ip}:445"
-       i=$(($i + 1))
-    done >"$FAKE_NETSTAT_TCP_ESTABLISHED_FILE"
-
-    # Note that the fake TCP killing done by the "ctdb killtcp" stub
-    # can only kill conections in the file, so killing this connection
-    # will never succeed so it will look like a time out.
-    FAKE_NETSTAT_TCP_ESTABLISHED="${ip}:445|10.254.254.1:43210"
-
-    ok <<EOF
-Killing TCP connection 10.254.254.1:43210 ${ip}:445
-$out
-Failed to kill TCP connections for IP 10.0.0.3 (1/11 remaining)
+       ip addr add "${ip}/${bits}" dev "$dev"
+
+       count=10
+       setup_tcp_connections $count \
+                             "$ip" 445 10.254.254.0 12300
+
+       setup_tcp_connections_unkillable 1 \
+                                        "$ip" 445 10.254.254.0 43210
+
+       ok <<EOF
+Killed 10/11 TCP connections to released IP 10.0.0.3
+Remaining connections:
+  10.0.0.3:445 10.254.254.1:43211
 EOF
 
-    simple_test $dev $ip $bits
+       simple_test $dev $ip $bits
 done