From e78d2cbff2e30dbea4a7d05bab8f8a5fedfebd79 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Tue, 22 Aug 2017 16:37:30 +1000
Subject: ctdb-tests: Improve releaseip connection resetting tests

Make the tests more general by setting up the IP address using a
"takeip" event.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---
 ctdb/tests/eventscripts/10.interface.010.sh        | 23 ++++++++++++++
 ctdb/tests/eventscripts/10.interface.011.sh        | 28 +++++++++++++++++
 ctdb/tests/eventscripts/10.interface.012.sh        | 31 +++++++++++++++++++
 ctdb/tests/eventscripts/10.interface.013.sh        | 36 ++++++++++++++++++++++
 .../eventscripts/10.interface.releaseip.010.sh     | 22 -------------
 .../eventscripts/10.interface.releaseip.011.sh     | 27 ----------------
 .../eventscripts/10.interface.releaseip.012.sh     | 30 ------------------
 .../eventscripts/10.interface.releaseip.013.sh     | 35 ---------------------
 8 files changed, 118 insertions(+), 114 deletions(-)
 create mode 100755 ctdb/tests/eventscripts/10.interface.010.sh
 create mode 100755 ctdb/tests/eventscripts/10.interface.011.sh
 create mode 100755 ctdb/tests/eventscripts/10.interface.012.sh
 create mode 100755 ctdb/tests/eventscripts/10.interface.013.sh
 delete mode 100755 ctdb/tests/eventscripts/10.interface.releaseip.010.sh
 delete mode 100755 ctdb/tests/eventscripts/10.interface.releaseip.011.sh
 delete mode 100755 ctdb/tests/eventscripts/10.interface.releaseip.012.sh
 delete mode 100755 ctdb/tests/eventscripts/10.interface.releaseip.013.sh

