OSDN Git Service

bug fix
author6638678 <6638678@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Thu, 7 Oct 2010 10:41:26 +0000 (10:41 +0000)
committer6638678 <6638678@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Thu, 7 Oct 2010 10:41:26 +0000 (10:41 +0000)
git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10344 1ed66053-1c2d-0410-8867-f7571e6e31d3

14 files changed:
test/script/l7vsadm/l7vsadm-1-2-4.sh
test/script/l7vsadm/l7vsadm-3-2-1.sh [deleted file]
test/script/l7vsadm/l7vsadm-3-2-2.sh [deleted file]
test/script/l7vsadm/l7vsadm-3-2-3.sh [deleted file]
test/script/l7vsadm/l7vsadm-3-2-4.sh [deleted file]
test/script/l7vsadm/l7vsadm-3-2-7.sh [deleted file]
test/script/l7vsadm/l7vsadm-3-2-8.sh [deleted file]
test/script/l7vsadm/l7vsadm-3-2-9.sh [deleted file]
test/script/l7vsadm/l7vsadm-4-1-17.sh
test/script/l7vsadm/l7vsadm-4-1-2.sh
test/script/l7vsadm/l7vsadm-4-1-36-1.sh
test/script/session/session-43.sh
test/script/svn-commit.tmp [new file with mode: 0644]
test/script/virtualservice/RemoteAddress:Port [new file with mode: 0644]

index 1cad2c1..711ae1f 100755 (executable)
@@ -23,7 +23,7 @@ then
         exit 1
 fi
 
-if [ $((TIME1+10)) -ne $TIME2 ]
+if [ $((TIME1+10)) -gt $TIME2 ]
 then
         echo "Test failed: flock -n -x $L7VSADM l7vsadm"
         exit 1
