From: Martin Schwenke <martin@meltin.net>
Date: Thu, 8 Feb 2018 11:01:49 +0000 (+1100)
Subject: ctdb-tests: 10.interface event script setup modularisation
X-Git-Tag: talloc-2.1.13~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c81fb9d9a27ac836f24c90b381fcfba586d9fac;p=thirdparty%2Fsamba.git

ctdb-tests: 10.interface event script setup modularisation

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

diff --git a/ctdb/tests/eventscripts/10.interface.010.sh b/ctdb/tests/eventscripts/10.interface.010.sh
index f5fa0622582..171a6973ea0 100755
--- a/ctdb/tests/eventscripts/10.interface.010.sh
+++ b/ctdb/tests/eventscripts/10.interface.010.sh
@@ -4,7 +4,7 @@
 
 define_test "Release 1 IP, 10 connections killed OK"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do
diff --git a/ctdb/tests/eventscripts/10.interface.011.sh b/ctdb/tests/eventscripts/10.interface.011.sh
index 1b85cead0c3..fa8002d5100 100755
--- a/ctdb/tests/eventscripts/10.interface.011.sh
+++ b/ctdb/tests/eventscripts/10.interface.011.sh
@@ -4,7 +4,7 @@
 
 define_test "Release 1 IP, 10 connections killed, 1 fails"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do
diff --git a/ctdb/tests/eventscripts/10.interface.012.sh b/ctdb/tests/eventscripts/10.interface.012.sh
index 03c6c792504..394b718af85 100755
--- a/ctdb/tests/eventscripts/10.interface.012.sh
+++ b/ctdb/tests/eventscripts/10.interface.012.sh
@@ -4,7 +4,7 @@
 
 define_test "Release 1 IP, 10 connections killed, 3 fail"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do
diff --git a/ctdb/tests/eventscripts/10.interface.013.sh b/ctdb/tests/eventscripts/10.interface.013.sh
index eb4c2803ba0..64f365e1275 100755
--- a/ctdb/tests/eventscripts/10.interface.013.sh
+++ b/ctdb/tests/eventscripts/10.interface.013.sh
@@ -4,7 +4,7 @@
 
 define_test "Release 1 IP, all 10 connections kills fail"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do
diff --git a/ctdb/tests/eventscripts/10.interface.init.001.sh b/ctdb/tests/eventscripts/10.interface.init.001.sh
index 65c6bdc2a9a..7f370b2d3db 100755
--- a/ctdb/tests/eventscripts/10.interface.init.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.001.sh
@@ -4,7 +4,7 @@
 
 define_test "no public addresses"
 
-setup_ctdb
+setup
 
 rm -f "${CTDB_BASE}/public_addresses"
 
diff --git a/ctdb/tests/eventscripts/10.interface.init.002.sh b/ctdb/tests/eventscripts/10.interface.init.002.sh
index ba33f927c3f..1862eac49d0 100755
--- a/ctdb/tests/eventscripts/10.interface.init.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.002.sh
@@ -4,7 +4,7 @@
 
 define_test "all interfaces up"
 
-setup_ctdb
+setup
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/10.interface.init.021.sh b/ctdb/tests/eventscripts/10.interface.init.021.sh
index 87dfa4dfdcf..fd89c87670f 100755
--- a/ctdb/tests/eventscripts/10.interface.init.021.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.021.sh
@@ -4,7 +4,7 @@
 
 define_test "Check public IP dropping, none assigned"
 
-setup_ctdb
+setup
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/10.interface.init.022.sh b/ctdb/tests/eventscripts/10.interface.init.022.sh
index 6e594280a3a..ee7fa148ff4 100755
--- a/ctdb/tests/eventscripts/10.interface.init.022.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.022.sh
@@ -4,7 +4,7 @@
 
 define_test "Check public IP dropping, 1 assigned"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do
diff --git a/ctdb/tests/eventscripts/10.interface.init.023.sh b/ctdb/tests/eventscripts/10.interface.init.023.sh
index 9b97e821313..b39b67aead9 100755
--- a/ctdb/tests/eventscripts/10.interface.init.023.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.023.sh
@@ -4,7 +4,7 @@
 
 define_test "Check public IP dropping, all assigned"
 
