OSDN Git Service

bugfix
author6638678 <6638678@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Thu, 7 Oct 2010 09:33:52 +0000 (09:33 +0000)
committer6638678 <6638678@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Thu, 7 Oct 2010 09:33:52 +0000 (09:33 +0000)
git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10342 1ed66053-1c2d-0410-8867-f7571e6e31d3

34 files changed:
test/script/l7directord/l7directord-1-2-44-2.sh
test/script/l7directord/l7directord-1-2-48-2.sh
test/script/l7directord/l7directord-1-2-49-1.sh
test/script/l7directord/l7directord-1-2-49-2.sh
test/script/l7directord/l7directord-1-2-49-3.sh
test/script/l7directord/l7directord-1-2-49-4.sh [deleted file]
test/script/l7directord/l7directord-1-3-9.sh
test/script/l7directord/l7directord-4-1-1-1.sh
test/script/l7directord/l7directord-4-1-1-2.sh
test/script/l7directord/l7directord-4-1-2.sh
test/script/l7directord/l7directord-4-1-5-1.sh
test/script/l7directord/l7directord-4-1-5-2.sh
test/script/l7directord/l7directord-5-2-24-3.sh
test/script/l7directord/l7directord-5-2-24-6.sh
test/script/l7directord/l7directord-5-2-26.sh
test/script/l7directord/l7directord-5-2-4-4.sh [deleted file]
test/script/l7directord/l7directord-5-2-4-5.sh [deleted file]
test/script/l7directord/l7directord-5-2-4-6.sh [deleted file]
test/script/l7directord/l7directord-5-2-5-3.sh [deleted file]
test/script/l7directord/l7directord-5-2-5-4.sh [deleted file]
test/script/l7directord/l7directord-5-2-9.sh
test/script/l7directord/l7directord-5-3-2.sh [new file with mode: 0755]
test/script/l7directord/l7directord-5-3-3.sh [new file with mode: 0755]
test/script/l7directord/l7directord-5-3-4.sh [new file with mode: 0755]
test/script/l7directord/materials/l7directord-1-2-44-l7directord.cf
test/script/l7directord/materials/l7directord-1-2-46-l7directord.cf
test/script/l7directord/materials/l7directord-1-2-48-l7directord.cf
test/script/l7directord/materials/l7directord-1-3-11-l7directord.cf [new file with mode: 0644]
test/script/l7directord/materials/l7directord-5-2-24-callback.sh [new file with mode: 0755]
test/script/l7directord/materials/l7directord-5-2-24-no_exec_callback.sh [new file with mode: 0644]
test/script/l7directord/materials/l7directord-5-3-2-l7directord.cf [new file with mode: 0644]
test/script/l7directord/materials/l7directord-5-3-3-l7directord.cf [new file with mode: 0644]
test/script/l7directord/materials/l7directord-5-3-4-l7directord.cf [new file with mode: 0644]
test/script/l7directord/materials/l7directord-help.txt

index e02f699..48ada4d 100755 (executable)
@@ -3,7 +3,7 @@
 \cp ./materials/l7directord-1-2-44-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
 
 #test l7directord config file
-RET=`$L7DIRECTORD -t`
+RET=`$L7DIRECTORD -t"`
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD -t"
index 900655f..f2bcf63 100755 (executable)
@@ -3,7 +3,7 @@
 \cp ./materials/l7directord-1-2-48-l7directord.cf ${L7DIRECTORD_CONF_DIR}/specified.cf
 
 #test l7directord config file
-RET=`$L7DIRECTORD -t ${L7DIRECTORD_CONF_DIR}/specified.cf`
+RET=`$L7DIRECTORD -t ${L7DIRECTORD_CONF_DIR}/specified.cf"`
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD -t ${L7DIRECTORD_CONF_DIR}/specified.cf"
index c97a58e..7b7c75d 100755 (executable)
@@ -2,15 +2,14 @@
 . ${SET_DEFAULT_CONF}
 
 #test l7directord config file
-RET=`$L7DIRECTORD version`
+RET=`$L7DIRECTORD version  | grep -A 1 "^l7directord, version [0-9]*\.[0-9]*\.[0-9]*" | sed -e 1d | grep "^Copyright (C) 20[0-9][0-9] NTT COMWARE CORPORATION"`
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD version"
         exit 1
 fi
-EXPECT="l7directord, version 3.0.0-0
-Copyright (C) 2009 NTT COMWARE CORPORATION"
-if [ "$RET" != "$EXPECT" ]
+
+if [ -z "$RET" ]
 then
         echo "Test failed: $L7DIRECTORD version"
         exit 1
index 8d2b487..c27b72f 100755 (executable)
@@ -2,15 +2,14 @@
 . ${SET_DEFAULT_CONF}
 
 #test l7directord config file