diff --git a/test/script/l7vsadm/l7vsadm-3-2-1.sh b/test/script/l7vsadm/l7vsadm-3-2-1.sh
deleted file mode 100755 (executable)
index 5f581b4..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/bash
-
-. ${SET_DEFAULT_CONF}
-
-#Run http server
-RealServer1=RealServer1
-RealServer1_ADDR=127.0.0.1
-RealServer1_PORT=50001
-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer1"
-        exit 1
-fi
-
-RealServer2=RealServer2
-RealServer2_ADDR=127.0.0.1
-RealServer2_PORT=50002
-start_lighttpd -s $RealServer2 -a $RealServer2_ADDR -p $RealServer2_PORT
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer2"
-        exit 1
-fi
-
-#Add Service
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-$L7VSADM -A -t localhost4:40001 -m sessionless
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost4:40001 -m sessionless"
-        exit 1
-fi
-
-$L7VSADM -a -t localhost4:40001 -m sessionless -r localhost4:${RealServer1_PORT} -w 3
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost4:40001 -m sessionless -r localhost4:${RealServer1_PORT} -w 3"
-        exit 1
-fi
-
-$L7VSADM -a -t localhost4:40001 -m sessionless -r localhost4:${RealServer2_PORT} -w 0
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost4:40001 -m sessionless -r localhost4:${RealServer2_PORT} -w 0"
-        exit 1
-fi
-
-
-RET=`$L7VSADM -V`
-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_snmpbridge               warn
-l7vsd_protocol                 warn
-l7vsd_schedule                 warn
-
-Replication Mode:
-SINGLE
-
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
-
-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
-  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP localhost:40001 sessionless rr --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  -> localhost:50001              Masq    3      0          0         
-  -> localhost:50002              Masq    0      0          0         "
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -V"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7vsadm/l7vsadm-3-2-2.sh b/test/script/l7vsadm/l7vsadm-3-2-2.sh
deleted file mode 100755 (executable)
index 2705cfa..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/bash
-
-. ${SET_DEFAULT_CONF}
-
-#Run http server
-RealServer1=RealServer1
-RealServer1_ADDR=[::1]
-RealServer1_PORT=50001
-start_lighttpd -s $RealServer1 -a $RealServer1_ADDR -p $RealServer1_PORT -i
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer1"
-        exit 1
-fi
-
-RealServer2=RealServer2
-RealServer2_ADDR=[::1]
-RealServer2_PORT=50002
-start_lighttpd -s $RealServer2 -a $RealServer2_ADDR -p $RealServer2_PORT -i
-if [ $? -ne 0 ]
-then
-        echo "Test failed: start_lighttpd RealServer2"
-        exit 1
-fi
-
-#Add Service
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-$L7VSADM -A -t localhost6:40001 -m sessionless
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost6:40001 -m sessionless"
-        exit 1
-fi
-
-$L7VSADM -a -t localhost6:40001 -m sessionless -r localhost6:${RealServer1_PORT} -w 3
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost6:40001 -m sessionless -r localhost6:${RealServer1_PORT} -w 3"
-        exit 1
-fi
-
-$L7VSADM -a -t localhost6:40001 -m sessionless -r localhost6:${RealServer2_PORT} -w 0
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -a -t localhost6:40001 -m sessionless -r localhost6:${RealServer2_PORT} -w 0"
-        exit 1
-fi
-
-
-RET=`$L7VSADM -V`
-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_snmpbridge               warn
-l7vsd_protocol                 warn
-l7vsd_schedule                 warn
-
-Replication Mode:
-SINGLE
-
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
-
-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
-  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP localhost:40001 sessionless rr --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  -> localhost:50001              Masq    3      0          0         
-  -> localhost:50002              Masq    0      0          0         "
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -V"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7vsadm/l7vsadm-3-2-3.sh b/test/script/l7vsadm/l7vsadm-3-2-3.sh
deleted file mode 100755 (executable)
index 3ca62bd..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-
-. ${SET_DEFAULT_CONF}
-
-#Add Service
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-$L7VSADM -A -t localhost4:40001 -m sessionless
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost4:40001 -m sessionless"
-        exit 1
-fi
-
-
-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_snmpbridge               warn
-l7vsd_protocol                 warn
-l7vsd_schedule                 warn
-
-Replication Mode:
-SINGLE
-
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
-
-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
-  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -V -n"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7vsadm/l7vsadm-3-2-4.sh b/test/script/l7vsadm/l7vsadm-3-2-4.sh
deleted file mode 100755 (executable)
index c1312f5..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-
-. ${SET_DEFAULT_CONF}
-
-#Add Service
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-$L7VSADM -A -t localhost6:40001 -m sessionless
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t localhost6:40001 -m sessionless"
-        exit 1
-fi
-
-
-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_snmpbridge               warn
-l7vsd_protocol                 warn
-l7vsd_schedule                 warn
-
-Replication Mode:
-SINGLE
-
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
-
-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
-  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP [::1]:40001 sessionless rr --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -V -n"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7vsadm/l7vsadm-3-2-7.sh b/test/script/l7vsadm/l7vsadm-3-2-7.sh
deleted file mode 100755 (executable)
index 3919e49..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-. ${SET_DEFAULT_CONF}
-
-#Add Service
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-RET=`$L7VSADM -V`
-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_snmpbridge               warn
-l7vsd_protocol                 warn
-l7vsd_schedule                 warn
-
-Replication Mode:
-SINGLE
-
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
-
-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
-  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn"
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -V"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7vsadm/l7vsadm-3-2-8.sh b/test/script/l7vsadm/l7vsadm-3-2-8.sh
deleted file mode 100755 (executable)
index 96edd1f..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-
-. ${SET_DEFAULT_CONF}
-
-#Add Service
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-$L7VSADM -A -t 127.0.0.1:40001 -m sessionless
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sessionless"
-        exit 1
-fi
-
-
-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_snmpbridge               warn
-l7vsd_protocol                 warn
-l7vsd_schedule                 warn
-
-Replication Mode:
-SINGLE
-
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
-
-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
-  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -V -n"
-        exit 1
-fi
-
-exit 0
-
diff --git a/test/script/l7vsadm/l7vsadm-3-2-9.sh b/test/script/l7vsadm/l7vsadm-3-2-9.sh
deleted file mode 100755 (executable)
index 9ada37d..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-
-. ${SET_DEFAULT_CONF}
-
-#Add Service
-$L7VSD
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSD"
-        exit 1
-fi
-usleep 100000
-
-$L7VSADM -A -t [::1]:40001 -m sessionless
-if [ $? -ne 0 ]
-then
-        echo "Test failed: $L7VSADM -A -t [::1]:40001 -m sessionless"
-        exit 1
-fi
-
-
-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_snmpbridge               warn
-l7vsd_protocol                 warn
-l7vsd_schedule                 warn
-
-Replication Mode:
-SINGLE
-
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
-
-Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
-  -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP [::1]:40001 sessionless rr --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
-if [ "${RET}" != "${EXPECT}" ]
-then
-        echo "Test failed: $L7VSADM -V -n"
-        exit 1
-fi
-
-exit 0
-
index f0e6a59..7be087f 100755 (executable)
@@ -132,50 +132,50 @@ l7vsd_system_memory            warn
 l7vsd_system_endpoint          warn
 l7vsd_system_signal            warn
 l7vsd_system_environment       warn
