From: Martin Schwenke <martin@meltin.net>
Date: Mon, 12 Feb 2018 05:46:17 +0000 (+1100)
Subject: ctdb-tests: 91.lvs event script setup modularisation
X-Git-Tag: talloc-2.1.13~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ee51d2f2d5a2b1369989e5250d6e89f2f12179c;p=thirdparty%2Fsamba.git

ctdb-tests: 91.lvs 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/91.lvs.001.sh b/ctdb/tests/eventscripts/91.lvs.001.sh
index 7c5554d077c..9fc8d029770 100755
--- a/ctdb/tests/eventscripts/91.lvs.001.sh
+++ b/ctdb/tests/eventscripts/91.lvs.001.sh
@@ -4,8 +4,7 @@
 
 define_test "sanity check ipvsadm stub"
 
-setup_ctdb
-setup_ctdb_lvs<<EOF
+setup<<EOF
 EOF
 
 check_ipvsadm NULL
diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.011.sh b/ctdb/tests/eventscripts/91.lvs.ipreallocated.011.sh
index 595c2c97725..68660475b5a 100755
--- a/ctdb/tests/eventscripts/91.lvs.ipreallocated.011.sh
+++ b/ctdb/tests/eventscripts/91.lvs.ipreallocated.011.sh
@@ -4,8 +4,7 @@
 
 define_test "configured, no nodes in config"
 
-setup_ctdb
-setup_ctdb_lvs "10.1.1.201" "eth0" <<EOF
+setup "10.1.1.201" "eth0" <<EOF
 EOF
 
 ok_null
diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.012.sh b/ctdb/tests/eventscripts/91.lvs.ipreallocated.012.sh
index 4c5ae529e18..970a4aa9ccf 100755
--- a/ctdb/tests/eventscripts/91.lvs.ipreallocated.012.sh
+++ b/ctdb/tests/eventscripts/91.lvs.ipreallocated.012.sh
@@ -4,8 +4,7 @@
 
 define_test "nodes in config, no master (e.g. all inactive)"
 
-setup_ctdb
-setup_ctdb_lvs "10.1.1.201" "eth0" <<EOF
+setup "10.1.1.201" "eth0" <<EOF
 192.168.1.1
 192.168.1.2
 192.168.1.3
diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.013.sh b/ctdb/tests/eventscripts/91.lvs.ipreallocated.013.sh
index 7ac4b618cf9..0720036b448 100755
--- a/ctdb/tests/eventscripts/91.lvs.ipreallocated.013.sh
+++ b/ctdb/tests/eventscripts/91.lvs.ipreallocated.013.sh
@@ -4,8 +4,7 @@
 
 define_test "nodes in config, other node is master"
 
-setup_ctdb
-setup_ctdb_lvs "10.1.1.201" "eth0" <<EOF
+setup "10.1.1.201" "eth0" <<EOF
 192.168.1.1
 192.168.1.2	master
 192.168.1.3
diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.014.sh b/ctdb/tests/eventscripts/91.lvs.ipreallocated.014.sh
index 757637a890b..19788d7bc8c 100755
--- a/ctdb/tests/eventscripts/91.lvs.ipreallocated.014.sh
+++ b/ctdb/tests/eventscripts/91.lvs.ipreallocated.014.sh
@@ -4,8 +4,7 @@
 
 define_test "nodes in config, this is master"
 
-setup_ctdb
-setup_ctdb_lvs "10.1.1.201" "eth0" <<EOF
+setup "10.1.1.201" "eth0" <<EOF
 192.168.1.1	master
 192.168.1.2
 192.168.1.3
diff --git a/ctdb/tests/eventscripts/91.lvs.monitor.001.sh b/ctdb/tests/eventscripts/91.lvs.monitor.001.sh
index 3710d85f314..42831fb16f3 100755
--- a/ctdb/tests/eventscripts/91.lvs.monitor.001.sh
+++ b/ctdb/tests/eventscripts/91.lvs.monitor.001.sh
@@ -4,8 +4,7 @@
 
 define_test "not configured"
 
-setup_ctdb
-setup_ctdb_lvs <<EOF
+setup <<EOF
 EOF
 
 ok_null
diff --git a/ctdb/tests/eventscripts/91.lvs.monitor.002.sh b/ctdb/tests/eventscripts/91.lvs.monitor.002.sh
index 65d84f5aa57..a8080178d8d 100755
--- a/ctdb/tests/eventscripts/91.lvs.monitor.002.sh
+++ b/ctdb/tests/eventscripts/91.lvs.monitor.002.sh
@@ -4,8 +4,7 @@
 
 define_test "configured, interface up"
 
-setup_ctdb
-setup_ctdb_lvs "10.1.1.201" "eth0" <<EOF
+setup "10.1.1.201" "eth0" <<EOF
 192.168.1.1
 192.168.1.2
 192.168.1.3