-RET=`$L7DIRECTORD -v`
+RET=`$L7DIRECTORD -v | grep -A 1 "^l7directord, version [0-9]*\.[0-9]*\.[0-9]*" | sed -e 1d | grep "^Copyright (C) 20[0-9][0-9] NTT COMWARE CORPORATION"`
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD -v"
         exit 1
 fi
-EXPECT="l7directord, version 3.0.0-0
-Copyright (C) 2009 NTT COMWARE CORPORATION"
-if [ "$RET" != "$EXPECT" ]
+
+if [ -z "$RET" ]
 then
         echo "Test failed: $L7DIRECTORD -v"
         exit 1
index 1a343cb..a1e5846 100755 (executable)
@@ -2,15 +2,14 @@
 . ${SET_DEFAULT_CONF}
 
 #test l7directord config file
-RET=`$L7DIRECTORD --version`
+RET=`$L7DIRECTORD --version | grep -A 1 "^l7directord, version [0-9]*\.[0-9]*\.[0-9]*" | sed -e 1d | grep "^Copyright (C) 20[0-9][0-9] NTT COMWARE CORPORATION"`
 if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD --version"
         exit 1
 fi
-EXPECT="l7directord, version 3.0.0-0
-Copyright (C) 2009 NTT COMWARE CORPORATION"
-if [ "$RET" != "$EXPECT" ]
+
+if [ -z "$RET" ]
 then
         echo "Test failed: $L7DIRECTORD --version"
         exit 1
diff --git a/test/script/l7directord/l7directord-1-2-49-4.sh b/test/script/l7directord/l7directord-1-2-49-4.sh
deleted file mode 100755 (executable)
index 15728ef..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-. ${SET_DEFAULT_CONF}
-
-#test l7directord config file
-RET=`$INIT_L7DIRECTORD version`
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $INIT_L7DIRECTORD version"
-        exit 1
-fi
-EXPECT="l7directord, version 3.0.0-0
-Copyright (C) 2009 NTT COMWARE CORPORATION"
-if [ "$RET" != "$EXPECT" ]
-then
-        echo "Test failed: $INIT_L7DIRECTORD version"
-        exit 1
-fi
-
-exit 0
-
index 820419f..69f36d1 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 . ${SET_DEFAULT_CONF}
-\cp ./materials/l7directord-43-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
+\cp ./materials/l7directord-1-3-9-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
 
 # Start l7vsd
 $L7VSD
index de255bb..0cb590e 100755 (executable)
@@ -54,7 +54,7 @@ do
        TIME2=`date -d "$TMP" +'%s'`
        if [ -n "$TIME1" ]
        then
-               if [ $((TIME1+5)) -ne $((TIME2)) ]
+               if [ $((TIME1+5)) -gt $((TIME2)) ]
                then
                        echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord-4-1-1-1-access.log"
                        exit 1
index 54aac6c..816ea64 100755 (executable)
@@ -54,7 +54,7 @@ do
        TIME2=`date -d "$TMP" +'%s'`
        if [ -n "$TIME1" ]
        then
-               if [ $((TIME1+3)) -ne $((TIME2)) ]
+               if [ $((TIME1+3)) -gt $((TIME2)) ]
                then
                        echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord-4-1-1-2-access.log"
                        exit 1
index 415918d..ab293eb 100755 (executable)
@@ -54,7 +54,7 @@ do
        TIME2=`date -d "$TMP" +'%s'`
        if [ -n "$TIME1" ]
        then
-               if [ $((TIME1+10)) -ne $((TIME2)) ]
+               if [ $((TIME1+10)) -gt $((TIME2)) ]
                then
                        echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord-4-1-2-access.log"
                        exit 1
index 4b5993c..0a7efd2 100755 (executable)
@@ -46,7 +46,7 @@ do
                # checktimeout  3
                #               ||
                 #               5
-               if [ $((TIME1+5)) -ne $((TIME2)) ]
+               if [ $((TIME1+5)) -gt $((TIME2)) ]
                then
                        echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
                        exit 1
index b981307..2ab19a4 100755 (executable)
@@ -46,7 +46,7 @@ do
                # checktimeout  3
                #               ||
                 #               6
-               if [ $((TIME1+6)) -ne $((TIME2)) ]
+               if [ $((TIME1+6)) -gt $((TIME2)) ]
                then
                        echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
                        exit 1
index 7d177cf..ae30b1b 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 . ${SET_DEFAULT_CONF}
 
-\cp -p ./materials/l7directord-5-2-24-realdowncallback.sh ${L7DIRECTORD_CONF_DIR}/realdowncallback.sh
+\cp -p ./materials/l7directord-5-2-24-callback.sh ${L7DIRECTORD_CONF_DIR}/realdowncallback.sh
 sed "s|XXX|${L7DIRECTORD_CONF_DIR}/realdowncallback.sh|g" ./materials/l7directord-5-2-24-down-l7directord.cf > ${L7DIRECTORD_CONF_DIR}/l7directord.cf
 
 #Run http server
