bug fix

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

diff --git a/test/script/l7vsd/l7vsd-10.sh b/test/script/l7vsd/l7vsd-10.sh
index daba79f..9124642 100755 (executable)
--- a/test/script/l7vsd/l7vsd-10.sh
+++ b/test/script/l7vsd/l7vsd-10.sh
@@ -16,6 +16,7 @@ then
         echo "Test failed: kill"
         exit 1
 fi
+usleep 100000
 
 RET=`pgrep l7vsd`
 if [ $? -eq 0 ]

diff --git a/test/script/l7vsd/l7vsd-5.sh b/test/script/l7vsd/l7vsd-5.sh
index cd8e01f..aa3c014 100755 (executable)
--- a/test/script/l7vsd/l7vsd-5.sh
+++ b/test/script/l7vsd/l7vsd-5.sh
@@ -53,59 +53,73 @@ 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 '/'
-    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:40002 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"
+TCP localhost:40001 sessionless rr --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
+TCP localhost:40002 sessionless rr --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
         echo "Test failed: $L7VSADM -V"

diff --git a/test/script/module-protocol-sessionless/sessionless-27.sh b/test/script/module-protocol-sessionless/sessionless-27.sh
index 603c1fd..c243878 100755 (executable)
--- a/test/script/module-protocol-sessionless/sessionless-27.sh
+++ b/test/script/module-protocol-sessionless/sessionless-27.sh
@@ -30,14 +30,14 @@ then
 fi
 
 RET=`$L7VSADM -V -n | grep "TCP 127.0.0.1:40001"`
-if [ "$RET" != "TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/$STR'" ]
+if [ "$RET" != "TCP 127.0.0.1:40001 sessionless rr --sorry-uri '/$STR' --statistic 0" ]
 then
         echo "Test failed: $L7VSADM -V -n | grep TCP 127.0.0.1:40001"
         exit 1
 fi
 
 RET=`$L7VSADM -V -n | grep "TCP 127.0.0.1:40002"`
-if [ "$RET" != "TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/$STR'" ]
+if [ "$RET" != "TCP 127.0.0.1:40002 sessionless rr --sorry-uri '/$STR' --statistic 0" ]
 then
         echo "Test failed: $L7VSADM -V -n | grep TCP 127.0.0.1:40002"
         exit 1

diff --git a/test/script/virtualservice/virtualservice-1.sh b/test/script/virtualservice/virtualservice-1.sh
index 36dc6d4..463a4ef 100755 (executable)
--- a/test/script/virtualservice/virtualservice-1.sh
+++ b/test/script/virtualservice/virtualservice-1.sh
@@ -59,51 +59,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 sessionless wrr --sorry-uri '/'
-    localhost:50001(Masq) 10 0
-    100000000 0
-    100000000 0
-    none
-    deferaccept,cork,quickackoff,nodelay
-    1
-    /var/log/l7vs/l7vsd_conn.log
-    --ac-rotate-type size --ac-rotate-max-backup-index 12 --ac-rotate-max-filesize 1M"
-
+TCP localhost:40001 sessionless wrr --sorry-uri '/' --statistic 0
+  Bypass Settings:
+    Sorry Server                  localhost:50001
+    Max Connection                10
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               none
+  Logging Settings:
+    Access Log                    on
+    Access Log File               deferaccept,cork,quickackoff,nodelay
+    Access Log Rotate             --ac-rotate-type size --ac-rotate-max-backup-index 12 --ac-rotate-max-filesize 1M
+  Socket Settings:
+    TCP_DEFER_ACCEPT              enable
+    TCP_NODELAY                   enable
+    TCP_CORK                      enable
+    TCP_QUICKACK                  enable
+  Throughput:
+    Current Upload / Limit        0.000000 Mbps / 800.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 800.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0"
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: $L7VSADM -V"

diff --git a/test/script/virtualservice/virtualservice-12.sh b/test/script/virtualservice/virtualservice-12.sh
index b5777f1..96cd069 100755 (executable)
--- a/test/script/virtualservice/virtualservice-12.sh
+++ b/test/script/virtualservice/virtualservice-12.sh
@@ -57,50 +57,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}" ]
@@ -144,51 +144,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 lc --timeout 3600 --no-reschedule --sorry-uri '/'
-    localhost:50001(Masq) 200 0
-    1000000 0
-    1000000 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
-
+TCP localhost:40001 ip lc --timeout 3600 --no-reschedule --sorry-uri '/' --statistic 0
+  Bypass Settings:
+    Sorry Server                  localhost:50001
+    Max Connection                200
+    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 / 8.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 8.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0"
 
 if [ "${RET}" != "${EXPECT}" ]
 then

