bug fix

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

diff --git a/test/script/l7directord/materials/l7directord-help.txt b/test/script/l7directord/materials/l7directord-help.txt
index d0a1d69..5970a45 100644 (file)
--- a/test/script/l7directord/materials/l7directord-help.txt
+++ b/test/script/l7directord/materials/l7directord-help.txt
@@ -450,4 +450,4 @@ A\bAU\bUT\bTH\bHO\bOR\bRS\bS
 
 
 
-perl v5.10.1                      2010-10-15                    L7DIRECTORD(1)
+perl v5.10.1                      2010-10-25                    L7DIRECTORD(1)

diff --git a/test/script/library-logger/logger-2.sh b/test/script/library-logger/logger-2.sh
index 8892356..290f88f 100755 (executable)
--- a/test/script/library-logger/logger-2.sh
+++ b/test/script/library-logger/logger-2.sh
@@ -62,31 +62,25 @@ fi
 
 stop_lighttpd $RealServer1
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\]" | wc -l`
-if [ ${RET} -gt 0 ]
-then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"
-        exit 1
-fi
-
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[INFO\]" | wc -l`
-if [ ${RET} -le 0 ]
+$INIT_L7VSD stop
+if [ $? -ne 0 ]
 then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"
+       echo "Test failed: $L7VSD"
         exit 1
 fi
+usleep 500000
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsadm.log | grep "\[DEBUG\]" | wc -l`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\]" | wc -l`
 if [ ${RET} -gt 0 ]
 then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsadm.log"
+        echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsadm.log | grep "\[INFO\]" | wc -l`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[INFO\]" | wc -l`
 if [ ${RET} -le 0 ]
 then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsadm.log"
+        echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"
         exit 1
 fi
 