@@ -34,8 +34,8 @@ then
 fi
 sleep 1
 stop_lighttpd $RealServer1
-sleep 11
-RET=`cat ${L7VS_LOG_DIR}/realdowncallbacktest`
+sleep 20
+RET=`cat ${L7VS_LOG_DIR}/callbacktest`
 EXPECT="callback is executed."
 if [ "$RET" != "$EXPECT" ]
 then
index a3e463a..17f5f50 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 . ${SET_DEFAULT_CONF}
 
-\cp -p ./materials/l7directord-5-2-24-realrecovercallback.sh ${L7DIRECTORD_CONF_DIR}/realrecovercallback.sh
+\cp -p ./materials/l7directord-5-2-24-callback.sh ${L7DIRECTORD_CONF_DIR}/realrecovercallback.sh
 sed "s|XXX|${L7DIRECTORD_CONF_DIR}/realrecovercallback.sh|g" ./materials/l7directord-5-2-24-recover-l7directord.cf > ${L7DIRECTORD_CONF_DIR}/l7directord.cf
 
 #Run http server
@@ -34,10 +34,10 @@ then
 fi
 sleep 1
 stop_lighttpd $RealServer1
-sleep 10
+sleep 20
 start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT
-sleep 11
-RET=`cat ${L7VS_LOG_DIR}/realrecovercallbacktest`
+sleep 20
+RET=`cat ${L7VS_LOG_DIR}/callbacktest`
 EXPECT="callback is executed."
 if [ "$RET" != "$EXPECT" ]
 then
index 9de2038..d160ffc 100755 (executable)
@@ -146,7 +146,7 @@ fi
 
 RET=`cat ${L7VS_LOG_DIR}/l7directord.log | egrep "\[WRN1102\] Service check NG. HTTP response is not ok. Response status line is .500 Can't connect to 127.0.0.1:50002" | wc -l`
 # checkcount 3
