10 files changed, 194 insertions, 5 deletions
diff --git a/ctdb/tests/tool/stubby.lvs.001.sh b/ctdb/tests/tool/stubby.lvs.001.sh
index 29e9ce0cdc..22600763bf 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 0000000000..e045273d6c
--- /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.003.sh b/ctdb/tests/tool/stubby.lvs.003.sh
new file mode 100755
index 0000000000..6870760c7c
--- /dev/null
+++ b/ctdb/tests/tool/stubby.lvs.003.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+. "${TEST_SCRIPTS_DIR}/unit.sh"
+
+define_test "3 nodes, some LVS, all ok"
+
+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 CTDB_CAP_LVS
+1       192.168.20.42   0x0
+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.001.sh b/ctdb/tests/tool/stubby.lvsmaster.001.sh
index 38de280e34..d883fb9cf5 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 ea6e441496..68b68192d5 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 0000000000..35c1da6b70
--- /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 0000000000..09ed57d631
--- /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 0000000000..0bb0759592
--- /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 0000000000..fb3f689a04
--- /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 0000000000..3057706ec0
--- /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