From efd591b8d86fd489aa5f38ce0e2741debb93eb6d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Mon, 6 Feb 2012 14:43:49 +0000
Subject: [PATCH] Notif over msg: test extended to 1) read broker address from
 server configuration over HTTPs 2) use cms client's output to file feature if
 available

---
 .../LB/tests/lb-test-notif-msg.sh                  | 58 +++++++++++++++++++---
 1 file changed, 50 insertions(+), 8 deletions(-)

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-notif-msg.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-notif-msg.sh
index 3f787cd..a1104b8 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-notif-msg.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-notif-msg.sh
@@ -98,7 +98,7 @@ test_start
 
 # check_binaries
 printf "Testing if all binaries are available"
-check_binaries $GRIDPROXYINFO $SYS_GREP $SYS_SED $SYS_AWK $LBCMSCLIENT $SYS_EXPR
+check_binaries $GRIDPROXYINFO $SYS_GREP $SYS_SED $SYS_AWK $LBCMSCLIENT $SYS_EXPR $SYS_CURL
 if [ $? -gt 0 ]; then
 	test_failed
 else
@@ -111,6 +111,20 @@ if [ $? != 0 ]; then
 	test_end
 	exit 2
 fi
+X509_USER_PROXY=`${GRIDPROXYINFO} | ${SYS_GREP} -E "^path" | ${SYS_SED} "s/path\s*:\s//"`
+
+printf "Using SSL client: "
+$SYS_CURL --version | head -n 1 | grep -i NSS/ >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+        SSL_CMD="wget --no-check-certificate --secure-protocol=SSLv3 --quiet --private-key $X509_USER_PROXY --certificate $X509_USER_PROXY --ca-directory /etc/grid-security/certificates --ca-certificate $X509_USER_PROXY --output-document configuration.$$.tmp"
+        SSL_CLIENT=wget
+else
+        SSL_CMD="$SYS_CURL --insecure -3 --silent --key $X509_USER_PROXY --cert $X509_USER_PROXY --capath /etc/grid-security/certificates --output configuration.$$.tmp"
+        SSL_CLIENT=curl
+fi
+printf "$SSL_CLIENT"
+test_done
+
 		# Register job:
 		printf "Registering testing job "
 		jobid=`${LBJOBREG} -m ${GLITE_WMS_QUERY_SERVER} -s application 2>&1 | $SYS_GREP "new jobid" | ${SYS_AWK} '{ print $3 }'`
@@ -135,19 +149,47 @@ fi
 			printf "(${notifid}) "
 			test_done
 
-			BROKERLINE=`grep -E "^broker" /etc/glite-lb/msg.conf`
-
-			if [ $? = 0 ]; then
+		        check_srv_version '>=' "2.3"
+		        if [ $? -eq 0 ]; then
+				printf "Reading server configuration"
+				$SSL_CMD "https://${GLITE_WMS_QUERY_SERVER}/?configuration"
+                               if [ "$?" != "0" ]; then
+                                        test_failed
+                                        print_error "Could not read server configuration"
+                                else
+					BROKER=`$SYS_CAT configuration.$$.tmp | $SYS_GREP -E "^msg_brokers=" | $SYS_SED -r 's/^msg_brokers=\s*//' | $SYS_SED -r 's/\s+.*$//' | $SYS_SED 's/tcp:\/\///'`
+					rm configuration.$$.tmp
+					test_done
+				fi
 
+			else
+				printf "Reading from config file"
+				BROKERLINE=`grep -E "^broker" /etc/glite-lb/msg.conf`
 				BROKER=`$SYS_ECHO $BROKERLINE | $SYS_AWK '{print $3}' | $SYS_SED 's/^.*\/\///' | $SYS_SED 's/\///g'`
+				test_done
+			fi
+
+			if [ ! $BROKER == "" ]; then
 
-				printf "connecting to broker $BROKER, topic grid.emi.lbtest"
 
 				#Start listening for notifications
-				${LBCMSCLIENT} ${BROKER} grid.emi.lbtest > $$_notifications.txt &
-				recpid=$!
+			
+				printf "Checking if client supports output files... "	
+				rudver=`${LBCMSCLIENT} | $SYS_GREP '\-o'`
+				if [ "$rudver" == "" ]; then
+					printf "No. Connecting to broker $BROKER, topic grid.emi.lbtest"
+					${LBCMSCLIENT} ${BROKER} grid.emi.lbtest 2>&1 > $$_notifications.txt &
+					recpid=$!
+				else
+					printf "Yes. Connecting to broker $BROKER, topic grid.emi.lbtest"
+					${LBCMSCLIENT} -o $$_notifications.txt ${BROKER} grid.emi.lbtest > /dev/null &
+					recpid=$!
+				fi
+					
 				test_done
 
+				sleep 2
+
 				printf "Logging events resulting in DONE state... "
 				$LB_DONE_SH -j ${jobid} > /dev/null 2> /dev/null
 				test_done
@@ -157,7 +199,7 @@ fi
 				sleep 20
 				test_done
 
-				kill $recpid
+				kill -n 15 $recpid
 
 				printf "Checking number of messages delivered... "
 
-- 
1.8.2.3