From 3b7f1eee16282a18075caecbf2735857ec0201cd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Tue, 15 Mar 2011 11:36:00 +0000
Subject: [PATCH] Ws test extended to check interface version

---
 org.glite.testsuites.ctb/LB/tests/lb-common.sh  |  2 ++
 org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh | 46 ++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
index a65f66e..a80a916 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
@@ -121,6 +121,8 @@ SYS_EXPR=expr
 SYS_BC=bc
 SYS_SCP=scp
 SYS_TOUCH=touch
+SYS_HOSTNAME=hostname
+SYS_RPM=rpm
 
 # not used at the moment
 DEBUG=2
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
index 65824ac..50a22d8 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
@@ -90,7 +90,7 @@ test_start
 
 # check_binaries
 printf "Testing if all binaries are available"
-check_binaries $GRIDPROXYINFO $SYS_GREP $SYS_SED $SYS_AWK $LBJOBREG $LBWSJOBSTATUS $LBWSJOBLOG
+check_binaries $GRIDPROXYINFO $SYS_GREP $SYS_SED $SYS_AWK $LBJOBREG $LBWSJOBSTATUS $LBWSJOBLOG $SYS_HOSTNAME
 if [ $? -gt 0 ]; then
 	test_failed
 else
@@ -175,6 +175,50 @@ else
 
 		fi
 
+		printf "Getting server version... "
+                servername=`echo ${GLITE_WMS_QUERY_SERVER} | ${SYS_SED} "s/:.*//"`
+                wsglservver=`$LBWSGETVERSION -m ${servername}:${GLITE_LB_SERVER_WPORT} | $SYS_SED 's/^.*Server version:\s*//'`
+                if [ "$wsglservver" == "" ]; then
+	                test_failed
+                else
+        	        printf "$wsglservver"
+                        test_done
+                fi
+
+		printf "Getting WS interface version... "
+                wsglifver=`$LBWSGETVERSION -i -m ${servername}:${GLITE_LB_SERVER_WPORT} | $SYS_SED 's/^.*Interface version:\s*//'`
+                if [ "$wsglifver" == "" ]; then
+	                test_failed
+                else
+        	        printf "$wsglifver"
+                        test_done
+                fi
+
+		printf "Check if test runs on server... "
+		localname=`$SYS_HOSTNAME -f`
+
+                if [ "$servername" == "$localname" ]; then
+			printf "Get rpm version... "
+			rpmversion=`$SYS_RPM -qi glite-lb-ws-interface | $SYS_GREP -E "^Version" | $SYS_SED 's/^Version\s*:\s*//' | $SYS_SED 's/\s.*$//'`
+
+	                if [ "$rpmversion" == "" ]; then
+				printf "Unable to detect rpm version"
+        	                test_skipped
+	                else
+                	        printf "$rpmversion"
+        	                test_done
+
+				printf "Comparing versions ($wsglifver == $rpmversion)... "
+
+		                if [ "$wsglifver" == "$rpmversion" ]; then
+                		        test_done
+		                else
+		                        test_done
+					print_error "Reported version differs from that indicated by RPM"
+		                fi
+	                fi
+                fi
+
 		
 		
 	fi
-- 
1.8.2.3