-l7vsd_snmpbridge               warn
+l7vsd_snmpagent                info
 l7vsd_protocol                 warn
 l7vsd_schedule                 warn
 
 Replication Mode:
 SINGLE
 
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
+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
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP localhost:40001 ip rr --timeout 3600 --no-reschedule --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
+TCP localhost:40001 ip rr --timeout 3600 --no-reschedule --sorry-uri '/' --statistic 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
index 0d5a666..c6f9f4b 100755 (executable)
@@ -64,59 +64,74 @@ l7vsd_system_memory            warn
 l7vsd_system_endpoint          warn
 l7vsd_system_signal            warn
 l7vsd_system_environment       warn
-l7vsd_snmpbridge               warn
+l7vsd_snmpagent                info
 l7vsd_protocol                 warn
 l7vsd_schedule                 warn
 
 Replication Mode:
 SINGLE
 
-SNMPAgent Connection Status:
-non-connecting
-
-SNMPAgent Log Level:
-Category                       Level
-snmpagent_start_stop           warn
-snmpagent_manager_receive      warn
-snmpagent_manager_send         warn
-snmpagent_l7vsd_receive        warn
-snmpagent_l7vsd_send           warn
-snmpagent_logger               warn
-snmpagent_parameter            warn
-snmpagent_system               warn
-snmpagent_system_memory        warn
-snmpagent_system_endpoint      warn
-snmpagent_system_signal        warn
-snmpagent_system_environment   warn
+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
-     SorryAddress:Port Sorry_cc Sorry_flag
-     QoS-up   Throughput-up
-     QoS-down Throughput-down
-     SSL_config_file
-     Socket option
-     Access_log_flag
-     Access_log_file
-     Access_log_rotate option
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
-TCP localhost:40001 sessionless rr --sorry-uri '/'
-    localhost:50001(Tproxy) 1000 1
-    512 0
-    512 0
-    /etc/l7vs/sslproxy/sslproxy.target.cf
-    deferaccept
-    1
-    /var/log/l7vs/access_log
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-TCP localhost:40002 sessionless rr --sorry-uri '/'
-    localhost:50001(Masq) 1000 1
-    512 0
-    512 0
-    /etc/l7vs/sslproxy/sslproxy.target.cf
-    deferaccept
-    1
-    /var/log/l7vs/access_log
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
+TCP localhost:40001 sessionless rr --sorry-uri '/' --statistic 0
+  Bypass Settings:
+    Sorry Server                  localhost:50001 Tproxy
+    Max Connection                1000
+    Sorry Flag                    on
+  SSL Settings:
+    SSL Config File               /etc/l7vs/sslproxy/sslproxy.target.cf
+  Logging Settings:
+    Access Log                    on
+    Access Log File               deferaccept
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              enable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 0.004096 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.004096 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0
+TCP localhost:40002 sessionless rr --sorry-uri '/' --statistic 0
+  Bypass Settings:
+    Sorry Server                  localhost:50001 Masq
+    Max Connection                1000
+    Sorry Flag                    on
+  SSL Settings:
+    SSL Config File               /etc/l7vs/sslproxy/sslproxy.target.cf
+  Logging Settings:
+    Access Log                    on
+    Access Log File               deferaccept
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              enable
+    TCP_NODELAY                   disable
+    TCP_CORK                      disable
+    TCP_QUICKACK                  disable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 0.004096 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.004096 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0"
+
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: $L7VSADM -V -n"
index b962444..1d6dc7a 100755 (executable)
@@ -91,6 +91,8 @@ TCP 127.0.0.1:40001 ip rr --timeout 3600 --no-reschedule --sorry-uri '/' --stati
     HTTP Total Requests           0
     HTTP GET Requests             0
     HTTP POST Requests            0"