diff --git a/test/script/library-logger/logger-5.sh b/test/script/library-logger/logger-5.sh
index f7cc0b2..65605ab 100755 (executable)
--- a/test/script/library-logger/logger-5.sh
+++ b/test/script/library-logger/logger-5.sh
@@ -27,13 +27,9 @@ then
 fi
 
 wget -qO- -t 1 http://127.0.0.1:40001/
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $wget -qO- -t 1 http://127.0.0.1:40001/"
-        exit 1
-fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsadm.log | grep "\[ERROR\]" | wc -l`
+
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\]" | wc -l`
 if [ ${RET} -le 0 ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsadm.log"

diff --git a/test/script/snmpagent/materials/snmpagent-1-19-l7vs.cf b/test/script/snmpagent/materials/snmpagent-1-19-l7vs.cf
index 006ce85..655243d 100644 (file)
--- a/test/script/snmpagent/materials/snmpagent-1-19-l7vs.cf
+++ b/test/script/snmpagent/materials/snmpagent-1-19-l7vs.cf
@@ -150,6 +150,6 @@ qos_up_alert_off = 50
 qos_down_alert_on = 85
 qos_down_alert_off = 50
 sessionpool_alert_on = 5
-sessionpool_alert_off = 8
+sessionpool_alert_off = 3
 trap_queue_polling_interval = 100000000
 trap_queue_max_size = 1000

diff --git a/test/script/snmpagent/mib-58.sh b/test/script/snmpagent/mib-58.sh
index 8201882..0f44b3f 100755 (executable)
--- a/test/script/snmpagent/mib-58.sh
+++ b/test/script/snmpagent/mib-58.sh
@@ -14,12 +14,15 @@ fi
 #SNMPv3  configuration
 #createUser MD5User MD5 mysecretpass DES mysecretpass
 #rwuser  MD5User auth
-#\cp -f ./materials/mib-58-snmpd.conf /etc/snmp/snmpd.conf
+\cp -f /etc/snmp/snmpd.conf ${TMP_DIR}/snmpd.conf.org
+\cp -f ./materials/mib-58-snmpd.conf /etc/snmp/snmpd.conf
 
 ${INIT_SNMPD} start >/dev/null
 if [ $? -ne 0 ]
 then
        echo "Test failed: ${INIT_SNMPD} start"
+        \cp -f ${TMP_DIR}/snmpd.conf.org /etc/snmp/snmpd.conf
+        ${INIT_SNMPD} restart >/dev/null
        exit 1
 fi
 usleep 1000000
@@ -29,6 +32,8 @@ $L7VSD
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7VSD"
+        \cp -f ${TMP_DIR}/snmpd.conf.org /etc/snmp/snmpd.conf
+        ${INIT_SNMPD} restart >/dev/null
         exit 1
 fi
 usleep 100000
@@ -43,6 +48,8 @@ $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServ
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless -b ${SorryServer_ADDR}:${SorryServer_PORT}"
+        \cp -f ${TMP_DIR}/snmpd.conf.org /etc/snmp/snmpd.conf
+        ${INIT_SNMPD} restart >/dev/null
         exit 1
 fi
 
@@ -53,6 +60,8 @@ if [ $? -ne 0 ]
 then
         echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001
               -m sessionless -r 127.0.0.1:50001 -w 100"
+        \cp -f ${TMP_DIR}/snmpd.conf.org /etc/snmp/snmpd.conf
+        ${INIT_SNMPD} restart >/dev/null
         exit 1
 fi
 
@@ -60,6 +69,8 @@ $L7VSADM -S -f 1
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7VSD"
+        \cp -f ${TMP_DIR}/snmpd.conf.org /etc/snmp/snmpd.conf
+        ${INIT_SNMPD} restart >/dev/null
         exit 1
 fi
 
@@ -106,7 +117,11 @@ ULTRAMONKEY-L7-MIB::l7vsReplicationMode.0 = INTEGER: single(1)"
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: snmpwalk -v 3 -u MD5User -l auth -a MD5 -A mysecretpass 127.0.0.1 ULTRAMONKEY-L7-MIB::ultramonkey-l7"
+        \cp -f ${TMP_DIR}/snmpd.conf.org /etc/snmp/snmpd.conf
+        ${INIT_SNMPD} restart >/dev/null
         exit 1
 fi
 
+\cp -f ${TMP_DIR}/snmpd.conf.org /etc/snmp/snmpd.conf
+${INIT_SNMPD} restart >/dev/null
 exit 0

diff --git a/test/script/snmpagent/snmpagent-13.sh b/test/script/snmpagent/snmpagent-13.sh
index eb72ce4..b6b5cab 100755 (executable)
--- a/test/script/snmpagent/snmpagent-13.sh
+++ b/test/script/snmpagent/snmpagent-13.sh
@@ -21,7 +21,6 @@ then
 fi
 
 #Start L7VAD Service
-TIME=`date`
 $L7VSD
 if [ $? -ne 0 ]
 then

diff --git a/test/script/snmpagent/snmpagent-14.sh b/test/script/snmpagent/snmpagent-14.sh
index 102ee7a..c18cd1c 100755 (executable)
--- a/test/script/snmpagent/snmpagent-14.sh
+++ b/test/script/snmpagent/snmpagent-14.sh
@@ -46,12 +46,36 @@ then
 fi
 
 #Built link
-for ((i=0;i<23;i++)){ nc 127.0.0.1 40001 -w 10 & }
-for ((i=0;i<5;i++)){ nc 127.0.0.1 40001 -w 2 & }
-usleep 3000000
+#Make 28 active connection
+for ((i=0;i<28;i++)){ nc 127.0.0.1 40001 -w 5& }
+
+$TEST_CLIENT 127.0.0.1 40001 &
+CONNECT1=$!
+$TEST_CLIENT 127.0.0.1 40001 &
+CONNECT2=$!
+$TEST_CLIENT 127.0.0.1 40001 &
+CONNECT3=$!
+$TEST_CLIENT 127.0.0.1 40001 &
+CONNECT4=$!
+$TEST_CLIENT 127.0.0.1 40001 &
+CONNECT5=$!
+$TEST_CLIENT 127.0.0.1 40001 &
+
+sleep 5
+
+kill ${CONNECT1}
+kill ${CONNECT2}
+kill ${CONNECT3}
+kill ${CONNECT4}
+kill ${CONNECT5}
+
+sleep 5
 
 #Check Traplog
+cat  ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log
+
 RET=`cat  ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log | grep -e  "SNMPv2-SMI::enterprises.32132.1.0.2.12 = STRING: \"[0-9]\{4\}/[0-9]\{2\}/[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\},TRAP00020012,Warning release: The left-session has exceeded the release threshold of left-session warning."`
+
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log"

diff --git a/test/script/snmpagent/snmpagent-18.sh b/test/script/snmpagent/snmpagent-18.sh
index 90f4165..a9c3860 100755 (executable)
--- a/test/script/snmpagent/snmpagent-18.sh
+++ b/test/script/snmpagent/snmpagent-18.sh
@@ -33,6 +33,7 @@ usleep 100000
 
 wget -qO- http://127.0.0.1:40001 -T 3 -t 1
 
+sleep 1
 #Check Trap Log
 RET=`cat  ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log | grep -e  "SNMPv2-SMI::enterprises.32132.1.0.3.2 = STRING: \"[0-9]\{4\}/[0-9]\{2\}/[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\},SCM4.*"`
 if [ -z "${RET}" ]

diff --git a/test/script/snmpagent/snmpagent-4.sh b/test/script/snmpagent/snmpagent-4.sh
index a3aede8..56063ef 100755 (executable)
--- a/test/script/snmpagent/snmpagent-4.sh
+++ b/test/script/snmpagent/snmpagent-4.sh
@@ -33,7 +33,8 @@ then
         echo "Test failed: $L7VSADM -E -t 127.0.0.1:40001 -m sessionless -f -b 127.0.0.1:50002"
         exit 1
 fi
-usleep 100000
+usleep 500000
+
 
 #Check Traplog
 

diff --git a/test/script/snmpagent/snmpagent-6.sh b/test/script/snmpagent/snmpagent-6.sh
index dcde0cf..9643a6a 100755 (executable)
--- a/test/script/snmpagent/snmpagent-6.sh
+++ b/test/script/snmpagent/snmpagent-6.sh
@@ -33,11 +33,9 @@ then
         echo "Test failed: $L7VSADM -a -t 127.0.0.1:40001 -m sessionless -r 127.0.0.1:50001"
         exit 1
 fi
-usleep 100000
+usleep 500000
 
 #Check Traplog
-cat ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log
-
 RET=`cat  ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log | grep -e  "SNMPv2-SMI::enterprises.32132.1.0.2.4 = STRING: \"[0-9]\{4\}/[0-9]\{2\}/[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\},TRAP00020004,A real server was added.vs:127.0.0.1:40001,rs:127.0.0.1:50001"`
 if [ -z "${RET}" ]
 then