From fdec93e8c94bc4f0d0cc5e9afce5ac1bfb77e9ed Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Mon, 2 Aug 2010 13:20:04 +0000
Subject: [PATCH] Modified to follow the new GLUE 2.0 template

---
 org.glite.testsuites.ctb/LB/tests/lb-test-bdii.sh | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-bdii.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-bdii.sh
index 26a0a46..36afc90 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-bdii.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-bdii.sh
@@ -147,10 +147,19 @@ else
 		test_done
 	fi
 
+	printf "Checking Glue 2.0 entry with 'o=glue'... "
+	$SYS_LDAPSEARCH -x -H ldap://${server}:2170 -b 'o=glue' > ldap.$$.out
+	if [ $? -gt 0 ]; then	
+		test_failed
+		print_error "No reply"
+	else
+		test_done
+	fi
+
 	printf "Checking GlueServiceVersion... "
-	glservver=`$SYS_GREP GlueServiceVersion: ldap.$$.out | $SYS_SED 's/^.*GlueServiceVersion:\s*//'`
+	glservver=`$SYS_GREP GLUE2EndpointImplementationVersion ldap.$$.out | $SYS_SED 's/^.*GLUE2EndpointImplementationVersion:\s*//'`
 	if [ "$glservver" == "" ]; then	
-		print_error "GlueServiceVersion not specified"
+		print_error "GLUE2EndpointImplementationVersion not specified"
 		test_failed
 	else
 		printf "$glservver"
@@ -166,7 +175,7 @@ else
 				printf "$wsglservver"
 				test_done
 
-				printf "Comparing versions: $glservver == $wsglservver"
+				printf "Comparing versions: '$glservver' == '$wsglservver'"
 				if [ "$glservver" == "$wsglservver" ]; then
 					test_done
 				else
@@ -178,15 +187,6 @@ else
 		fi
 	fi
 
-	printf "Checking Glue 2.0 entry with 'o=glue'... "
-	$SYS_LDAPSEARCH -x -H ldap://${server}:2170 -b 'o=glue' > ldap.$$.out
-	if [ $? -gt 0 ]; then	
-		test_failed
-		print_error "No reply"
-	else
-		test_done
-	fi
-
 	rm ldap.$$.out
 
 fi		
-- 
1.8.2.3