+echo "${RET}" > /tmp/a.txt
+echo "${EXPECT}" > /tmp/b.txt
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: $L7VSADM -V -n"
index b45f582..6aba3ac 100755 (executable)
@@ -112,6 +112,7 @@ TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
     HTTP Total Requests           0
     HTTP GET Requests             0
     HTTP POST Requests            0"
+echo "$RET"
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: l7vsadm -V -n"
diff --git a/test/script/svn-commit.tmp b/test/script/svn-commit.tmp
new file mode 100644 (file)
index 0000000..a9aca8c
--- /dev/null
@@ -0,0 +1,38 @@
+
+-- この行以下は無視されます --
+
+M    l7directord/l7directord-4-1-5-2.sh
+D    l7directord/l7directord-5-2-4-4.sh
+M    l7directord/l7directord-1-2-48-2.sh
+M    l7directord/l7directord-4-1-2.sh
+AM   l7directord/l7directord-5-3-2.sh
+D    l7directord/l7directord-5-2-5-3.sh
+M    l7directord/l7directord-5-2-9.sh
+M    l7directord/l7directord-1-2-49-1.sh
+D    l7directord/l7directord-5-2-4-5.sh
+M    l7directord/l7directord-5-2-26.sh
+M    l7directord/l7directord-5-2-24-6.sh
+AM   l7directord/l7directord-5-3-3.sh
+D    l7directord/l7directord-5-2-5-4.sh
+M    l7directord/l7directord-1-2-49-2.sh
+D    l7directord/l7directord-5-2-4-6.sh
+M    l7directord/l7directord-4-1-1-1.sh
+AM   l7directord/l7directord-5-3-4.sh
+M    l7directord/l7directord-1-2-49-3.sh
+RM   l7directord/l7directord-1-2-44-1.sh
+M    l7directord/l7directord-4-1-1-2.sh
+M    l7directord/l7directord-1-3-9.sh
+M    l7directord/l7directord-5-2-24-3.sh
+D    l7directord/l7directord-1-2-49-4.sh
+M    l7directord/l7directord-4-1-5-1.sh
+M    l7directord/l7directord-1-2-44-2.sh
+M    l7directord/materials/l7directord-help.txt
+A    l7directord/materials/l7directord-5-3-3-l7directord.cf
+AM   l7directord/materials/l7directord-5-2-24-callback.sh
+M    l7directord/materials/l7directord-1-2-44-l7directord.cf
+A    l7directord/materials/l7directord-5-3-2-l7directord.cf
+A    l7directord/materials/l7directord-5-2-24-no_exec_callback.sh
+M    l7directord/materials/l7directord-1-2-48-l7directord.cf
+A    l7directord/materials/l7directord-1-3-11-l7directord.cf
+M    l7directord/materials/l7directord-1-2-46-l7directord.cf
+A    l7directord/materials/l7directord-5-3-4-l7directord.cf
diff --git a/test/script/virtualservice/RemoteAddress:Port b/test/script/virtualservice/RemoteAddress:Port
new file mode 100644 (file)
index 0000000..e69de29