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 7c5554d077c24ecdffc271f16afb82acd24d9ea5..9fc8d029770fefcab24ae913d74acea8dbd395ad 100755 (executable)
--- 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 595c2c97725bc31a677731786a26a5124d878497..68660475b5a03234a637361bad6fc5594d3ebab0 100755 (executable)
--- 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 4c5ae529e1809e96127cd6b66cffe74405b52311..970a4aa9ccf5b0a12357b8e07083cb23fbc9017f 100755 (executable)
--- 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 7ac4b618cf92446da2fe1005535922d619a70af8..0720036b448c6b70c0c2a074ecd6411db33c08a9 100755 (executable)
--- 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 757637a890b3e41358f7a2721e89740c913c6765..19788d7bc8c0ea691225622a26d0f29e1500eef1 100755 (executable)
--- 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 3710d85f314f8925f99404f480ab78a7fcd9dbfa..42831fb16f364ba2c4b836775a3e13d62c43ef11 100755 (executable)
--- 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 65d84f5aa5794d4728fdeb4ae022e8db02875b20..a8080178d8dded6c66102f286ea74fa6bc4e0744 100755 (executable)
--- 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 d556abf090726ebdc350d4359e5614704764608e..89f443e39c20062c4d0f0ec68fab0c4eded41c0e 100755 (executable)
--- 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 3710d85f314f8925f99404f480ab78a7fcd9dbfa..42831fb16f364ba2c4b836775a3e13d62c43ef11 100755 (executable)
--- 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 db43d424d2cb75ccd673bfc2bf9cec21a57be772..61c7f96d48b9ffffc6df699d0eb9b283341d4755 100755 (executable)
--- 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 3710d85f314f8925f99404f480ab78a7fcd9dbfa..42831fb16f364ba2c4b836775a3e13d62c43ef11 100755 (executable)
--- 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 9e90dd33c86df7416b77ba6ed147c434ad4bfe63..e4c5e8d23cbc05a4e1f1bf75863ee04f422eea93 100755 (executable)
--- 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 221be0c06e6906bda664bc66913326601d12ea97..6006a311b9ebd5e4aa5aa5db20e9e71a57766341 100644 (file)
--- 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