diff --git a/ctdb/tests/eventscripts/10.interface.010.sh b/ctdb/tests/eventscripts/10.interface.010.sh
new file mode 100755
index 00000000000..f5fa0622582
--- /dev/null
+++ b/ctdb/tests/eventscripts/10.interface.010.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "Release 1 IP, 10 connections killed OK"
+
+setup_ctdb
+
+ctdb_get_1_public_address |
+while read dev ip bits ; do
+	ok_null
+	simple_test_event "takeip" $dev $ip $bits
+
+	count=10
+	setup_tcp_connections $count \
+			      "$ip" 445 10.254.254.0 12300
+
+	ok <<EOF
+Killed ${count}/${count} TCP connections to released IP $ip
+EOF
+
+	simple_test_event "releaseip" $dev $ip $bits
+done
diff --git a/ctdb/tests/eventscripts/10.interface.011.sh b/ctdb/tests/eventscripts/10.interface.011.sh
new file mode 100755
index 00000000000..1b85cead0c3
--- /dev/null
+++ b/ctdb/tests/eventscripts/10.interface.011.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "Release 1 IP, 10 connections killed, 1 fails"
+
+setup_ctdb
+
+ctdb_get_1_public_address |
+while read dev ip bits ; do
+	ok_null
+	simple_test_event "takeip" $dev $ip $bits
+
+	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_event "releaseip" $dev $ip $bits
+done
diff --git a/ctdb/tests/eventscripts/10.interface.012.sh b/ctdb/tests/eventscripts/10.interface.012.sh
new file mode 100755
index 00000000000..03c6c792504
--- /dev/null
+++ b/ctdb/tests/eventscripts/10.interface.012.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "Release 1 IP, 10 connections killed, 3 fail"
+
+setup_ctdb
+
+ctdb_get_1_public_address |
+while read dev ip bits ; do
+	ok_null
+	simple_test_event "takeip" $dev $ip $bits
+
+	count=10
+
+	setup_tcp_connections $count \
+			      "$ip" 445 10.254.254.0 12300
+
+	setup_tcp_connections_unkillable 3 \
+					 "$ip" 445 10.254.254.0 43210
+
+	ok <<EOF
+Killed 10/13 TCP connections to released IP 10.0.0.3
+Remaining connections:
+  10.0.0.3:445 10.254.254.1:43211
+  10.0.0.3:445 10.254.254.2:43212
+  10.0.0.3:445 10.254.254.3:43213
+EOF
+
+	simple_test_event "releaseip"  $dev $ip $bits
+done
diff --git a/ctdb/tests/eventscripts/10.interface.013.sh b/ctdb/tests/eventscripts/10.interface.013.sh
new file mode 100755
index 00000000000..eb4c2803ba0
--- /dev/null
+++ b/ctdb/tests/eventscripts/10.interface.013.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "Release 1 IP, all 10 connections kills fail"
+
+setup_ctdb
+
+ctdb_get_1_public_address |
+while read dev ip bits ; do
+	ok_null
+	simple_test_event "takeip" $dev $ip $bits
+
+	setup_tcp_connections 0
+
+	count=10
+	setup_tcp_connections_unkillable $count \
+					 "$ip" 445 10.254.254.0 43210
+
+	ok <<EOF
+Killed 0/$count TCP connections to released IP 10.0.0.3
+Remaining connections:
+  10.0.0.3:445 10.254.254.1:43211
+  10.0.0.3:445 10.254.254.2:43212
+  10.0.0.3:445 10.254.254.3:43213
+  10.0.0.3:445 10.254.254.4:43214
+  10.0.0.3:445 10.254.254.5:43215
+  10.0.0.3:445 10.254.254.6:43216
+  10.0.0.3:445 10.254.254.7:43217
+  10.0.0.3:445 10.254.254.8:43218
+  10.0.0.3:445 10.254.254.9:43219
+  10.0.0.3:445 10.254.254.10:43220
+EOF
+
+    simple_test_event "releaseip"  $dev $ip $bits
+done
diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.010.sh b/ctdb/tests/eventscripts/10.interface.releaseip.010.sh
deleted file mode 100755
index 095e85c9b7c..00000000000
--- a/ctdb/tests/eventscripts/10.interface.releaseip.010.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "Release 1 IP, 10 connections killed OK"
-
-setup_ctdb
-
-ctdb_get_1_public_address |
-while read dev ip bits ; do
-	ip addr add "${ip}/${bits}" dev "$dev"
-
-	count=10
-	setup_tcp_connections $count \
-			      "$ip" 445 10.254.254.0 12300
-
-	ok <<EOF
-Killed ${count}/${count} TCP connections to released IP $ip
-EOF
-
-	simple_test $dev $ip $bits
-done
diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.011.sh b/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
deleted file mode 100755
index c129346db8e..00000000000
--- a/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "Release 1 IP, 10 connections killed, 1 fails"
-
-setup_ctdb
-
-ctdb_get_1_public_address |
-while read dev ip bits ; do
-	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
-done
diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.012.sh b/ctdb/tests/eventscripts/10.interface.releaseip.012.sh
deleted file mode 100755
index 53971fec88d..00000000000
--- a/ctdb/tests/eventscripts/10.interface.releaseip.012.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "Release 1 IP, 10 connections killed, 3 fail"
-
-setup_ctdb
-
-ctdb_get_1_public_address |
-while read dev ip bits ; do
-	ip addr add "${ip}/${bits}" dev "$dev"
-
-	count=10
-
-	setup_tcp_connections $count \
-			      "$ip" 445 10.254.254.0 12300
-
-	setup_tcp_connections_unkillable 3 \
-					 "$ip" 445 10.254.254.0 43210
-
-	ok <<EOF
-Killed 10/13 TCP connections to released IP 10.0.0.3
-Remaining connections:
-  10.0.0.3:445 10.254.254.1:43211
-  10.0.0.3:445 10.254.254.2:43212
-  10.0.0.3:445 10.254.254.3:43213
-EOF
-
-	simple_test $dev $ip $bits
-done
diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.013.sh b/ctdb/tests/eventscripts/10.interface.releaseip.013.sh
deleted file mode 100755
index 91393d27ed9..00000000000
--- a/ctdb/tests/eventscripts/10.interface.releaseip.013.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "Release 1 IP, all 10 connections kills fail"
-
-setup_ctdb
-
-ctdb_get_1_public_address |
-while read dev ip bits ; do
-	ip addr add "${ip}/${bits}" dev "$dev"
-
-	setup_tcp_connections 0
-
-	count=10
-	setup_tcp_connections_unkillable $count \
-					 "$ip" 445 10.254.254.0 43210
-
-	ok <<EOF
-Killed 0/$count TCP connections to released IP 10.0.0.3
-Remaining connections:
-  10.0.0.3:445 10.254.254.1:43211
-  10.0.0.3:445 10.254.254.2:43212
-  10.0.0.3:445 10.254.254.3:43213
-  10.0.0.3:445 10.254.254.4:43214
-  10.0.0.3:445 10.254.254.5:43215
-  10.0.0.3:445 10.254.254.6:43216
-  10.0.0.3:445 10.254.254.7:43217
-  10.0.0.3:445 10.254.254.8:43218
-  10.0.0.3:445 10.254.254.9:43219
-  10.0.0.3:445 10.254.254.10:43220
-EOF
-
-    simple_test $dev $ip $bits
-done
-- 
cgit v1.2.1