diff --git a/ctdb/tests/eventscripts/91.lvs.monitor.003.sh b/ctdb/tests/eventscripts/91.lvs.monitor.003.sh
index d556abf0907..89f443e39c2 100755
--- a/ctdb/tests/eventscripts/91.lvs.monitor.003.sh
+++ b/ctdb/tests/eventscripts/91.lvs.monitor.003.sh
@@ -4,8 +4,7 @@
 
 define_test "configured, interface up"
 
-setup_ctdb
-setup_ctdb_lvs "10.1.1.201" "eth0" <<EOF
+setup "10.1.1.201" "eth0" <<EOF
 192.168.1.1
 192.168.1.2
 192.168.1.3
diff --git a/ctdb/tests/eventscripts/91.lvs.shutdown.001.sh b/ctdb/tests/eventscripts/91.lvs.shutdown.001.sh
index 3710d85f314..42831fb16f3 100755
--- a/ctdb/tests/eventscripts/91.lvs.shutdown.001.sh
+++ b/ctdb/tests/eventscripts/91.lvs.shutdown.001.sh
@@ -4,8 +4,7 @@
 
 define_test "not configured"
 
-setup_ctdb
-setup_ctdb_lvs <<EOF
+setup <<EOF
 EOF
 
 ok_null
diff --git a/ctdb/tests/eventscripts/91.lvs.shutdown.002.sh b/ctdb/tests/eventscripts/91.lvs.shutdown.002.sh
index db43d424d2c..61c7f96d48b 100755
--- a/ctdb/tests/eventscripts/91.lvs.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/91.lvs.shutdown.002.sh
@@ -4,8 +4,7 @@
 
 define_test "configured"
 
-setup_ctdb
-setup_ctdb_lvs "10.1.1.201" "eth0" <<EOF
+setup "10.1.1.201" "eth0" <<EOF
 EOF
 
 ipvsadm -A -t "$CTDB_LVS_PUBLIC_IP" -s lc -p 1999999
diff --git a/ctdb/tests/eventscripts/91.lvs.startup.001.sh b/ctdb/tests/eventscripts/91.lvs.startup.001.sh
index 3710d85f314..42831fb16f3 100755
--- a/ctdb/tests/eventscripts/91.lvs.startup.001.sh
+++ b/ctdb/tests/eventscripts/91.lvs.startup.001.sh
@@ -4,8 +4,7 @@
 
 define_test "not configured"
 
-setup_ctdb
-setup_ctdb_lvs <<EOF
+setup <<EOF
 EOF
 
 ok_null
diff --git a/ctdb/tests/eventscripts/91.lvs.startup.002.sh b/ctdb/tests/eventscripts/91.lvs.startup.002.sh
index 9e90dd33c86..e4c5e8d23cb 100755
--- a/ctdb/tests/eventscripts/91.lvs.startup.002.sh
+++ b/ctdb/tests/eventscripts/91.lvs.startup.002.sh
@@ -4,8 +4,7 @@
 
 define_test "configured"
 
-setup_ctdb
-setup_ctdb_lvs "10.1.1.201" "eth0" <<EOF
+setup "10.1.1.201" "eth0" <<EOF
 EOF
 
 ok_null
diff --git a/ctdb/tests/eventscripts/scripts/91.lvs.sh b/ctdb/tests/eventscripts/scripts/91.lvs.sh
index 221be0c06e6..6006a311b9e 100644
--- a/ctdb/tests/eventscripts/scripts/91.lvs.sh
+++ b/ctdb/tests/eventscripts/scripts/91.lvs.sh
@@ -1,20 +1,20 @@
-setup_ctdb_lvs ()
+setup ()
 {
-	lvs_state_dir="${EVENTSCRIPTS_TESTS_VAR_DIR}/lvs"
-	mkdir -p "$lvs_state_dir"
+	_ip="$1"
+	_iface="$2"
 
-	export FAKE_LVS_STATE_DIR="${lvs_state_dir}/state"
-	mkdir "$FAKE_LVS_STATE_DIR"
+	export FAKE_LVS_STATE_DIR="${FAKE_NETWORK_STATE}/lvs"
+	mkdir -p "$FAKE_LVS_STATE_DIR"
 
 	lvs_header=$(ipvsadm -l -n)
 
-	export CTDB_LVS_PUBLIC_IP="$1"
-	export CTDB_LVS_PUBLIC_IFACE="$2"
+	[ -n "$_ip" ] || return 0
+	[ -n "$_iface" ] || return 0
 
-	[ -n "$CTDB_LVS_PUBLIC_IP" ] || return 0
-	[ -n "$CTDB_LVS_PUBLIC_IFACE" ] || return 0
+	export CTDB_LVS_NODES="${CTDB_BASE}/lvs_nodes"
+	export CTDB_LVS_PUBLIC_IP="$_ip"
+	export CTDB_LVS_PUBLIC_IFACE="$_iface"
 
-	export CTDB_LVS_NODES=$(mktemp --tmpdir="$lvs_state_dir")
 	export FAKE_CTDB_LVS_MASTER=""
 
 	# Read from stdin