From 0f080cebef01affb88df7dc5a301cbb9efcf5ee4 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Mon, 19 Mar 2018 20:55:10 +1100
Subject: [PATCH] ctdb-tests: Create 91.lvs.sh

Contains testing support used only by tests for 91.lvs event scripts.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---
 ctdb/tests/eventscripts/scripts/91.lvs.sh | 74 ++++++++++++++++++++++
 ctdb/tests/eventscripts/scripts/local.sh  | 77 -----------------------
 2 files changed, 74 insertions(+), 77 deletions(-)
 create mode 100644 ctdb/tests/eventscripts/scripts/91.lvs.sh

diff --git a/ctdb/tests/eventscripts/scripts/91.lvs.sh b/ctdb/tests/eventscripts/scripts/91.lvs.sh
new file mode 100644
index 00000000000..221be0c06e6
--- /dev/null
+++ b/ctdb/tests/eventscripts/scripts/91.lvs.sh
@@ -0,0 +1,74 @@
+setup_ctdb_lvs ()
+{
+	lvs_state_dir="${EVENTSCRIPTS_TESTS_VAR_DIR}/lvs"
+	mkdir -p "$lvs_state_dir"
+
+	export FAKE_LVS_STATE_DIR="${lvs_state_dir}/state"
+	mkdir "$FAKE_LVS_STATE_DIR"
+
+	lvs_header=$(ipvsadm -l -n)
+
+	export CTDB_LVS_PUBLIC_IP="$1"
+	export CTDB_LVS_PUBLIC_IFACE="$2"
+
+	[ -n "$CTDB_LVS_PUBLIC_IP" ] || return 0
+	[ -n "$CTDB_LVS_PUBLIC_IFACE" ] || return 0
+
+	export CTDB_LVS_NODES=$(mktemp --tmpdir="$lvs_state_dir")
+	export FAKE_CTDB_LVS_MASTER=""
+
+	# Read from stdin
+	_pnn=0
+	while read _ip _opts ; do
+		case "$_opts" in
+		master)
+			FAKE_CTDB_LVS_MASTER="$_pnn"
+			echo "$_ip"
+			;;
+		slave-only)
+			printf "%s\tslave-only\n" "$_ip"
+			;;
+		*)
+			echo "$_ip"
+			;;
+		esac
+		_pnn=$(($_pnn + 1))
+	done >"$CTDB_LVS_NODES"
+}
+
+check_ipvsadm ()
+{
+	if [ "$1" = "NULL" ] ; then
+		required_result 0 <<EOF
+$lvs_header
+EOF
+	else
+		required_result 0 <<EOF
+$lvs_header
+$(cat)
+EOF
+	fi
+
+	simple_test_command ipvsadm -l -n
+}
+
+check_lvs_ip ()
+{
+	_scope="$1"
+
+	if [ "$_scope" = "NULL" ] ; then
+		required_result 0 <<EOF
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN
+    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+EOF
+	else
+		required_result 0 <<EOF
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN
+    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+    inet ${CTDB_LVS_PUBLIC_IP}/32 scope ${_scope} lo
+       valid_lft forever preferred_lft forever
+EOF
+	fi
+
+	simple_test_command ip addr show dev lo
+}
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index aea64b0c1a0..2d2ca4792b2 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -409,83 +409,6 @@ EOF
 
 ######################################################################
 
-setup_ctdb_lvs ()
-{
-	lvs_state_dir="${EVENTSCRIPTS_TESTS_VAR_DIR}/lvs"
-	mkdir -p "$lvs_state_dir"
-
-	export FAKE_LVS_STATE_DIR="${lvs_state_dir}/state"
-	mkdir "$FAKE_LVS_STATE_DIR"
-
-	lvs_header=$(ipvsadm -l -n)
-
-	export CTDB_LVS_PUBLIC_IP="$1"
-	export CTDB_LVS_PUBLIC_IFACE="$2"
-
-	[ -n "$CTDB_LVS_PUBLIC_IP" ] || return 0
-	[ -n "$CTDB_LVS_PUBLIC_IFACE" ] || return 0
-
-	export CTDB_LVS_NODES=$(mktemp --tmpdir="$lvs_state_dir")
-	export FAKE_CTDB_LVS_MASTER=""
-
-	# Read from stdin
-	_pnn=0
-	while read _ip _opts ; do
-		case "$_opts" in
-		master)
-			FAKE_CTDB_LVS_MASTER="$_pnn"
-			echo "$_ip"
-			;;
-		slave-only)
-			printf "%s\tslave-only\n" "$_ip"
-			;;
-		*)
-			echo "$_ip"
-			;;
-		esac
-		_pnn=$(($_pnn + 1))
-	done >"$CTDB_LVS_NODES"
-}
-
-check_ipvsadm ()
-{
-	if [ "$1" = "NULL" ] ; then
-		required_result 0 <<EOF
-$lvs_header
-EOF
-	else
-		required_result 0 <<EOF
-$lvs_header
-$(cat)
-EOF
-	fi
-
-	simple_test_command ipvsadm -l -n
-}
-
-check_lvs_ip ()
-{
-	_scope="$1"
-
-	if [ "$_scope" = "NULL" ] ; then
-		required_result 0 <<EOF
-1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN
-    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
-EOF
-	else
-		required_result 0 <<EOF
-1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN
-    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
-    inet ${CTDB_LVS_PUBLIC_IP}/32 scope ${_scope} lo
-       valid_lft forever preferred_lft forever
-EOF
-	fi
-
-	simple_test_command ip addr show dev lo
-}
-
-######################################################################
-
 ctdb_catdb_format_pairs ()
 {
     _count=0
-- 
2.47.3