Commit: 3938dd0b7a5602223d5c55420de027696d246f10 - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• Révision: 3938dd0b7a5602223d5c55420de027696d246f10 (tree)
• l'heure: 2010-10-22 12:42:52
• Auteur: 6638678 <6638678@1ed6...>
• Commiter: 6638678

Message de Log

bug fix

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10404 1ed66053-1c2d-0410-8867-f7571e6e31d3

Change Summary

• modified: test/script/PT/B/B-47-IPv4v4.sh
• modified: test/script/PT/B/B-47-IPv6v6.sh
• modified: test/script/PT/B/B-51-IPv4v4.sh
• modified: test/script/PT/B/B-51-IPv6v4.sh
• modified: test/script/PT/B/B-51-IPv6v6.sh
• modified: test/script/PT/B/B-55.sh
• modified: test/script/PT/B/B-56.sh
• modified: test/script/common/stop_um_ps.sh

Modification

--- a/test/script/PT/B/B-47-IPv4v4.sh
+++ b/test/script/PT/B/B-47-IPv4v4.sh
@@ -165,9 +165,6 @@ ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.3 = INTEGER: 0
 ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.4 = INTEGER: 0
 ULTRAMONKEY-L7-MIB::l7vsReplicationMode.0 = INTEGER: single(1)"
 
-echo "$RET" >1.log
-echo "$EXPECT" >2.log
-
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: snmpwalk -v 2c -c public localhost ULTRAMONKEY-L7-MIB::ultramonkey"

--- a/test/script/PT/B/B-47-IPv6v6.sh
+++ b/test/script/PT/B/B-47-IPv6v6.sh
@@ -164,9 +164,6 @@ ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.2 = INTEGER: 0
 ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.3 = INTEGER: 0
 ULTRAMONKEY-L7-MIB::l7vsRsInActiveConn.4 = INTEGER: 0
 ULTRAMONKEY-L7-MIB::l7vsReplicationMode.0 = INTEGER: single(1)"
-echo "$RET" >1.log
-echo "$EXPECT" >2.log
-
 
 if [ "${RET}" != "${EXPECT}" ]
 then

--- a/test/script/PT/B/B-51-IPv4v4.sh
+++ b/test/script/PT/B/B-51-IPv4v4.sh
@@ -53,7 +53,7 @@ fi
 dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240
 
 #Get The File
-$WGET http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
+$WGET -qO- http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
 if [ $? -ne 0 ]
 then
         echo "Test failed: $WGET http://127.0.0.1:40001 --post-file 10M.dat"

--- a/test/script/PT/B/B-51-IPv6v4.sh
+++ b/test/script/PT/B/B-51-IPv6v4.sh
@@ -53,7 +53,7 @@ fi
 dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240
 
 #Get The File
-$WGET http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
+$WGET -qO- http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
 if [ $? -ne 0 ]
 then
         echo "Test failed: $WGET http://$VS1:40001 --post-file 10M.dat"

--- a/test/script/PT/B/B-51-IPv6v6.sh
+++ b/test/script/PT/B/B-51-IPv6v6.sh
@@ -53,7 +53,7 @@ fi
 dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240
 
 #Get The File
-$WGET http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
+$WGET -qO- http://$VS1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
 if [ $? -ne 0 ]
 then
         echo "Test failed: $WGET http://$VS1:40001 --post-file 10M.dat"

--- a/test/script/PT/B/B-55.sh
+++ b/test/script/PT/B/B-55.sh
@@ -96,9 +96,6 @@ ULTRAMONKEY-L7-MIB::l7vsVsHttpPostCount.1 = Counter64: 0
 ULTRAMONKEY-L7-MIB::l7vsVsRsNumber.1 = INTEGER: 0
 ULTRAMONKEY-L7-MIB::l7vsReplicationMode.0 = INTEGER: single(1)"
 
-echo "$RET" >1.log
-echo "$EXPECT" >2.log
-
 if [ "${RET}" != "${EXPECT}" ]
 then
 	echo "Test failed: snmpwalk -v 2c -c public localhost  ULTRAMONKEY-L7-MIB::ultramonkey-l7"

--- a/test/script/PT/B/B-56.sh
+++ b/test/script/PT/B/B-56.sh
@@ -105,7 +105,6 @@ sleep 2
 #warnning log trap 
 $L7VSADM -A -t 127.0.0.1:40001 -m sessionless
 sleep 1
-
 RET=`cat ${L7VS_LOG_DIR}/B-56-snmptrapd.log | grep -e "SNMPv2-SMI::enterprises.32132.1.0.3.3 = STRING: \"[0-9]\{4\}/[0-9]\{2\}/[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\},VSD3.*" | wc -l`
 echo "TEST:: $RET"
 if [ "${RET}" != "2" ]
@@ -115,7 +114,6 @@ then
 fi
 
 sleep 20
-
 #Check MIB
 RET=`snmpwalk -v 2c -c public localhost  ULTRAMONKEY-L7-MIB::ultramonkey-l7`
 EXPECT="ULTRAMONKEY-L7-MIB::l7vsVsNumber.0 = INTEGER: 1
@@ -147,16 +145,10 @@ ULTRAMONKEY-L7-MIB::l7vsVsHttpPostCount.1 = Counter64: 0
 ULTRAMONKEY-L7-MIB::l7vsVsRsNumber.1 = INTEGER: 0
 ULTRAMONKEY-L7-MIB::l7vsReplicationMode.0 = INTEGER: single(1)"
 
-echo "$EXPECT" > /tmp/1.txt
-echo "$RET" > /tmp/2.txt
-diff /tmp/1.txt /tmp/2.txt
-
 if [ "${RET}" != "${EXPECT}" ]
 then
 	echo "Test failed: snmpwalk -v 2c -c public localhost  ULTRAMONKEY-L7-MIB::ultramonkey-l7"
 	exit 1
 fi
 
-
-
 exit 0

--- a/test/script/common/stop_um_ps.sh
+++ b/test/script/common/stop_um_ps.sh
@@ -10,13 +10,19 @@ then
 		LOG_FATAL "Can not stop l7vsd."
 		exit 1
 	fi
+	usleep 500000
+	if [ -n "`pgrep l7vsd`" ]
+	then
+		LOG_FATAL "Can not stop l7vsd."
+		exit 1
+	fi
 fi
 
 if [ -n "`pgrep l7directord`" ]
 then
 	${INIT_L7DIRECTORD} stop > /dev/null 2>&1
 	pkill -KILL l7directord > /dev/null 2>&1
-	usleep 100000
+	usleep 500000
 	if [ -n "`pgrep l7directord`" ]
 	then
 		LOG_FATAL "Can not stop l7directord."