From 75cf99b9da1677fa83197d111d757e14041dae05 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Tue, 18 Feb 2014 12:12:06 +1100
Subject: [PATCH] ctdb-tests: Update ctdb stub LVS tests and add some new ones

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---
 ctdb/tests/tool/stubby.lvs.001.sh                  |  3 +--
 ctdb/tests/tool/stubby.lvs.002.sh                  | 29 ++++++++++++++++++++++
 .../tool/{stubby.lvs.001.sh => stubby.lvs.003.sh}  |  9 ++++---
 ctdb/tests/tool/stubby.lvsmaster.001.sh            |  3 +--
 ctdb/tests/tool/stubby.lvsmaster.002.sh            |  1 -
 ctdb/tests/tool/stubby.lvsmaster.003.sh            | 27 ++++++++++++++++++++
 ctdb/tests/tool/stubby.lvsmaster.004.sh            | 27 ++++++++++++++++++++
 ctdb/tests/tool/stubby.lvsmaster.005.sh            | 27 ++++++++++++++++++++
 ctdb/tests/tool/stubby.lvsmaster.006.sh            | 27 ++++++++++++++++++++
 ctdb/tests/tool/stubby.lvsmaster.007.sh            | 27 ++++++++++++++++++++
 10 files changed, 171 insertions(+), 9 deletions(-)
 create mode 100755 ctdb/tests/tool/stubby.lvs.002.sh
 copy ctdb/tests/tool/{stubby.lvs.001.sh => stubby.lvs.003.sh} (53%)
 create mode 100755 ctdb/tests/tool/stubby.lvsmaster.003.sh
 create mode 100755 ctdb/tests/tool/stubby.lvsmaster.004.sh
 create mode 100755 ctdb/tests/tool/stubby.lvsmaster.005.sh
 create mode 100755 ctdb/tests/tool/stubby.lvsmaster.006.sh
 create mode 100755 ctdb/tests/tool/stubby.lvsmaster.007.sh

diff --git a/ctdb/tests/tool/stubby.lvs.001.sh b/ctdb/tests/tool/stubby.lvs.001.sh
index 29e9ce0cdc3..22600763bf9 100755
--- a/ctdb/tests/tool/stubby.lvs.001.sh
+++ b/ctdb/tests/tool/stubby.lvs.001.sh
@@ -2,9 +2,8 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-define_test "3 nodes, all ok"
+define_test "3 nodes, no LVS, all ok"
 
-# This isn't very useful, since the stub for capabilities does set LVS :-)
 required_result 0 <<EOF
 EOF
 
diff --git a/ctdb/tests/tool/stubby.lvs.002.sh b/ctdb/tests/tool/stubby.lvs.002.sh
new file mode 100755
index 00000000000..e045273d6cc
--- /dev/null
+++ b/ctdb/tests/tool/stubby.lvs.002.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "3 nodes, all LVS, all ok"
+
+required_result 0 <<EOF
+0:192.168.20.41
+1:192.168.20.42
+2:192.168.20.43
+EOF
+
+simple_test <<EOF
+NODEMAP
+0       192.168.20.41   0x0     CURRENT RECMASTER CTDB_CAP_LVS
+1       192.168.20.42   0x0	CTDB_CAP_LVS
+2       192.168.20.43   0x0	CTDB_CAP_LVS
+
+IFACES
+:Name:LinkStatus:References:
+:eth2:1:2:
+:eth1:1:4:
+
+VNNMAP
+654321
+0
+1
+2
+EOF
diff --git a/ctdb/tests/tool/stubby.lvs.001.sh b/ctdb/tests/tool/stubby.lvs.003.sh
similarity index 53%
copy from ctdb/tests/tool/stubby.lvs.001.sh
copy to ctdb/tests/tool/stubby.lvs.003.sh
index 29e9ce0cdc3..6870760c7c0 100755
--- a/ctdb/tests/tool/stubby.lvs.001.sh
+++ b/ctdb/tests/tool/stubby.lvs.003.sh
@@ -2,17 +2,18 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-define_test "3 nodes, all ok"
+define_test "3 nodes, some LVS, all ok"
 
-# This isn't very useful, since the stub for capabilities does set LVS :-)
 required_result 0 <<EOF
+0:192.168.20.41
+2:192.168.20.43
 EOF
 
 simple_test <<EOF
 NODEMAP
-0       192.168.20.41   0x0     CURRENT RECMASTER
+0       192.168.20.41   0x0     CURRENT RECMASTER CTDB_CAP_LVS
 1       192.168.20.42   0x0
-2       192.168.20.43   0x0
+2       192.168.20.43   0x0	CTDB_CAP_LVS
 
 IFACES
 :Name:LinkStatus:References:
diff --git a/ctdb/tests/tool/stubby.lvsmaster.001.sh b/ctdb/tests/tool/stubby.lvsmaster.001.sh
index 38de280e348..d883fb9cf5c 100755
--- a/ctdb/tests/tool/stubby.lvsmaster.001.sh
+++ b/ctdb/tests/tool/stubby.lvsmaster.001.sh
@@ -2,9 +2,8 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-define_test "3 nodes, all ok"
+define_test "3 nodes, no LVS, all ok"
 
-# This isn't very useful, since the stub for capabilities doesn't set LVS :-)
 required_result 255 <<EOF
 There is no LVS master
 EOF
