|
 |
ee43cd |
From b565fb6402af40789762ee281baf2b074c1532e1 Mon Sep 17 00:00:00 2001
|
|
|
ee43cd |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
ee43cd |
Date: Fri, 27 May 2016 23:17:32 +0200
|
|
|
ee43cd |
Subject: [PATCH 4/4] test: live_test: offer alternatives to crm (pcs + native)
|
|
|
ee43cd |
|
|
|
ee43cd |
Note that existing use of crm_ticket can be eventually also extended
|
|
|
ee43cd |
with higher-level CLI tool usage, following the same pattern.
|
|
|
ee43cd |
---
|
|
|
ee43cd |
test/live_test.sh | 61 +++++++++++++++++++++++++++++++++++++++++++++++++------
|
|
|
ee43cd |
1 file changed, 55 insertions(+), 6 deletions(-)
|
|
|
ee43cd |
|
|
|
ee43cd |
diff --git a/test/live_test.sh b/test/live_test.sh
|
|
|
ee43cd |
index 5ee918e..b7f27eb 100755
|
|
|
ee43cd |
--- a/test/live_test.sh
|
|
|
ee43cd |
+++ b/test/live_test.sh
|
|
|
ee43cd |
@@ -50,6 +50,9 @@ logf=test_booth.log
|
|
|
ee43cd |
SSH_OPTS="-o StrictHostKeyChecking=no -l root"
|
|
|
ee43cd |
iprules=/usr/share/booth/tests/test/booth_path
|
|
|
ee43cd |
: ${HA_LOGFACILITY:="syslog"}
|
|
|
ee43cd |
+cli_driver=native
|
|
|
ee43cd |
+which crm >/dev/null 2>&1 && cli_driver=crm || :
|
|
|
ee43cd |
+which pcs >/dev/null 2>&1 && cli_driver=pcs || :
|
|
|
ee43cd |
|
|
|
ee43cd |
get_site() {
|
|
|
ee43cd |
local n=$1
|
|
|
ee43cd |
@@ -159,7 +162,26 @@ runcmd() {
|
|
|
ee43cd |
return $rc
|
|
|
ee43cd |
}
|
|
|
ee43cd |
manage_site() {
|
|
|
ee43cd |
- runcmd $1 crm -w resource $2 booth
|
|
|
ee43cd |
+ local action=$2 resource=booth cmd
|
|
|
ee43cd |
+ case "$action" in
|
|
|
ee43cd |
+ start)
|
|
|
ee43cd |
+ case "$cli_driver" in
|
|
|
ee43cd |
+ native) action=Started;;
|
|
|
ee43cd |
+ pcs) action=enable;;
|
|
|
ee43cd |
+ esac;;
|
|
|
ee43cd |
+ stop)
|
|
|
ee43cd |
+ case "$cli_driver" in
|
|
|
ee43cd |
+ native) action=Stopped;;
|
|
|
ee43cd |
+ pcs) action=disable;;
|
|
|
ee43cd |
+ esac;;
|
|
|
ee43cd |
+ esac
|
|
|
ee43cd |
+
|
|
|
ee43cd |
+ case "$cli_driver" in
|
|
|
ee43cd |
+ native) cmd="crm_resource --wait --resource \"$resource\" --set-parameter target-role --meta --parameter-value \"$action\"";;
|
|
|
ee43cd |
+ crm) cmd="crm -w resource \"$action\" \"$resource\"";;
|
|
|
ee43cd |
+ pcs) cmd="pcs resource \"$action\" \"$resource\" --wait";;
|
|
|
ee43cd |
+ esac
|
|
|
ee43cd |
+ runcmd $1 $cmd
|
|
|
ee43cd |
}
|
|
|
ee43cd |
manage_arbitrator() {
|
|
|
ee43cd |
if ps 1 | grep -qws systemd; then
|
|
|
ee43cd |
@@ -211,9 +233,15 @@ cleanup_booth() {
|
|
|
ee43cd |
cleanup_dep_rsc() {
|
|
|
ee43cd |
local dep_rsc=`get_rsc`
|
|
|
ee43cd |
test -z "$dep_rsc" && return
|
|
|
ee43cd |
- local h procs
|
|
|
ee43cd |
+ local cmd h procs
|
|
|
ee43cd |
+ case "$cli_driver" in
|
|
|
ee43cd |
+ native) cmd="crm_resource --cleanup --resource \"$dep_rsc\"; crm_resource --wait";;
|
|
|
ee43cd |
+ crm) cmd="crm -w resource cleanup \"$dep_rsc\"";;
|
|
|
ee43cd |
+ # XXX pcs does not support --wait here?
|
|
|
ee43cd |
+ pcs) cmd="pcs resource cleanup \"$dep_rsc\"; crm_resource --wait";;
|
|
|
ee43cd |
+ esac
|
|
|
ee43cd |
for h in $sites; do
|
|
|
ee43cd |
- runcmd $h crm -w resource cleanup $dep_rsc & procs="$! $procs"
|
|
|
ee43cd |
+ runcmd $h $cmd & procs="$! $procs"
|
|
|
ee43cd |
done >/dev/null 2>&1
|
|
|
ee43cd |
wait $procs
|
|
|
ee43cd |
}
|
|
|
ee43cd |
@@ -412,13 +440,34 @@ del_site_attr() {
|
|
|
ee43cd |
run_site $site geostore delete $1
|
|
|
ee43cd |
}
|
|
|
ee43cd |
break_external_prog() {
|
|
|
ee43cd |
- run_site $1 crm configure "location $PREFNAME `get_rsc` rule -inf: defined \#uname"
|
|
|
ee43cd |
+ local cmd
|
|
|
ee43cd |
+ case "$cli_driver" in
|
|
|
ee43cd |
+ native) cmd="cibadmin --create --scope constraints --xml-text=\""
|
|
|
ee43cd |
+ cmd="$cmd<rsc_location id='$PREFNAME' rsc='`get_rsc`'><rule id='rule_$PREFNAME' score='-INFINITY'>"
|
|
|
ee43cd |
+ cmd="$cmd<expression id='expr_$PREFNAME' attribute='#uname' operation='define'/>"
|
|
|
ee43cd |
+ cmd="$cmd</rule></rsc_location>\"";;
|
|
|
ee43cd |
+ crm) cmd="crm configure \"location $PREFNAME `get_rsc` rule -inf: defined \#uname\"";;
|
|
|
ee43cd |
+ pcs) cmd="pcs constraint location `get_rsc` rule id=$PREFNAME score=-INFINITY defined \#uname";;
|
|
|
ee43cd |
+ esac
|
|
|
ee43cd |
+ runcmd $1 $cmd
|
|
|
ee43cd |
}
|
|
|
ee43cd |
show_pref() {
|
|
|
ee43cd |
- run_site $1 crm configure show $PREFNAME > /dev/null
|
|
|
ee43cd |
+ local cmd
|
|
|
ee43cd |
+ case "$cli_driver" in
|
|
|
ee43cd |
+ native) cmd="cibadmin --query --xpath \"//rsc_location[@id = '$PREFNAME']\"";;
|
|
|
ee43cd |
+ crm) cmd="crm configure show $PREFNAME > /dev/null";;
|
|
|
ee43cd |
+ pcs) cmd="pcs constraint show --full | grep -q $PREFNAME";;
|
|
|
ee43cd |
+ esac
|
|
|
ee43cd |
+ runcmd $1 $cmd
|
|
|
ee43cd |
}
|
|
|
ee43cd |
repair_external_prog() {
|
|
|
ee43cd |
- run_site $1 crm configure delete $PREFNAME
|
|
|
ee43cd |
+ local cmd
|
|
|
ee43cd |
+ case "$cli_driver" in
|
|
|
ee43cd |
+ native) cmd="cibadmin --delete --xpath \"//rsc_location[@id = '$PREFNAME']\"";;
|
|
|
ee43cd |
+ crm) cmd="crm configure delete $PREFNAME";;
|
|
|
ee43cd |
+ pcs) cmd="pcs constraint remove $PREFNAME";;
|
|
|
ee43cd |
+ esac
|
|
|
ee43cd |
+ runcmd $1 $cmd
|
|
|
ee43cd |
}
|
|
|
ee43cd |
get_tkt() {
|
|
|
ee43cd |
grep "^ticket=" | head -1 | sed 's/ticket=//;s/"//g'
|
|
|
ee43cd |
--
|
|
|
ee43cd |
2.4.11
|
|
|
ee43cd |
|