From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 16 Nov 2010 12:45:30 +0000 (+0000)
Subject: Check the content of the glue1 too (service status item).
X-Git-Tag: gridsite-core_R_1_7_9~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d94f7544c51846c003401c2a272691577f450e8a;p=jra1mw.git

Check the content of the glue1 too (service status item).
---

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 341347f..67711fb 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-bdii.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-bdii.sh
@@ -139,7 +139,7 @@ else
 		test_done
 	fi
 
-	printf "Checking Glue 2.0 root entry... "
+	printf "Checking Glue 1 root entry... "
 	$SYS_LDAPSEARCH -x -H ldap://${server}:2170 -b 'o=grid' > ldap.$$.out
 	if [ $? -gt 0 ]; then	
 		test_failed
@@ -148,6 +148,20 @@ else
 		test_done
 	fi
 
+	printf "Checking ServiceStatus... "
+	health=`$SYS_GREP GlueServiceStatus: ldap.$$.out | $SYS_SED 's/^[^:]*: *//'`
+	if [ "$health" == "" ]; then
+		print_error "GlueServiceStatus not specified"
+		test_failed
+	else
+		printf "$health"
+		if [ "$health" == "OK" ]; then
+			test_done
+		else
+			test_failed
+		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	
@@ -157,6 +171,20 @@ else
 		test_done
 	fi
 
+	printf "Checking GLUE2 HealthStatus... "
+	health=`$SYS_GREP GLUE2EndpointHealthState: ldap.$$.out | $SYS_SED 's/^[^:]*: *//'`
+	if [ "$health" == "" ]; then
+		print_error "GLUE2EndpointHealthState not specified"
+		test_failed
+	else
+		printf "$health"
+		if [ "$health" == "ok" ]; then
+			test_done
+		else
+			test_failed
+		fi
+	fi
+
 	printf "Checking GlueServiceVersion... "
 	glservver=`$SYS_GREP GLUE2EndpointImplementationVersion ldap.$$.out | $SYS_SED 's/^.*GLUE2EndpointImplementationVersion:\s*//'`
 	if [ "$glservver" == "" ]; then	
@@ -188,20 +216,6 @@ else
 		fi
 	fi
 
-	printf "Checking HealthStatus... "
-	health=`$SYS_GREP GLUE2EndpointHealthState: ldap.$$.out | $SYS_SED 's/^[^:]*: *//'`
-	if [ "$health" == "" ]; then
-		print_error "GLUE2EndpointHealthState not specified"
-		test_failed
-	else
-		printf "$health"
-		if [ "$health" == "ok" ]; then
-			test_done
-		else
-			test_failed
-		fi
-	fi
-
 	rm ldap.$$.out
 
 fi