diff --git a/test/script/virtualservice/virtualservice-2.sh b/test/script/virtualservice/virtualservice-2.sh
index 448e43e..be4e9ee 100755 (executable)
--- a/test/script/virtualservice/virtualservice-2.sh
+++ b/test/script/virtualservice/virtualservice-2.sh
@@ -55,42 +55,27 @@ 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"
-
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: $L7VSADM -V"

diff --git a/test/script/virtualservice/virtualservice-22.sh b/test/script/virtualservice/virtualservice-22.sh
index 9892e27..4df7211 100755 (executable)
--- a/test/script/virtualservice/virtualservice-22.sh
+++ b/test/script/virtualservice/virtualservice-22.sh
@@ -58,50 +58,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
         echo "Test failed: $L7VSADM -V"

diff --git a/test/script/virtualservice/virtualservice-26.sh b/test/script/virtualservice/virtualservice-26.sh
index 54672f7..0e448f1 100755 (executable)
--- a/test/script/virtualservice/virtualservice-26.sh
+++ b/test/script/virtualservice/virtualservice-26.sh
@@ -59,50 +59,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 127.0.0.1:40001 sessionless rr --sorry-uri '/'
-    127.0.0.1:50001(Masq) 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 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
+  Bypass Settings:
+    Sorry Server                  127.0.0.1:50001
+    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

diff --git a/test/script/virtualservice/virtualservice-27.sh b/test/script/virtualservice/virtualservice-27.sh
index 21ee33e..58ff635 100755 (executable)
--- a/test/script/virtualservice/virtualservice-27.sh
+++ b/test/script/virtualservice/virtualservice-27.sh
@@ -66,50 +66,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 127.0.0.1:40001 sessionless rr --sorry-uri '/'
-    127.0.0.1:50001(Masq) 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 127.0.0.1:40001 sessionless rr --sorry-uri '/' --statistic 0
+  Bypass Settings:
+    Sorry Server                  127.0.0.1:50001
+    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

diff --git a/test/script/virtualservice/virtualservice-49.sh b/test/script/virtualservice/virtualservice-49.sh
index 5562fac..f530fb7 100755 (executable)
--- a/test/script/virtualservice/virtualservice-49.sh
+++ b/test/script/virtualservice/virtualservice-49.sh
@@ -54,59 +54,73 @@ 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 127.0.0.1:40001 ip rr --timeout 3600 --no-reschedule --sorry-uri '/'
-    none 0 0
-    100000 0
-    100000 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-TCP 127.0.0.1:40002 ip rr --timeout 3600 --no-reschedule --sorry-uri '/'
-    none 0 0
-    100000000 0
-    100000000 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
+TCP 127.0.0.1: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.800000 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.800000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0
+TCP 127.0.0.1:40002 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 / 800.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 800.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0"
 
 if [ "${RET}" != "${EXPECT}" ]
 then

diff --git a/test/script/virtualservice/virtualservice-50.sh b/test/script/virtualservice/virtualservice-50.sh
index 9e9dc9c..9de909b 100755 (executable)
--- a/test/script/virtualservice/virtualservice-50.sh
+++ b/test/script/virtualservice/virtualservice-50.sh
@@ -67,59 +67,73 @@ 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 127.0.0.1:40001 ip rr --timeout 3600 --no-reschedule --sorry-uri '/'
-    none 0 0
-    100000 0
-    100000 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-TCP 127.0.0.1:40002 ip rr --timeout 3600 --no-reschedule --sorry-uri '/'
-    none 0 0
-    100000000 0
-    100000000 0
-    none
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M"
+TCP 127.0.0.1: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.800000 Mbps
+    Current Download / Limit      0.000000 Mbps / 0.800000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0
+TCP 127.0.0.1:40002 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 / 800.000000 Mbps
+    Current Download / Limit      0.000000 Mbps / 800.000000 Mbps
+  Statistics:
+    HTTP Total Requests           0
+    HTTP GET Requests             0
+    HTTP POST Requests            0"
 
 if [ "${RET}" != "${EXPECT}" ]
 then