-setup_ctdb
+setup
 
 nl="
 "
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.001.sh b/ctdb/tests/eventscripts/10.interface.monitor.001.sh
index 9f2939acee9..c829efc87ee 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.001.sh
@@ -4,7 +4,7 @@
 
 define_test "no public addresses"
 
-setup_ctdb
+setup
 
 rm -f "${CTDB_BASE}/public_addresses"
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.002.sh b/ctdb/tests/eventscripts/10.interface.monitor.002.sh
index ba33f927c3f..1862eac49d0 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.002.sh
@@ -4,7 +4,7 @@
 
 define_test "all interfaces up"
 
-setup_ctdb
+setup
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.003.sh b/ctdb/tests/eventscripts/10.interface.monitor.003.sh
index 1eb7916b932..db1b2c64284 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.003.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.003.sh
@@ -4,7 +4,7 @@
 
 define_test "1 interface down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.004.sh b/ctdb/tests/eventscripts/10.interface.monitor.004.sh
index 69ffbd00cd5..3f20fdc6b8e 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.004.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.004.sh
@@ -4,7 +4,7 @@
 
 define_test "all interfaces up, 1 is a bond"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.005.sh b/ctdb/tests/eventscripts/10.interface.monitor.005.sh
index 8cf7bbc9c0a..1042d1566de 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.005.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.005.sh
@@ -4,7 +4,7 @@
 
 define_test "1 bond, no active slaves"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.006.sh b/ctdb/tests/eventscripts/10.interface.monitor.006.sh
index 3c483a3516f..5facf0850ec 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.006.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.006.sh
@@ -4,7 +4,7 @@
 
 define_test "1 bond, active slaves, link down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.009.sh b/ctdb/tests/eventscripts/10.interface.monitor.009.sh
index 1b785ffdc80..e68fb4d4144 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.009.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.009.sh
@@ -4,11 +4,11 @@
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
-export CTDB_PARTIALLY_ONLINE_INTERFACES="yes"
+CTDB_PARTIALLY_ONLINE_INTERFACES=yes
 
 ethtool_interfaces_down "$iface"
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.010.sh b/ctdb/tests/eventscripts/10.interface.monitor.010.sh
index 4d233193fb6..a59b96849cd 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.010.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.010.sh
@@ -4,15 +4,19 @@
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, all down"
 
-setup_ctdb
+setup
 
 ifaces=$(ctdb_get_interfaces)
 
-export CTDB_PARTIALLY_ONLINE_INTERFACES="yes"
+CTDB_PARTIALLY_ONLINE_INTERFACES=yes
 
 ethtool_interfaces_down $ifaces
 
-msg=$(for i in $ifaces ; do echo "ERROR: No link on the public network interface $i" ; done)
+msg=$(
+	for i in $ifaces ; do
+		echo "ERROR: No link on the public network interface $i"
+	done
+   )
 
 required_result 1 "$msg"
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.011.sh b/ctdb/tests/eventscripts/10.interface.monitor.011.sh
index 21775d41ce5..81e11fb142c 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.011.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.011.sh
@@ -4,13 +4,13 @@
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 bond down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
 setup_bond $iface "None"
 
-export CTDB_PARTIALLY_ONLINE_INTERFACES="yes"
+CTDB_PARTIALLY_ONLINE_INTERFACES=yes
 
 ethtool_interfaces_down "$iface"
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.012.sh b/ctdb/tests/eventscripts/10.interface.monitor.012.sh
index dbe84b77296..0d4e580d4ee 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.012.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.012.sh
@@ -4,7 +4,7 @@
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 bond down"
 
-setup_ctdb
+setup
 
 ifaces=$(ctdb_get_interfaces)
 
@@ -12,11 +12,15 @@ for i in $ifaces ; do
     setup_bond $i "None"
 done
 
-export CTDB_PARTIALLY_ONLINE_INTERFACES="yes"
+CTDB_PARTIALLY_ONLINE_INTERFACES=yes
 
 ethtool_interfaces_down $ifaces
 