diff --git a/ctdb/tests/tool/stubby.lvsmaster.002.sh b/ctdb/tests/tool/stubby.lvsmaster.002.sh
index ea6e441496d..68b68192d5e 100755
--- a/ctdb/tests/tool/stubby.lvsmaster.002.sh
+++ b/ctdb/tests/tool/stubby.lvsmaster.002.sh
@@ -4,7 +4,6 @@
 
 define_test "3 nodes, current disconnected"
 
-# This isn't very useful, since the stub for capabilities doesn't set LVS :-)
 required_result 10 <<EOF
 DATE TIME [PID]: Unable to get nodemap from local node
 EOF
diff --git a/ctdb/tests/tool/stubby.lvsmaster.003.sh b/ctdb/tests/tool/stubby.lvsmaster.003.sh
new file mode 100755
index 00000000000..35c1da6b700
--- /dev/null
+++ b/ctdb/tests/tool/stubby.lvsmaster.003.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "3 nodes, all LVS, all ok"
+
+required_result 0 <<EOF
+Node 0 is LVS master
+EOF
+
+simple_test <<EOF
+NODEMAP
+0       192.168.20.41   0x0     CURRENT RECMASTER CTDB_CAP_LVS
+1       192.168.20.42   0x0	CTDB_CAP_LVS
+2       192.168.20.43   0x0	CTDB_CAP_LVS
+
+IFACES
+:Name:LinkStatus:References:
+:eth2:1:2:
+:eth1:1:4:
+
+VNNMAP
+654321
+0
+1
+2
+EOF
diff --git a/ctdb/tests/tool/stubby.lvsmaster.004.sh b/ctdb/tests/tool/stubby.lvsmaster.004.sh
new file mode 100755
index 00000000000..09ed57d6319
--- /dev/null
+++ b/ctdb/tests/tool/stubby.lvsmaster.004.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "3 nodes, all LVS, node 0 unhealthy"
+
+required_result 0 <<EOF
+Node 1 is LVS master
+EOF
+
+simple_test <<EOF
+NODEMAP
+0       192.168.20.41   0x2	CURRENT RECMASTER CTDB_CAP_LVS
+1       192.168.20.42   0x0	CTDB_CAP_LVS
+2       192.168.20.43   0x0	CTDB_CAP_LVS
+
+IFACES
+:Name:LinkStatus:References:
+:eth2:1:2:
+:eth1:1:4:
+
+VNNMAP
+654321
+0
+1
+2
+EOF
diff --git a/ctdb/tests/tool/stubby.lvsmaster.005.sh b/ctdb/tests/tool/stubby.lvsmaster.005.sh
new file mode 100755
index 00000000000..0bb0759592a
--- /dev/null
+++ b/ctdb/tests/tool/stubby.lvsmaster.005.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "3 nodes, all LVS, all unhealthy"
+
+required_result 0 <<EOF
+Node 0 is LVS master
+EOF
+
+simple_test <<EOF
+NODEMAP
+0       192.168.20.41   0x2	CURRENT RECMASTER CTDB_CAP_LVS
+1       192.168.20.42   0x2	CTDB_CAP_LVS
+2       192.168.20.43   0x2	CTDB_CAP_LVS
+
+IFACES
+:Name:LinkStatus:References:
+:eth2:1:2:
+:eth1:1:4:
+
+VNNMAP
+654321
+0
+1
+2
+EOF
diff --git a/ctdb/tests/tool/stubby.lvsmaster.006.sh b/ctdb/tests/tool/stubby.lvsmaster.006.sh
new file mode 100755
index 00000000000..fb3f689a048
--- /dev/null
+++ b/ctdb/tests/tool/stubby.lvsmaster.006.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "3 nodes, all LVS, nodes 0,1 disabled, node 2 unhealthy"
+
+required_result 0 <<EOF
+Node 2 is LVS master
+EOF
+
+simple_test <<EOF
+NODEMAP
+0       192.168.20.41   0x4	CURRENT RECMASTER CTDB_CAP_LVS
+1       192.168.20.42   0x4	CTDB_CAP_LVS
+2       192.168.20.43   0x2	CTDB_CAP_LVS
+
+IFACES
+:Name:LinkStatus:References:
+:eth2:1:2:
+:eth1:1:4:
+
+VNNMAP
+654321
+0
+1
+2
+EOF
diff --git a/ctdb/tests/tool/stubby.lvsmaster.007.sh b/ctdb/tests/tool/stubby.lvsmaster.007.sh
new file mode 100755
index 00000000000..3057706ec0d
--- /dev/null
+++ b/ctdb/tests/tool/stubby.lvsmaster.007.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "3 nodes, all LVS, all nodes disabled"
+
+required_result 255 <<EOF
+There is no LVS master
+EOF
+
+simple_test <<EOF
+NODEMAP
+0       192.168.20.41   0x4	CURRENT RECMASTER CTDB_CAP_LVS
+1       192.168.20.42   0x4	CTDB_CAP_LVS
+2       192.168.20.43   0x4	CTDB_CAP_LVS
+
+IFACES
+:Name:LinkStatus:References:
+:eth2:1:2:
+:eth1:1:4:
+
+VNNMAP
+654321
+0
+1
+2
+EOF
-- 
2.11.4.GIT