-if [ $RET -ne 3 ]
+if [ $RET -gt 3 ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
         exit 1
@@ -160,7 +160,7 @@ do
         if [ -n "$TIME1" ]
         then
                 # retryinterval 1
-                if [ $((TIME1+1)) -ne $((TIME2)) ]
+                if [ $((TIME1+1)) -gt $((TIME2)) ]
                 then
                         echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
                         exit 1
@@ -186,7 +186,7 @@ do
         if [ -n "$TIME1" ]
         then
                # checkinterval 5
-                if [ $((TIME1+5)) -ne $((TIME2)) ]
+                if [ $((TIME1+5)) -gt $((TIME2)) ]
                 then
                         echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord-5-2-26-real1a-access.log"
                         exit 1
@@ -298,7 +298,7 @@ do
         if [ -n "$TIME1" ]
         then
                 # retryinterval 3
-                if [ $((TIME1+3)) -ne $((TIME2)) ]
+                if [ $((TIME1+3)) -gt $((TIME2)) ]
                 then
                         echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord.log"
                         exit 1
@@ -324,7 +324,7 @@ do
         if [ -n "$TIME1" ]
         then
                # checkinterval 1
-                if [ $((TIME1+1)) -ne $((TIME2)) ]
+                if [ $((TIME1+1)) -gt $((TIME2)) ]
                 then
                         echo "Test failed: cat ${L7VS_LOG_DIR}/l7directord-5-2-26-real1b-access.log"
                         exit 1
diff --git a/test/script/l7directord/l7directord-5-2-4-4.sh b/test/script/l7directord/l7directord-5-2-4-4.sh
deleted file mode 100755 (executable)
index 522630b..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-. ${SET_DEFAULT_CONF}
-sed 's/XXX/.\/etc\/ha.d\/conf\/no_exist/g' ./materials/l7directord-5-2-4-l7directord.cf > ${L7DIRECTORD_CONF_DIR}/l7directord.cf
-
-#Start l7vsd
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-#Start l7directord
-RET=`$L7DIRECTORD start 2>&1`
-if [ $? -eq 0 ]
-then
-        echo "Test failed: $L7DIRECTORD start"
-        exit 1
-fi
-EXPECT="Configuration error. Reading file \`/etc/ha.d/conf/l7directord.cf' at line 27: File not found or cannot execute \`callback         = ./etc/ha.d/conf/no_exist'."
-if [ "$RET" != "$EXPECT" ]
-then
-        echo "Test failed: $L7DIRECTORD start"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7directord/l7directord-5-2-4-5.sh b/test/script/l7directord/l7directord-5-2-4-5.sh
deleted file mode 100755 (executable)
index ced9372..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-. ${SET_DEFAULT_CONF}
-
-\cp -p ./materials/l7directord-5-2-4-no_exec_callback.sh ${L7DIRECTORD_CONF_DIR}/no_exec_callback.sh
-sed "s|XXX|.${L7DIRECTORD_CONF_DIR}/no_exec_callback.sh|g" ./materials/l7directord-5-2-4-l7directord.cf > ${L7DIRECTORD_CONF_DIR}/l7directord.cf
-
-#Start l7vsd
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-#Start l7directord
-RET=`$L7DIRECTORD start 2>&1`
-if [ $? -eq 0 ]
-then
-        echo "Test failed: $L7DIRECTORD start"
-        exit 1
-fi
-EXPECT="Configuration error. Reading file \`/etc/ha.d/conf/l7directord.cf' at line 27: File not found or cannot execute \`callback         = ./etc/ha.d/conf/no_exec_callback.sh'."
-if [ "$RET" != "$EXPECT" ]
-then
-        echo "Test failed: $L7DIRECTORD start"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7directord/l7directord-5-2-4-6.sh b/test/script/l7directord/l7directord-5-2-4-6.sh
deleted file mode 100755 (executable)
index e8640f5..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-. ${SET_DEFAULT_CONF}
-
-\cp -p ./materials/l7directord-5-2-4-callback.sh ${L7DIRECTORD_CONF_DIR}/callback.sh
-sed "s|XXX|../../../../../../../..${L7DIRECTORD_CONF_DIR}/callback.sh|g" ./materials/l7directord-5-2-4-l7directord.cf > ${L7DIRECTORD_CONF_DIR}/l7directord.cf
-
-#Start l7vsd
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-#Start l7directord
-$L7DIRECTORD start
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7DIRECTORD start"
-        exit 1
-fi
-sleep 1
-echo "fallback = 127.0.0.1:80" >> ${L7DIRECTORD_CONF_DIR}/l7directord.cf
-sleep 10
-
-RET=`cat ${L7VS_LOG_DIR}/callbacktest`
-EXPECT="callback is executed."
-if [ "$RET" != "$EXPECT" ]
-then
-        echo "Test failed: cat ${L7VS_LOG_DIR}/callbacktest"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7directord/l7directord-5-2-5-3.sh b/test/script/l7directord/l7directord-5-2-5-3.sh
deleted file mode 100755 (executable)
index 7a2e8ee..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-. ${SET_DEFAULT_CONF}
-sed 's/XXX/.\/etc\/ha.d\/conf\/no_exist/g' ./materials/l7directord-5-2-5-l7directord.cf > ${L7DIRECTORD_CONF_DIR}/l7directord.cf
-
-#Start l7vsd
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-#Start l7directord
-RET=`$L7DIRECTORD start 2>&1`
-if [ $? -eq 0 ]
-then
-        echo "Test failed: $L7DIRECTORD start"
-        exit 1
-fi
-
-EXPECT="Configuration error. Reading file \`/etc/ha.d/conf/l7directord.cf' at line 29: File not found \`execute = ./etc/ha.d/conf/no_exist'."
-if [ "$RET" != "$EXPECT" ]
-then
-        echo "Test failed: $L7DIRECTORD start"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7directord/l7directord-5-2-5-4.sh b/test/script/l7directord/l7directord-5-2-5-4.sh
deleted file mode 100755 (executable)
index b3ce5b8..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-. ${SET_DEFAULT_CONF}
-
-\cp -p ./materials/l7directord-5-2-5-execute.cf ${L7DIRECTORD_CONF_DIR}/execute.cf
-sed "s|XXX|../../../../..${L7DIRECTORD_CONF_DIR}/execute.cf|g" ./materials/l7directord-5-2-5-l7directord.cf > ${L7DIRECTORD_CONF_DIR}/l7directord.cf
-
-#Run http server
-FallbackServer=FallbackServer
-FallbackServer_ADDR=127.0.0.1
-FallbackServer_PORT=50001
-start_lighttpd -s $FallbackServer -a $FallbackServer_ADDR -p $FallbackServer_PORT
-
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd FallbackServer"
-        exit 1
-fi
-
-#Start l7vsd
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-#Start l7directord
-$L7DIRECTORD start
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7DIRECTORD start"
-        exit 1
-fi
-sleep 1
-
-#Connect
-RET=`$WGET -t 1 -qO- http://127.0.0.1:40001/`
-if [ "${RET}" != "${FallbackServer}" ]
-then
-        echo "Test failed: $WGET -t 1 -qO- http://127.0.0.1:40001/"
-        exit 1
-fi
-
-exit 0
-
index b7180cd..9bc8a60 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 . ${SET_DEFAULT_CONF}
-\cp ./materials/l7directord-5-2-9-l7directord.cf > ${L7DIRECTORD_CONF_DIR}/l7directord.cf
+\cp -f ./materials/l7directord-5-2-9-l7directord.cf  ${L7DIRECTORD_CONF_DIR}/l7directord.cf
 
 #Run http server
 RealServer1=RealServer1
@@ -62,8 +62,14 @@ fi
 sleep 10
 
 RET=`$L7VSADM -l -n`
-EXPECT=""
-echo "$RET"
+EXPECT="Layer-7 Virtual Server version 3.0.0
+Prot LocalAddress:Port ProtoMod Scheduler
+  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
+TCP 127.0.0.1:40001 sessionless rr
+  -> 127.0.0.1:50001              Masq    1      0          0         
+  -> 127.0.0.1:50002              Masq    1      0          0         
+  -> 127.0.0.1:50003              Masq    1      0          0         
+  -> 127.0.0.1:50004              Masq    1      0          0         "
 if [ "$RET" != "$EXPECT" ]
 then
         echo "Test failed: $L7VSADM -l -n"
diff --git a/test/script/l7directord/l7directord-5-3-2.sh b/test/script/l7directord/l7directord-5-3-2.sh
new file mode 100755 (executable)
index 0000000..d4ecc5b
--- /dev/null
@@ -0,0 +1,125 @@
+#!/bin/bash
+. ${SET_DEFAULT_CONF}
+\cp ./materials/l7directord-5-3-2-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
+
+# Start l7vsd
+$L7VSD
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $L7VSD"
+        exit 1
+fi
+usleep 100000
+
+# Start l7directord
+$INIT_L7DIRECTORD start 
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $INIT_L7DIRECTORD start"
+        exit 1
+fi
+sleep 10
+
+RET=`$L7VSADM -V -n`
+EXPECT="Layer-7 Virtual Server version 3.0.0
+L7vsd Log Level:
+Category                       Level
+l7vsd_network                  warn
+l7vsd_network_qos              warn
+l7vsd_network_bandwidth        warn
+l7vsd_network_num_connection   warn
+l7vsd_network_access           warn
+l7vsd_mainthread               warn
+l7vsd_virtualservice           warn
+l7vsd_virtualservice_thread    warn
+l7vsd_session                  warn
+l7vsd_session_thread           warn
+l7vsd_realserver               warn
+l7vsd_sorryserver              warn
+l7vsd_module                   warn
+l7vsd_replication              warn
+l7vsd_replication_sendthread   warn
+l7vsd_parameter                warn
+l7vsd_logger                   warn
+l7vsd_command                  warn
+l7vsd_start_stop               warn
+l7vsd_system                   warn
+l7vsd_system_memory            warn
+l7vsd_system_endpoint          warn
+l7vsd_system_signal            warn
+l7vsd_system_environment       warn
+l7vsd_snmpagent                info
+l7vsd_protocol                 warn
+l7vsd_schedule                 warn
+
+Replication Mode:
+SINGLE
+
+SNMPAgent:
+Agent Status                   inactive
+log trap status                none
+log trap level                 none
+cache update interval          none
+start date                     none
+last request date              none
+last trap date                 none
+total GET requests             none
+total SET requests             none
+total trap counts              none
+
+Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
+  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
+TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
+  Bypass Settings:
+    Sorry Server                  127.0.0.1:50001 Masq
+    Max Connection                10
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               none
+  Logging Settings:
+    Access Log                    off
+    Access Log File               none
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              disable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 80.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 40.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0
+TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
+  Bypass Settings:
+    Sorry Server                  127.0.0.1:50002 Tproxy
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               none
+  Logging Settings:
+    Access Log                    off
+    Access Log File               none
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              disable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0"
+
+if [ "$RET" != "$EXPECT" ]
+then
+        echo "Test failed: $L7VSADM -V -n"
+        exit 1
+fi
+
+exit 0
diff --git a/test/script/l7directord/l7directord-5-3-3.sh b/test/script/l7directord/l7directord-5-3-3.sh
new file mode 100755 (executable)
index 0000000..9ec70e1
--- /dev/null
@@ -0,0 +1,153 @@
+#!/bin/bash
+. ${SET_DEFAULT_CONF}
+\cp ./materials/l7directord-5-3-3-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
+
+# Start l7vsd
+$L7VSD
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $L7VSD"
+        exit 1
+fi
+usleep 100000
+
+# Start l7directord
+$INIT_L7DIRECTORD start 
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $INIT_L7DIRECTORD start"
+        exit 1
+fi
+sleep 10
+
+RET=`$L7VSADM -V -n`
+EXPECT="Layer-7 Virtual Server version 3.0.0
+L7vsd Log Level:
+Category                       Level
+l7vsd_network                  warn
+l7vsd_network_qos              warn
+l7vsd_network_bandwidth        warn
+l7vsd_network_num_connection   warn
+l7vsd_network_access           warn
+l7vsd_mainthread               warn
+l7vsd_virtualservice           warn
+l7vsd_virtualservice_thread    warn
+l7vsd_session                  warn
+l7vsd_session_thread           warn
+l7vsd_realserver               warn
+l7vsd_sorryserver              warn
+l7vsd_module                   warn
+l7vsd_replication              warn
+l7vsd_replication_sendthread   warn
+l7vsd_parameter                warn
+l7vsd_logger                   warn
+l7vsd_command                  warn
+l7vsd_start_stop               warn
+l7vsd_system                   warn
+l7vsd_system_memory            warn
+l7vsd_system_endpoint          warn
+l7vsd_system_signal            warn
+l7vsd_system_environment       warn
+l7vsd_snmpagent                info
+l7vsd_protocol                 warn
+l7vsd_schedule                 warn
+
+Replication Mode:
+SINGLE
+
+SNMPAgent:
+Agent Status                   inactive
+log trap status                none
+log trap level                 none
+cache update interval          none
+start date                     none
+last request date              none
+last trap date                 none
+total GET requests             none
+total SET requests             none
+total trap counts              none
+
+Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
+  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
+TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
+  -> 127.0.0.1:50001              Masq    1      0          0         
+  -> 127.0.0.1:50002              Masq    0      0          0         
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               none
+  Logging Settings:
+    Access Log                    off
+    Access Log File               none
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              disable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0
+TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
+  -> 127.0.0.1:50001              Masq    1      0          0         
+  -> 127.0.0.1:50002              Tproxy  1      0          0         
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               none
+  Logging Settings:
+    Access Log                    off
+    Access Log File               none
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              disable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0
+TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
+  -> 127.0.0.1:50001              Masq    5      0          0         
+  -> 127.0.0.1:50002              Tproxy  10     0          0         
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               none
+  Logging Settings:
+    Access Log                    off
+    Access Log File               none
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              disable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0"
+if [ "$RET" != "$EXPECT" ]
+then
+        echo "Test failed: $L7VSADM -V -n"
+        exit 1
+fi
+
+exit 0
diff --git a/test/script/l7directord/l7directord-5-3-4.sh b/test/script/l7directord/l7directord-5-3-4.sh
new file mode 100755 (executable)
index 0000000..5291f2a
--- /dev/null
@@ -0,0 +1,178 @@
+#!/bin/bash
+. ${SET_DEFAULT_CONF}
+\cp ./materials/l7directord-5-3-4-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
+
+# Start l7vsd
+$L7VSD
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $L7VSD"
+        exit 1
+fi
+usleep 100000
+
+# Start l7directord
+$INIT_L7DIRECTORD start 
+if [ $? -ne 0 ]
+then
+        echo "Test failed: $INIT_L7DIRECTORD start"
+        exit 1
+fi
+sleep 15
+
+RET=`$L7VSADM -V -n`
+EXPECT="Layer-7 Virtual Server version 3.0.0
+L7vsd Log Level:
+Category                       Level
+l7vsd_network                  warn
+l7vsd_network_qos              warn
+l7vsd_network_bandwidth        warn
+l7vsd_network_num_connection   warn
+l7vsd_network_access           warn
+l7vsd_mainthread               warn
+l7vsd_virtualservice           warn
+l7vsd_virtualservice_thread    warn
+l7vsd_session                  warn
+l7vsd_session_thread           warn
+l7vsd_realserver               warn
+l7vsd_sorryserver              warn
+l7vsd_module                   warn
+l7vsd_replication              warn
+l7vsd_replication_sendthread   warn
+l7vsd_parameter                warn
+l7vsd_logger                   warn
+l7vsd_command                  warn
+l7vsd_start_stop               warn
+l7vsd_system                   warn
+l7vsd_system_memory            warn
+l7vsd_system_endpoint          warn
+l7vsd_system_signal            warn
+l7vsd_system_environment       warn
+l7vsd_snmpagent                info
+l7vsd_protocol                 warn
+l7vsd_schedule                 warn
+
+Replication Mode:
+SINGLE
+
+SNMPAgent:
+Agent Status                   inactive
+log trap status                none
+log trap level                 none
+cache update interval          none
+start date                     none
+last request date              none
+last trap date                 none
+total GET requests             none
+total SET requests             none
+total trap counts              none
+
+Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
+  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
+TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
+  -> 127.0.0.10:50002             Masq    0      0          0         
+  -> 127.0.0.1:50001              Masq    1      0          0         
+  -> 127.0.0.2:50001              Masq    1      0          0         
+  -> 127.0.0.3:50001              Masq    1      0          0         
+  -> 127.0.0.4:50001              Masq    1      0          0         
+  -> 127.0.0.5:50001              Masq    1      0          0         
+  -> 127.0.0.6:50002              Masq    0      0          0         
+  -> 127.0.0.7:50002              Masq    0      0          0         
+  -> 127.0.0.8:50002              Masq    0      0          0         
+  -> 127.0.0.9:50002              Masq    0      0          0         
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               none
+  Logging Settings:
+    Access Log                    off
+    Access Log File               none
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              disable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0
+TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/' --statistic 0
+  -> 127.0.0.10:50002             Tproxy  1      0          0         
+  -> 127.0.0.1:50001              Masq    1      0          0         
+  -> 127.0.0.2:50001              Masq    1      0          0         
+  -> 127.0.0.3:50001              Masq    1      0          0         
+  -> 127.0.0.4:50001              Masq    1      0          0         
+  -> 127.0.0.5:50001              Masq    1      0          0         
+  -> 127.0.0.6:50002              Tproxy  1      0          0         
+  -> 127.0.0.7:50002              Tproxy  1      0          0         
+  -> 127.0.0.8:50002              Tproxy  1      0          0         
+  -> 127.0.0.9:50002              Tproxy  1      0          0         
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               none
+  Logging Settings:
+    Access Log                    off
+    Access Log File               none
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              disable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0
+TCP 127.0.0.1:40003 sessionless rr --sorry-uri '/' --statistic 0
+  -> 127.0.0.10:50002             Tproxy  10     0          0         
+  -> 127.0.0.1:50001              Masq    5      0          0         
+  -> 127.0.0.2:50001              Masq    5      0          0         
+  -> 127.0.0.3:50001              Masq    5      0          0         
+  -> 127.0.0.4:50001              Masq    5      0          0         
+  -> 127.0.0.5:50001              Masq    5      0          0         
+  -> 127.0.0.6:50002              Tproxy  10     0          0         
+  -> 127.0.0.7:50002              Tproxy  10     0          0         
+  -> 127.0.0.8:50002              Tproxy  10     0          0         
+  -> 127.0.0.9:50002              Tproxy  10     0          0         
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               none
+  Logging Settings:
+    Access Log                    off
+    Access Log File               none
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              disable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 0.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0"
+
+if [ "$RET" != "$EXPECT" ]
+then
+        echo "Test failed: $L7VSADM -V -n"
+        exit 1
+fi
+
+exit 0
index cb5ee1e..7ccaaee 100644 (file)
@@ -133,10 +133,10 @@ fallback   =     "localhost6:80"
 fallback    =       "localhost6:http"
 
 callback=/bin/sh
-callback='/bin/csh'
+callback='/bin/sh'
 callback="/bin/bash"
 callback  =  /bin/sh
-callback  =     '/bin/csh'
+callback  =     '/bin/sh'
 callback  =       "/bin/bash"
 
 execute=/etc/hosts
@@ -146,6 +146,11 @@ execute  =  /etc/hosts
 execute  =    '/etc/passwd'
 execute  =      "/etc/group"
 
+supervised
+supervised = foo
+supervised   = '0'
+supervised     = no
+
 logfile=/tmp/logfile
 logfile=local0
 logfile='/tmp/logfile'
@@ -159,8 +164,4 @@ logfile   =      'local0'
 logfile     =   "/tmp/logfile"
 logfile     =   "local0"
 
-supervised
-supervised = foo
-supervised   = '0'
-supervised     = no
 
index 40e34a3..e9dc823 100644 (file)
@@ -16,9 +16,10 @@ execute=/etc/hosts
 execute='/etc/passwd'
 execute="/etc/group"
 
+supervised
+
 logfile     =   "local0"
 
-supervised
 
 virtual=1.1.1.1:80
     real=localhost
index 40e34a3..e9dc823 100644 (file)
@@ -16,9 +16,10 @@ execute=/etc/hosts
 execute='/etc/passwd'
 execute="/etc/group"
 
+supervised
+
 logfile     =   "local0"
 
-supervised
 
 virtual=1.1.1.1:80
     real=localhost
diff --git a/test/script/l7directord/materials/l7directord-1-3-11-l7directord.cf b/test/script/l7directord/materials/l7directord-1-3-11-l7directord.cf
new file mode 100644 (file)
index 0000000..597daa6
--- /dev/null
@@ -0,0 +1,16 @@
+virtual=127.0.0.1:50000
+    real=127.0.0.1:50001 1
+    real=127.0.0.1:50002 2
+    real=127.0.0.1:50003 3
+    real=127.0.0.1:50004 4
+    real=127.0.0.1:50005 5
+    checktype=ping
+
+virtual=[::1]:50100
+    real=[::1]:50101 1
+    real=[::1]:50102 2
+    real=[::1]:50103 3
+    real=[::1]:50104 4
+    real=[::1]:50105 5
+    checktype=ping
+
diff --git a/test/script/l7directord/materials/l7directord-5-2-24-callback.sh b/test/script/l7directord/materials/l7directord-5-2-24-callback.sh
new file mode 100755 (executable)
index 0000000..e40bba4
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "callback is executed." > /var/log/l7vs/callbacktest
diff --git a/test/script/l7directord/materials/l7directord-5-2-24-no_exec_callback.sh b/test/script/l7directord/materials/l7directord-5-2-24-no_exec_callback.sh
new file mode 100644 (file)
index 0000000..5df1598
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "callback is executed. " > /var/log/l7vs/callbacktest
diff --git a/test/script/l7directord/materials/l7directord-5-3-2-l7directord.cf b/test/script/l7directord/materials/l7directord-5-3-2-l7directord.cf
new file mode 100644 (file)
index 0000000..098c800
--- /dev/null
@@ -0,0 +1,11 @@
+virtual=127.0.0.1:40001
+    sorryserver=127.0.0.1:50001
+    maxconn=10
+    qosup=10M
+    qosdown=5M
+virtual=127.0.0.1:40002
+    sorryserver=127.0.0.1:50002 tproxy
+    maxconn=0
+    qosup=0
+    qosdown=0
+
diff --git a/test/script/l7directord/materials/l7directord-5-3-3-l7directord.cf b/test/script/l7directord/materials/l7directord-5-3-3-l7directord.cf
new file mode 100644 (file)
index 0000000..0dfe1c3
--- /dev/null
@@ -0,0 +1,10 @@
+virtual=127.0.0.1:40001
+    real=127.0.0.1:50001
+    real=127.0.0.1:50002 0
+virtual=127.0.0.1:40002
+    real=127.0.0.1:50001 masq
+    real=127.0.0.1:50002 tproxy
+virtual=127.0.0.1:40003
+    real=127.0.0.1:50001 masq 5
+    real=127.0.0.1:50002 tproxy 10
+
diff --git a/test/script/l7directord/materials/l7directord-5-3-4-l7directord.cf b/test/script/l7directord/materials/l7directord-5-3-4-l7directord.cf
new file mode 100644 (file)
index 0000000..cde66da
--- /dev/null
@@ -0,0 +1,11 @@
+virtual=127.0.0.1:40001
+    real=127.0.0.1->127.0.0.5:50001
+    real=127.0.0.6->127.0.0.10:50002 0
+virtual=127.0.0.1:40002
+    real=127.0.0.1->127.0.0.5:50001 masq
+    real=127.0.0.6->127.0.0.10:50002 tproxy
+virtual=127.0.0.1:40003
+    real=127.0.0.1->127.0.0.5:50001 masq 5
+    real=127.0.0.6->127.0.0.10:50002 tproxy 10
+
+
index 17d9dfb..b5a685e 100644 (file)
@@ -234,11 +234,13 @@ S\bSY\bYN\bNT\bTA\bAX\bX
            the qosdown limit.  K\bK(kilo), M\bM(mega) and G\bG(giga) unit are
            available.
 
-       s\bso\bor\brr\bry\bys\bse\ber\brv\bve\ber\br =\b=_\bi_\bp_\b__\ba_\bd_\bd_\br_\be_\bs_\bs_\b|_\bh_\bo_\bs_\bt_\bn_\ba_\bm_\be_\b[_\b:_\bp_\bo_\br_\bt_\bn_\bu_\bm_\bb_\be_\br_\b|_\bs_\be_\br_\bv_\bi_\bc_\be_\bn_\ba_\bm_\be_\b]
+       s\bso\bor\brr\bry\bys\bse\ber\brv\bve\ber\br =\b=_\bi_\bp_\b__\ba_\bd_\bd_\br_\be_\bs_\bs_\b|_\bh_\bo_\bs_\bt_\bn_\ba_\bm_\be_\b[_\b:_\bp_\bo_\br_\bt_\bn_\bu_\bm_\bb_\be_\br_\b|_\bs_\be_\br_\bv_\bi_\bc_\be_\bn_\ba_\bm_\be_\b] [m\bma\bas\bsq\bq|t\btp\bpr\bro\box\bxy\by]
            Defines a sorry server by IP-address (or hostname) and port (or
-           servicename). Firewall-mark settings cannot be set.  If the number
-           of requests to the virtual service cross the maxconn limit, the
-           requests would be redirected to the sorry server.
+           servicename). The second argument defines the forwarding mechanism,
+           it must be m\bma\bas\bsq\bq or t\btp\bpr\bro\box\bxy\by.  Firewall-mark settings cannot be set.
+           If the number of requests to the virtual service cross the maxconn
+           limit, or no available real server exists, then the requests would
+           be redirected to the sorry server.
 
        c\bch\bhe\bec\bck\bkt\bty\byp\bpe\be =\b= n\bne\beg\bgo\bot\bti\bia\bat\bte\be|c\bco\bon\bnn\bne\bec\bct\bt|_\bN|p\bpi\bin\bng\bg|c\bcu\bus\bst\bto\bom\bm|o\bof\bff\bf|o\bon\bn
            Type of check to perform. Negotiate sends a request and matches a
@@ -448,4 +450,4 @@ A\bAU\bUT\bTH\bHO\bOR\bRS\bS
 
 
 
-perl v5.10.1                      2010-09-10                    L7DIRECTORD(1)
+perl v5.10.1                      2010-10-07                    L7DIRECTORD(1)