diff --git a/test/script/virtualservice/virtualservice-51.sh b/test/script/virtualservice/virtualservice-51.sh
index ccfd0fa..418d68f 100755 (executable)
--- a/test/script/virtualservice/virtualservice-51.sh
+++ b/test/script/virtualservice/virtualservice-51.sh
@@ -84,40 +84,26 @@ 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"
 if [ "${RET}" != "${EXPECT}" ]
 then

diff --git a/test/script/virtualservice/virtualservice-53.sh b/test/script/virtualservice/virtualservice-53.sh
index 70326d1..4ed86ee 100755 (executable)
--- a/test/script/virtualservice/virtualservice-53.sh
+++ b/test/script/virtualservice/virtualservice-53.sh
@@ -84,50 +84,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 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"
+TCP 127.0.0.1:40001 sessionless rr --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
         echo "Test failed: $L7VSADM -V -n"

diff --git a/test/script/virtualservice/virtualservice-63.sh b/test/script/virtualservice/virtualservice-63.sh
index fff7e3d..d885258 100755 (executable)
--- a/test/script/virtualservice/virtualservice-63.sh
+++ b/test/script/virtualservice/virtualservice-63.sh
@@ -88,61 +88,75 @@ 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 '/'
-    none 0 0
-    0 0
-    0 0
-    /etc/l7vs/sslproxy/sslproxy.target.cf
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+TCP localhost:40001 sessionless rr --sorry-uri '/' --statistic 0
   -> localhost:50001              Masq    1      0          0         
-TCP localhost:40002 ip rr --timeout 3600 --no-reschedule --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    /etc/l7vs/sslproxy/sslproxy.target.cf
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  -> localhost:50002              Masq    1      0          0         "
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               /etc/l7vs/sslproxy/sslproxy.target.cf
+  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 localhost:40002 ip rr --timeout 3600 --no-reschedule --sorry-uri '/' --statistic 0
+  -> localhost:50002              Masq    1      0          0         
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               /etc/l7vs/sslproxy/sslproxy.target.cf
+  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
@@ -193,61 +207,75 @@ 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 '/'
-    none 0 0
-    0 0
-    0 0
-    /etc/l7vs/sslproxy/sslproxy.target.cf
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
+TCP localhost:40001 sessionless rr --sorry-uri '/' --statistic 0
   -> localhost:50001              Masq    1      0          1         
-TCP localhost:40002 ip rr --timeout 3600 --no-reschedule --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    /etc/l7vs/sslproxy/sslproxy.target.cf
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-  -> localhost:50002              Masq    1      0          1         "
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               /etc/l7vs/sslproxy/sslproxy.target.cf
+  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 localhost:40002 ip rr --timeout 3600 --no-reschedule --sorry-uri '/' --statistic 0
+  -> localhost:50002              Masq    1      0          1         
+  Bypass Settings:
+    Sorry Server                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               /etc/l7vs/sslproxy/sslproxy.target.cf
+  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

diff --git a/test/script/virtualservice/virtualservice-65.sh b/test/script/virtualservice/virtualservice-65.sh
index eda4716..2ca2c00 100755 (executable)
--- a/test/script/virtualservice/virtualservice-65.sh
+++ b/test/script/virtualservice/virtualservice-65.sh
@@ -53,59 +53,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 '/'
-    none 0 0
-    0 0
-    0 0
-    /etc/l7vs/sslproxy/sslproxy.target.cf
-    none
-    0
-    none
-    --ac-rotate-type size --ac-rotate-max-backup-index 10 --ac-rotate-max-filesize 10M
-TCP localhost:40002 ip rr --timeout 3600 --no-reschedule --sorry-uri '/'
-    none 0 0
-    0 0
-    0 0
-    /etc/l7vs/sslproxy/sslproxy.target.cf
-    none
-    0
-    none
-    --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                  none
+    Max Connection                0
+    Sorry Flag                    off
+  SSL Settings:
+    SSL Config File               /etc/l7vs/sslproxy/sslproxy.target.cf
+  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 localhost:40002 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               /etc/l7vs/sslproxy/sslproxy.target.cf
+  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"
@@ -154,40 +169,26 @@ 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"
 
 if [ "${RET}" != "${EXPECT}" ]