-msg=$(for i in $ifaces ; do echo "ERROR: No active slaves for bond device $i" ; done)
+msg=$(
+	for i in $ifaces ; do
+		echo "ERROR: No active slaves for bond device $i"
+	done
+   )
 
 required_result 1 "$msg"
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.013.sh b/ctdb/tests/eventscripts/10.interface.monitor.013.sh
index 0fcdcd8d15b..2aa0a8e21b6 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.013.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.013.sh
@@ -4,7 +4,7 @@
 
 define_test "1 bond, active slaves, link down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.014.sh b/ctdb/tests/eventscripts/10.interface.monitor.014.sh
index ab23d307c29..1dd8ff0976a 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.014.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.014.sh
@@ -4,7 +4,7 @@
 
 define_test "spurious addresses on interface, no action"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.015.sh b/ctdb/tests/eventscripts/10.interface.monitor.015.sh
index 01bd18457fa..b7b4787eb1b 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.015.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.015.sh
@@ -4,7 +4,7 @@
 
 define_test "Missing interface, fail"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 ip link delete "$iface"
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.016.sh b/ctdb/tests/eventscripts/10.interface.monitor.016.sh
index e511958f53d..d8b233061b9 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.016.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.016.sh
@@ -4,9 +4,9 @@
 
 define_test "Missing interface, CTDB_PARTIALLY_ONLINE_INTERFACES=yes, warn"
 
-setup_ctdb
+setup
 
-CTDB_PARTIALLY_ONLINE_INTERFACES="yes"
+CTDB_PARTIALLY_ONLINE_INTERFACES=yes
 
 iface=$(ctdb_get_1_interface)
 ip link delete "$iface"
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.017.sh b/ctdb/tests/eventscripts/10.interface.monitor.017.sh
index 6e30040e2c7..bae0886b51d 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.017.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.017.sh
@@ -4,7 +4,7 @@
 
 define_test "1 VLAN, link down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.018.sh b/ctdb/tests/eventscripts/10.interface.monitor.018.sh
index aac23b88128..8006d92c4fc 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.018.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.018.sh
@@ -4,7 +4,7 @@
 
 define_test "VLAN on bond, active slaves, link down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.multi.001.sh b/ctdb/tests/eventscripts/10.interface.multi.001.sh
index da8dcf188df..867cc2443db 100755
--- a/ctdb/tests/eventscripts/10.interface.multi.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.multi.001.sh
@@ -4,7 +4,7 @@
 
 define_test "takeip, removeip"
 
-setup_ctdb
+setup
 
 public_address=$(ctdb_get_1_public_address)
 
diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.001.sh b/ctdb/tests/eventscripts/10.interface.releaseip.001.sh
index 934b3dc30ec..2ac0b86f5ed 100755
--- a/ctdb/tests/eventscripts/10.interface.releaseip.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.releaseip.001.sh
@@ -4,7 +4,7 @@
 
 define_test "error - no args given"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.002.sh b/ctdb/tests/eventscripts/10.interface.releaseip.002.sh
index 4b9726cfdcc..a60adbdbd7a 100755
--- a/ctdb/tests/eventscripts/10.interface.releaseip.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.releaseip.002.sh
@@ -4,7 +4,7 @@
 
 define_test "error - remove a non-existent ip"
 
-setup_ctdb
+setup
 
 public_address=$(ctdb_get_1_public_address)
 ip="${public_address% *}" ; ip="${ip#* }"
diff --git a/ctdb/tests/eventscripts/10.interface.startup.001.sh b/ctdb/tests/eventscripts/10.interface.startup.001.sh
index 9f2939acee9..c829efc87ee 100755
--- a/ctdb/tests/eventscripts/10.interface.startup.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.startup.001.sh
@@ -4,7 +4,7 @@
 
 define_test "no public addresses"
 
-setup_ctdb
+setup
 
 rm -f "${CTDB_BASE}/public_addresses"
 
diff --git a/ctdb/tests/eventscripts/10.interface.startup.002.sh b/ctdb/tests/eventscripts/10.interface.startup.002.sh
index ba33f927c3f..1862eac49d0 100755
--- a/ctdb/tests/eventscripts/10.interface.startup.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.startup.002.sh
@@ -4,7 +4,7 @@
 
 define_test "all interfaces up"
 
-setup_ctdb
+setup
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/10.interface.takeip.001.sh b/ctdb/tests/eventscripts/10.interface.takeip.001.sh
index 934b3dc30ec..2ac0b86f5ed 100755
--- a/ctdb/tests/eventscripts/10.interface.takeip.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.takeip.001.sh
@@ -4,7 +4,7 @@
 
 define_test "error - no args given"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
diff --git a/ctdb/tests/eventscripts/10.interface.takeip.002.sh b/ctdb/tests/eventscripts/10.interface.takeip.002.sh
index 8960b08997d..e267f16739c 100755
--- a/ctdb/tests/eventscripts/10.interface.takeip.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.takeip.002.sh
@@ -4,7 +4,7 @@
 
 define_test "add an ip"
 
-setup_ctdb
+setup
 
 public_address=$(ctdb_get_1_public_address)
 
diff --git a/ctdb/tests/eventscripts/10.interface.takeip.003.sh b/ctdb/tests/eventscripts/10.interface.takeip.003.sh
index f6b205af507..acb9b045f70 100755
--- a/ctdb/tests/eventscripts/10.interface.takeip.003.sh
+++ b/ctdb/tests/eventscripts/10.interface.takeip.003.sh
@@ -4,7 +4,7 @@
 
 define_test "error - add same IP twice"
 
-setup_ctdb
+setup
 
 public_address=$(ctdb_get_1_public_address)
 dev="${public_address%% *}"
diff --git a/ctdb/tests/eventscripts/scripts/10.interface.sh b/ctdb/tests/eventscripts/scripts/10.interface.sh
index df47602b27b..0393e012ca5 100644
--- a/ctdb/tests/eventscripts/scripts/10.interface.sh
+++ b/ctdb/tests/eventscripts/scripts/10.interface.sh
@@ -1,3 +1,10 @@
+setup ()
+{
+	setup_public_addresses
+
+	export CTDB_PARTIALLY_ONLINE_INTERFACES=""
+}
+
 _tcp_connections ()
 {
 	_count="$1"
@@ -19,7 +26,7 @@ _tcp_connections ()
 
 setup_tcp_connections ()
 {
-	_t=$(mktemp --tmpdir="$EVENTSCRIPTS_TESTS_VAR_DIR")
+	_t="${FAKE_NETWORK_STATE}/tcp-established"
 	export FAKE_NETSTAT_TCP_ESTABLISHED_FILE="$_t"
 	_tcp_connections "$@" >"$FAKE_NETSTAT_TCP_ESTABLISHED_FILE"
 }
@@ -49,6 +56,11 @@ setup_bond ()
 	cat <<EOF
 Setting $_iface to be a bond with active slave $_slave and MII status $_mii_s
 EOF
+
+	_t="${FAKE_NETWORK_STATE}/proc-net-bonding"
+	export FAKE_PROC_NET_BONDING="$_t"
+	mkdir -p "$FAKE_PROC_NET_BONDING"
+
 	cat >"${FAKE_PROC_NET_BONDING}/$_iface" <<EOF
 Bonding Mode: IEEE 802.3ad Dynamic link aggregation
 Currently Active Slave: $_slave
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 78cdd6f3fc8..75f882515a0 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -88,11 +88,6 @@ setup_date ()
 setup_generic ()
 {
     setup_shares
-
-    export FAKE_PROC_NET_BONDING="$EVENTSCRIPTS_TESTS_VAR_DIR/proc-net-bonding"
-    mkdir -p "$FAKE_PROC_NET_BONDING"
-    rm -f "$FAKE_PROC_NET_BONDING"/*
-
     setup_dbdir
     setup_date
 
@@ -286,8 +281,6 @@ setup_ctdb ()
     setup_generic
 
     setup_public_addresses
-
-    export CTDB_PARTIALLY_ONLINE_INTERFACES
 }
 
 validate_percentage ()