エラーメッセージの変更に対応

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

diff --git a/test/script/l7directord/l7directord-1-3-14.sh b/test/script/l7directord/l7directord-1-3-14.sh
index 99c2a92..7c4c780 100755 (executable)
--- a/test/script/l7directord/l7directord-1-3-14.sh
+++ b/test/script/l7directord/l7directord-1-3-14.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 . ${SET_DEFAULT_CONF}
-\cp ./materials/l7directord-48-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
+\cp ./materials/l7directord-1-3-14-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
 
 # Start l7vsd
 $L7VSD

diff --git a/test/script/l7directord/materials/l7directord-help.txt b/test/script/l7directord/materials/l7directord-help.txt
index 02a3cdb..17d9dfb 100644 (file)
--- a/test/script/l7directord/materials/l7directord-help.txt
+++ b/test/script/l7directord/materials/l7directord-help.txt
@@ -146,14 +146,15 @@ S\bSY\bYN\bNT\bTA\bAX\bX
            However, if a\bau\but\bto\bor\bre\bel\blo\boa\bad\bd is set to y\bye\bes\bs, the configuration is reloaded
            anyway.
 
-       f\bfa\bal\bll\blb\bba\bac\bck\bk =\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]
+       f\bfa\bal\bll\blb\bba\bac\bck\bk =\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]
            the server onto which a web service is redirected if all real
            servers are down. Typically this would be 127.0.0.1 with an
            emergency page.
 
            This directive may also appear within a virtual server, in which
-           case it will override the global fallback server, if set.  Only a
-           value of m\bma\bas\bsq\bq can be specified here. The default is _\bm_\ba_\bs_\bq.
+           case it will override the global fallback server, if set.  Also you
+           can set either m\bma\bas\bsq\bq or t\btp\bpr\bro\box\bxy\by as fallback forwarding mechanism. The
+           default is m\bma\bas\bsq\bq.
 
        l\blo\bog\bgf\bfi\bil\ble\be =\b= "\b"_\b/_\bp_\ba_\bt_\bh_\b/_\bt_\bo_\b/_\bl_\bo_\bg_\bf_\bi_\bl_\be"\b"|syslog_facility
            An alternative logfile might be specified with this directive. If
@@ -189,21 +190,21 @@ S\bSY\bYN\bNT\bTA\bAX\bX
 
        r\bre\bea\bal\bl =\b=
        _\bi_\bp_\b__\ba_\bd_\bd_\br_\be_\bs_\bs_\b|_\bh_\bo_\bs_\bt_\bn_\ba_\bm_\be_\b[_\b-_\b>_\bi_\bp_\b__\ba_\bd_\bd_\br_\be_\bs_\bs_\b|_\bh_\bo_\bs_\bt_\bn_\ba_\bm_\be_\b]_\b[_\b:_\bp_\bo_\br_\bt_\bn_\bu_\bm_\bb_\be_\br_\b|_\bs_\be_\br_\bv_\bi_\bc_\be_\bn_\ba_\bm_\be]
-       [m\bma\bas\bsq\bq] [_\bn] ["\b"_\br_\be_\bq_\bu_\be_\bs_\bt"\b",\b, "\b"_\br_\be_\bc_\be_\bi_\bv_\be"\b"]
+       [m\bma\bas\bsq\bq|t\btp\bpr\bro\box\bxy\by] [_\bn] ["\b"_\br_\be_\bq_\bu_\be_\bs_\bt"\b",\b, "\b"_\br_\be_\bc_\be_\bi_\bv_\be"\b"]
            Defines a real service by IP-address (or hostname) and port (or
            servicename). If the port is omitted then a 0 will be used.
            Optionally a range of IP addresses (or two hostnames) may be given,
            in which case each IP address in the range will be treated as a
            real server using the given port. The second argument defines the
-           forwarding method, it must be m\bma\bas\bsq\bq only.  The third argument
-           defines the weight of each real service. This argument is optional.
-           Default is 1. The last two arguments are optional too. They define
-           a request-receive pair to be used to check if a server is alive.
-           They override the request-receive pair in the virtual server
-           section. These two strings must be quoted. If the request string
-           starts with _\bh_\bt_\bt_\bp_\b:_\b/_\b/_\b._\b._\b. the IP-address and port of the real server
-           is overridden, otherwise the IP-address and port of the real server
-           is used.
+           forwarding mechanism, it must be m\bma\bas\bsq\bq or t\btp\bpr\bro\box\bxy\by.  The third
+           argument defines the weight of each real service. This argument is
+           optional. Default is 1. The last two arguments are optional too.
+           They define a request-receive pair to be used to check if a server
+           is alive. They override the request-receive pair in the virtual
+           server section. These two strings must be quoted. If the request
+           string starts with _\bh_\bt_\bt_\bp_\b:_\b/_\b/_\b._\b._\b. the IP-address and port of the real
+           server is overridden, otherwise the IP-address and port of the real
+           server is used.
 
        m\bmo\bod\bdu\bul\ble\be =\b= _\bp_\br_\bo_\bt_\bo_\b-_\bm_\bo_\bd_\bu_\bl_\be _\bm_\bo_\bd_\bu_\bl_\be_\b-_\ba_\br_\bg_\bs _\b[_\bo_\bp_\bt_\b-_\bm_\bo_\bd_\bu_\bl_\be_\b-_\ba_\br_\bg_\bs_\b]
            Indicates the module parameter of l\bl7\b7d\bdi\bir\bre\bec\bct\bto\bor\brd\bd. Here p\bpr\bro\bot\bto\bo-\b-m\bmo\bod\bdu\bul\ble\be
@@ -447,5 +448,4 @@ A\bAU\bUT\bTH\bHO\bOR\bRS\bS
 
 
 
-perl v5.10.1                      2010-08-05                    L7DIRECTORD(1)
-
+perl v5.10.1                      2010-09-10                    L7DIRECTORD(1)

diff --git a/test/script/library-parameter/parameter-67.sh b/test/script/library-parameter/parameter-67.sh
index b7bd675..4e97af2 100755 (executable)
--- a/test/script/library-parameter/parameter-67.sh
+++ b/test/script/library-parameter/parameter-67.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "verify_cert_depth = 5"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "verify_cert_depth = 5"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/library-parameter/parameter-69.sh b/test/script/library-parameter/parameter-69.sh
index 9eda457..f8781f7 100755 (executable)
--- a/test/script/library-parameter/parameter-69.sh
+++ b/test/script/library-parameter/parameter-69.sh
@@ -22,7 +22,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "ca_file = Temp_root.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "ca_file = Temp_root.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/library-parameter/parameter-70.sh b/test/script/library-parameter/parameter-70.sh
index b38345e..943051d 100755 (executable)
--- a/test/script/library-parameter/parameter-70.sh
+++ b/test/script/library-parameter/parameter-70.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "verify_options = 3"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "verify_options = 3"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/library-parameter/parameter-71.sh b/test/script/library-parameter/parameter-71.sh
index bdae4fd..6a4bce4 100755 (executable)
--- a/test/script/library-parameter/parameter-71.sh
+++ b/test/script/library-parameter/parameter-71.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "verify_cert_depth = 5"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "verify_cert_depth = 5"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/library-parameter/parameter-79.sh b/test/script/library-parameter/parameter-79.sh
index 9f5c928..916a724 100755 (executable)
--- a/test/script/library-parameter/parameter-79.sh
+++ b/test/script/library-parameter/parameter-79.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "verify_cert_depth = 5"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "verify_cert_depth = 5"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/library-parameter/parameter-84.sh b/test/script/library-parameter/parameter-84.sh
index ef91327..4679b64 100755 (executable)
--- a/test/script/library-parameter/parameter-84.sh
+++ b/test/script/library-parameter/parameter-84.sh
@@ -22,7 +22,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "cert_chain_dir = /etc/l7vs/ sslproxy/, cert_chain_file = server.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "cert_chain_dir = /etc/l7vs/ sslproxy/, cert_chain_file = server.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-42.sh b/test/script/session/session-42.sh
index 2db1411..5a4b363 100755 (executable)
--- a/test/script/session/session-42.sh
+++ b/test/script/session/session-42.sh
@@ -38,7 +38,7 @@ then
 fi
 
 #Connect
-RET=`wget -t 1 -T 1 -O- https://127.0.0.1:40001/ --no-check-certificate`
+RET=`wget -t 1 -O- https://127.0.0.1:40001/ --no-check-certificate`
 if [ $? -eq 0 ]
 then
         echo "Test failed: wget -qO- -t 1 http://127.0.0.1:40001/ "

diff --git a/test/script/session/session-50.sh b/test/script/session/session-50.sh
index 92eef1e..5a4c094 100755 (executable)
--- a/test/script/session/session-50.sh
+++ b/test/script/session/session-50.sh
@@ -128,7 +128,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :"  | grep "ca_dir = /etc/l7vs/sslproxy/cert/" | grep " ca_file = ,"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():"  | grep "ca_dir = /etc/l7vs/sslproxy/cert/" | grep " ca_file = ,"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-51.sh b/test/script/session/session-51.sh
index e2b8158..237b615 100755 (executable)
--- a/test/script/session/session-51.sh
+++ b/test/script/session/session-51.sh
@@ -127,7 +127,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :"  | grep "ca_dir = /etc/l7vs/sslproxy/" | grep " ca_file = root.pem,"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():"  | grep "ca_dir = /etc/l7vs/sslproxy/" | grep " ca_file = root.pem,"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-52.sh b/test/script/session/session-52.sh
index fa272f4..6876a7e 100755 (executable)
--- a/test/script/session/session-52.sh
+++ b/test/script/session/session-52.sh
@@ -127,7 +127,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "private_key_dir = /etc/l7vs/sslproxy/, private_key_file = server.pem, private_key_filetype = 1"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "private_key_dir = /etc/l7vs/sslproxy/, private_key_file = server.pem, private_key_filetype = 1"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-53.sh b/test/script/session/session-53.sh
index ec82ff8..cbbf30a 100755 (executable)
--- a/test/script/session/session-53.sh
+++ b/test/script/session/session-53.sh
@@ -124,14 +124,13 @@ fi
 
 RET=`wget -O- https://127.0.0.1:40001/ --certificate=./materials/session-53-newcert.pem --private-key=./materials/session-53-newkey.pem --no-check-certificate`
 EXPECT="${RealServer1}"
-echo "$RET"
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: wget -qO- https://127.0.0.1:40001/ --certificate=newcert.pem --private-key=newkey.pem --no-check-certificate"
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "private_key_dir = /etc/l7vs/sslproxy/cert/, private_key_file = newkey.der, private_key_filetype = 0"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "private_key_dir = /etc/l7vs/sslproxy/cert/, private_key_file = newkey.der, private_key_filetype = 0"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-54.sh b/test/script/session/session-54.sh
index e3e3e4e..67adb99 100755 (executable)
--- a/test/script/session/session-54.sh
+++ b/test/script/session/session-54.sh
@@ -128,7 +128,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "cert_chain_dir = /etc/l7vs/sslproxy/, cert_chain_file = server.pem, private_key_dir = /etc/l7vs/sslproxy/, private_key_file = server.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "cert_chain_dir = /etc/l7vs/sslproxy/, cert_chain_file = server.pem, private_key_dir = /etc/l7vs/sslproxy/, private_key_file = server.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-55.sh b/test/script/session/session-55.sh
index 7f1ed91..d749217 100755 (executable)
--- a/test/script/session/session-55.sh
+++ b/test/script/session/session-55.sh
@@ -133,7 +133,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "cert_chain_dir = /etc/l7vs/sslproxy/cert/, cert_chain_file = server.crt, private_key_dir = /etc/l7vs/sslproxy/cert/, private_key_file = newkey.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "cert_chain_dir = /etc/l7vs/sslproxy/cert/, cert_chain_file = server.crt, private_key_dir = /etc/l7vs/sslproxy/cert/, private_key_file = newkey.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-57.sh b/test/script/session/session-57.sh
index 63238e8..ae9204d 100755 (executable)
--- a/test/script/session/session-57.sh
+++ b/test/script/session/session-57.sh
@@ -128,7 +128,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "ssl_options = 1048576, tmp_dh_dir = /etc/l7vs/sslproxy/, tmp_dh_file = dh512.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "ssl_options = 1048576, tmp_dh_dir = /etc/l7vs/sslproxy/, tmp_dh_file = dh512.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-58.sh b/test/script/session/session-58.sh
index 51fa19d..3fcb5cf 100755 (executable)
--- a/test/script/session/session-58.sh
+++ b/test/script/session/session-58.sh
@@ -129,7 +129,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "ssl_options = 1048576, tmp_dh_dir = /etc/l7vs/sslproxy/, tmp_dh_file = dh1024.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "ssl_options = 1048576, tmp_dh_dir = /etc/l7vs/sslproxy/, tmp_dh_file = dh1024.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-59.sh b/test/script/session/session-59.sh
index c5ec815..5e48f79 100755 (executable)
--- a/test/script/session/session-59.sh
+++ b/test/script/session/session-59.sh
@@ -128,14 +128,14 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700100 in_function : int virtualservice_tcp::conv_verify_option(std::string opt_string) : opt_string = SSL_VERIFY_NONE"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700100 in_function: int virtualservice_tcp::conv_verify_option(std::string opt_string): opt_string = SSL_VERIFY_NONE"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "verify_options = 0"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "verify_options = 0"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-60.sh b/test/script/session/session-60.sh
index 6a3b30f..3b77f31 100755 (executable)
--- a/test/script/session/session-60.sh
+++ b/test/script/session/session-60.sh
@@ -130,7 +130,7 @@ then
 fi
 
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "verify_options = 1"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "verify_options = 1"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-61.sh b/test/script/session/session-61.sh
index edd857a..cea826b 100755 (executable)
--- a/test/script/session/session-61.sh
+++ b/test/script/session/session-61.sh
@@ -129,7 +129,7 @@ then
 fi
 
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "verify_options = 1"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "verify_options = 1"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-63.sh b/test/script/session/session-63.sh
index 9200870..4662305 100755 (executable)
--- a/test/script/session/session-63.sh
+++ b/test/script/session/session-63.sh
@@ -129,7 +129,7 @@ then
 fi
 
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "verify_options = 3"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "verify_options = 3"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/session/session-64.sh b/test/script/session/session-64.sh
index b0b3699..88844e8 100755 (executable)
--- a/test/script/session/session-64.sh
+++ b/test/script/session/session-64.sh
@@ -133,7 +133,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function : bool virtualservice_tcp::get_ssl_parameter() :" | grep "verify_options = 3"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function: bool virtualservice_tcp::get_ssl_parameter():" | grep "verify_options = 3"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-1.sh b/test/script/virtualservice/virtualservice-1.sh
index 6c91539..f3fe115 100755 (executable)
--- a/test/script/virtualservice/virtualservice-1.sh
+++ b/test/script/virtualservice/virtualservice-1.sh
@@ -95,7 +95,7 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
      Access_log_rotate option
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP localhost:40001 sessionless wrr --sorry-uri '/'
-    localhost:50001 10 0
+    localhost:50001(Masq) 10 0
     100000000 0
     100000000 0
     none

diff --git a/test/script/virtualservice/virtualservice-100.sh b/test/script/virtualservice/virtualservice-100.sh
index 3661891..b5f8964 100755 (executable)
--- a/test/script/virtualservice/virtualservice-100.sh
+++ b/test/script/virtualservice/virtualservice-100.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "private_key_filetype = 2"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "private_key_filetype = 2"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-103-1.sh b/test/script/virtualservice/virtualservice-103-1.sh
index 2854513..2e293f0 100755 (executable)
--- a/test/script/virtualservice/virtualservice-103-1.sh
+++ b/test/script/virtualservice/virtualservice-103-1.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function :" |grep "Verify mode\[0\]"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function:" |grep "Verify mode\[0\]"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-103-2.sh b/test/script/virtualservice/virtualservice-103-2.sh
index 6750d28..3fff2cb 100755 (executable)
--- a/test/script/virtualservice/virtualservice-103-2.sh
+++ b/test/script/virtualservice/virtualservice-103-2.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function :" |grep "Verify mode\[1\]"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function:" |grep "Verify mode\[1\]"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-103-3.sh b/test/script/virtualservice/virtualservice-103-3.sh
index 9bf4697..d12e0d0 100755 (executable)
--- a/test/script/virtualservice/virtualservice-103-3.sh
+++ b/test/script/virtualservice/virtualservice-103-3.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function :" |grep "Verify mode\[2\]"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function:" |grep "Verify mode\[2\]"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-103-4.sh b/test/script/virtualservice/virtualservice-103-4.sh
index 3786e3a..a463fc4 100755 (executable)
--- a/test/script/virtualservice/virtualservice-103-4.sh
+++ b/test/script/virtualservice/virtualservice-103-4.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function :" |grep "Verify mode\[4\]"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function:" |grep "Verify mode\[4\]"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-104.sh b/test/script/virtualservice/virtualservice-104.sh
index 9464de1..7ed2240 100755 (executable)
--- a/test/script/virtualservice/virtualservice-104.sh
+++ b/test/script/virtualservice/virtualservice-104.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function :" |grep "Verify mode\[7\]"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700117 out_function:" |grep "Verify mode\[7\]"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-108.sh b/test/script/virtualservice/virtualservice-108.sh
index 08d9291..0d82110 100755 (executable)
--- a/test/script/virtualservice/virtualservice-108.sh
+++ b/test/script/virtualservice/virtualservice-108.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "verify_cert_depth = 99"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "verify_cert_depth = 99"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-111-1.sh b/test/script/virtualservice/virtualservice-111-1.sh
index e2e957d..8d192fb 100755 (executable)
--- a/test/script/virtualservice/virtualservice-111-1.sh
+++ b/test/script/virtualservice/virtualservice-111-1.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "ssl_options = 1048576"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "ssl_options = 1048576"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-111-2.sh b/test/script/virtualservice/virtualservice-111-2.sh
index 6602c90..2e4a03c 100755 (executable)
--- a/test/script/virtualservice/virtualservice-111-2.sh
+++ b/test/script/virtualservice/virtualservice-111-2.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "ssl_options = 16777216"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "ssl_options = 16777216"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-112.sh b/test/script/virtualservice/virtualservice-112.sh
index de7ac66..d317e2a 100755 (executable)
--- a/test/script/virtualservice/virtualservice-112.sh
+++ b/test/script/virtualservice/virtualservice-112.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "ssl_options = 17825792"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "ssl_options = 17825792"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-12.sh b/test/script/virtualservice/virtualservice-12.sh
index 34b8919..c608dbf 100755 (executable)
--- a/test/script/virtualservice/virtualservice-12.sh
+++ b/test/script/virtualservice/virtualservice-12.sh
@@ -180,7 +180,7 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
      Access_log_rotate option
   -> RemoteAddress:Port           Forward Weight ActiveConn InactConn
 TCP localhost:40001 ip lc --timeout 3600 --no-reschedule --sorry-uri '/'
-    localhost:50001 200 0
+    localhost:50001(Masq) 200 0
     1000000 0
     1000000 0
     none

diff --git a/test/script/virtualservice/virtualservice-120.sh b/test/script/virtualservice/virtualservice-120.sh
index 6ab2c58..54bbb4d 100755 (executable)
--- a/test/script/virtualservice/virtualservice-120.sh
+++ b/test/script/virtualservice/virtualservice-120.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "tmp_dh_dir = /etc/l7vs/sslproxy/"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "tmp_dh_dir = /etc/l7vs/sslproxy/"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-123.sh b/test/script/virtualservice/virtualservice-123.sh
index a5b17b4..fafa3e5 100755 (executable)
--- a/test/script/virtualservice/virtualservice-123.sh
+++ b/test/script/virtualservice/virtualservice-123.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "tmp_dh_file = dh512.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "tmp_dh_file = dh512.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-127.sh b/test/script/virtualservice/virtualservice-127.sh
index 81b3fd3..e37aac1 100755 (executable)
--- a/test/script/virtualservice/virtualservice-127.sh
+++ b/test/script/virtualservice/virtualservice-127.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "tmp_dh_file = dh512.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "tmp_dh_file = dh512.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-128.sh b/test/script/virtualservice/virtualservice-128.sh
index 5ef2bda..4937dea 100755 (executable)
--- a/test/script/virtualservice/virtualservice-128.sh
+++ b/test/script/virtualservice/virtualservice-128.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "tmp_dh_file = dh1024.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "tmp_dh_file = dh1024.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-129-1.sh b/test/script/virtualservice/virtualservice-129-1.sh
index 9ab2200..322708b 100755 (executable)
--- a/test/script/virtualservice/virtualservice-129-1.sh
+++ b/test/script/virtualservice/virtualservice-129-1.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set tmp DH file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set tmp DH file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-129-2.sh b/test/script/virtualservice/virtualservice-129-2.sh
index dfc46a0..dbbdc01 100755 (executable)
--- a/test/script/virtualservice/virtualservice-129-2.sh
+++ b/test/script/virtualservice/virtualservice-129-2.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set tmp DH file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set tmp DH file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-130-1.sh b/test/script/virtualservice/virtualservice-130-1.sh
index f219557..c0a5ce3 100755 (executable)
--- a/test/script/virtualservice/virtualservice-130-1.sh
+++ b/test/script/virtualservice/virtualservice-130-1.sh
@@ -22,7 +22,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set tmp DH file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set tmp DH file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-130-2.sh b/test/script/virtualservice/virtualservice-130-2.sh
index 89a61e7..3d357a9 100755 (executable)
--- a/test/script/virtualservice/virtualservice-130-2.sh
+++ b/test/script/virtualservice/virtualservice-130-2.sh
@@ -24,7 +24,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set tmp DH file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set tmp DH file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-131.sh b/test/script/virtualservice/virtualservice-131.sh
index a7307cb..7b7e152 100755 (executable)
--- a/test/script/virtualservice/virtualservice-131.sh
+++ b/test/script/virtualservice/virtualservice-131.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "cipher_list = ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "cipher_list = ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-135-1.sh b/test/script/virtualservice/virtualservice-135-1.sh
index f8586de..83feee0 100755 (executable)
--- a/test/script/virtualservice/virtualservice-135-1.sh
+++ b/test/script/virtualservice/virtualservice-135-1.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "session_cache_mode = 130"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "session_cache_mode = 130"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-135-2.sh b/test/script/virtualservice/virtualservice-135-2.sh
index bd035bc..1d971f5 100755 (executable)
--- a/test/script/virtualservice/virtualservice-135-2.sh
+++ b/test/script/virtualservice/virtualservice-135-2.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "session_cache_mode = 0"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "session_cache_mode = 0"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-139.sh b/test/script/virtualservice/virtualservice-139.sh
index 8437c0b..bf4d121 100755 (executable)
--- a/test/script/virtualservice/virtualservice-139.sh
+++ b/test/script/virtualservice/virtualservice-139.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "session_cache_size = 40960"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "session_cache_size = 40960"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-140-1.sh b/test/script/virtualservice/virtualservice-140-1.sh
index 9ff6362..d082a78 100755 (executable)
--- a/test/script/virtualservice/virtualservice-140-1.sh
+++ b/test/script/virtualservice/virtualservice-140-1.sh
@@ -28,7 +28,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "session_cache_size = 20480"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "session_cache_size = 20480"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-140-2.sh b/test/script/virtualservice/virtualservice-140-2.sh
index 01340fa..4ced409 100755 (executable)
--- a/test/script/virtualservice/virtualservice-140-2.sh
+++ b/test/script/virtualservice/virtualservice-140-2.sh
@@ -28,7 +28,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "session_cache_size = 20480"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "session_cache_size = 20480"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-142.sh b/test/script/virtualservice/virtualservice-142.sh
index 9805489..168bb18 100755 (executable)
--- a/test/script/virtualservice/virtualservice-142.sh
+++ b/test/script/virtualservice/virtualservice-142.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "session_cache_timeout = 600"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "session_cache_timeout = 600"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-143-1.sh b/test/script/virtualservice/virtualservice-143-1.sh
index 9e27f97..7f4f80c 100755 (executable)
--- a/test/script/virtualservice/virtualservice-143-1.sh
+++ b/test/script/virtualservice/virtualservice-143-1.sh
@@ -28,7 +28,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "session_cache_timeout = 300"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "session_cache_timeout = 300"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-143-2.sh b/test/script/virtualservice/virtualservice-143-2.sh
index e468c27..ab32835 100755 (executable)
--- a/test/script/virtualservice/virtualservice-143-2.sh
+++ b/test/script/virtualservice/virtualservice-143-2.sh
@@ -28,7 +28,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "session_cache_timeout = 300"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "session_cache_timeout = 300"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-149.sh b/test/script/virtualservice/virtualservice-149.sh
index ada0be4..e0d2014 100755 (executable)
--- a/test/script/virtualservice/virtualservice-149.sh
+++ b/test/script/virtualservice/virtualservice-149.sh
@@ -49,7 +49,7 @@ for (( i = 0 ; i < 2; i++ )){
        fi
 }
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information : Session number\[0\]"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information: Session number\[0\]"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-150.sh b/test/script/virtualservice/virtualservice-150.sh
index 71868f5..d25dd50 100755 (executable)
--- a/test/script/virtualservice/virtualservice-150.sh
+++ b/test/script/virtualservice/virtualservice-150.sh
@@ -49,7 +49,7 @@ for (( i = 0 ; i < 4; i++ )){
        fi
 }
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information : Session number\[2\]"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information: Session number\[2\]"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-151.sh b/test/script/virtualservice/virtualservice-151.sh
index 6af3843..5ca6ed5 100755 (executable)
--- a/test/script/virtualservice/virtualservice-151.sh
+++ b/test/script/virtualservice/virtualservice-151.sh
@@ -49,7 +49,7 @@ for (( i = 0 ; i < 3; i++ )){
        fi
 }
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information : Session number\[2\]"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information: Session number\[2\]"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"
@@ -65,7 +65,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information : Session number\[0\]"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "SSL session cache information: Session number\[0\]"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-26.sh b/test/script/virtualservice/virtualservice-26.sh
index df7af1f..458f90b 100755 (executable)
--- a/test/script/virtualservice/virtualservice-26.sh
+++ b/test/script/virtualservice/virtualservice-26.sh
@@ -95,7 +95,7 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
      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 0 0
+    127.0.0.1:50001(Masq) 0 0
     0 0
     0 0
     none

diff --git a/test/script/virtualservice/virtualservice-27.sh b/test/script/virtualservice/virtualservice-27.sh
index 320fe92..ba4f2d2 100755 (executable)
--- a/test/script/virtualservice/virtualservice-27.sh
+++ b/test/script/virtualservice/virtualservice-27.sh
@@ -102,7 +102,7 @@ Prot LocalAddress:Port ProtoMod Scheduler Protomod_opt_string
      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 0 0
+    127.0.0.1:50001(Masq) 0 0
     0 0
     0 0
     none

diff --git a/test/script/virtualservice/virtualservice-28.sh b/test/script/virtualservice/virtualservice-28.sh
index c69a462..518cf2f 100755 (executable)
--- a/test/script/virtualservice/virtualservice-28.sh
+++ b/test/script/virtualservice/virtualservice-28.sh
@@ -55,10 +55,10 @@ CONNECT2=$!
 usleep 100000
 
 #Connect
-RET=`$WGET -t 1 -qO- http://127.0.0.1:40001/`
+RET=`wget -t 1 -qO- http://127.0.0.1:40001/`
 if [ "${RET}" != "${SorryServer1}" ]
 then
-        echo "Test failed: $WGET -t 1 -qO- http://127.0.0.1:40001/"
+        echo "Test failed: wget -t 1 -qO- http://127.0.0.1:40001/"
         exit 1
 fi
 

diff --git a/test/script/virtualservice/virtualservice-64.sh b/test/script/virtualservice/virtualservice-64.sh
index 0c376e6..7213b7b 100755 (executable)
--- a/test/script/virtualservice/virtualservice-64.sh
+++ b/test/script/virtualservice/virtualservice-64.sh
@@ -12,7 +12,7 @@ fi
 usleep 100000
 
 RET=`$L7VSADM -A -t 127.0.0.1:40001 -m sslid -z ${L7VSD_CONF_DIR}/sslproxy/sslproxy.target.cf 2>&1 | grep "PARSE ERROR:"`
-EXPECT="PARSE ERROR: When \"protocol_module sslid\" was designated, it isn't possible to designate \"-z\" option."
+EXPECT="PARSE ERROR: You cannot set \"-z\" option with \"sslid\" protocol module."
 if [ "${RET}" != "${EXPECT}" ]
 then
         echo "Test failed: $L7VSADM -A -t 127.0.0.1:40001 -m sslid -z ${L7VSD_CONF_DIR}/sslproxy/sslproxy.target.cf"

diff --git a/test/script/virtualservice/virtualservice-68.sh b/test/script/virtualservice/virtualservice-68.sh
index 9899573..10c55b9 100755 (executable)
--- a/test/script/virtualservice/virtualservice-68.sh
+++ b/test/script/virtualservice/virtualservice-68.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "handshake_timeout = 20"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "handshake_timeout = 20"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-69-1.sh b/test/script/virtualservice/virtualservice-69-1.sh
index 340eda6..b49cb7e 100755 (executable)
--- a/test/script/virtualservice/virtualservice-69-1.sh
+++ b/test/script/virtualservice/virtualservice-69-1.sh
@@ -28,7 +28,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "handshake_timeout = 30"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "handshake_timeout = 30"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-69-2.sh b/test/script/virtualservice/virtualservice-69-2.sh
index 8b2a906..3354dbd 100755 (executable)
--- a/test/script/virtualservice/virtualservice-69-2.sh
+++ b/test/script/virtualservice/virtualservice-69-2.sh
@@ -28,7 +28,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "handshake_timeout = 30"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "handshake_timeout = 30"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-70-2.sh b/test/script/virtualservice/virtualservice-70-2.sh
index 3f63ccc..c94ffab 100755 (executable)
--- a/test/script/virtualservice/virtualservice-70-2.sh
+++ b/test/script/virtualservice/virtualservice-70-2.sh
@@ -28,7 +28,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "handshake_timeout = 30"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "handshake_timeout = 30"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-70-3.sh b/test/script/virtualservice/virtualservice-70-3.sh
index 27f4117..3816a68 100755 (executable)
--- a/test/script/virtualservice/virtualservice-70-3.sh
+++ b/test/script/virtualservice/virtualservice-70-3.sh
@@ -28,7 +28,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" | grep "handshake_timeout = 30"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" | grep "handshake_timeout = 30"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-77-1.sh b/test/script/virtualservice/virtualservice-77-1.sh
index d848e91..cf1b9fb 100755 (executable)
--- a/test/script/virtualservice/virtualservice-77-1.sh
+++ b/test/script/virtualservice/virtualservice-77-1.sh
@@ -22,7 +22,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set root CA file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set root CA file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-77-2.sh b/test/script/virtualservice/virtualservice-77-2.sh
index cffd6b4..0c935b2 100755 (executable)
--- a/test/script/virtualservice/virtualservice-77-2.sh
+++ b/test/script/virtualservice/virtualservice-77-2.sh
@@ -24,7 +24,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set root CA file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set root CA file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-81-1.sh b/test/script/virtualservice/virtualservice-81-1.sh
index 215c592..f48e937 100755 (executable)
--- a/test/script/virtualservice/virtualservice-81-1.sh
+++ b/test/script/virtualservice/virtualservice-81-1.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set certificate chain file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set certificate chain file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-81-2.sh b/test/script/virtualservice/virtualservice-81-2.sh
index 1f45919..cb768c4 100755 (executable)
--- a/test/script/virtualservice/virtualservice-81-2.sh
+++ b/test/script/virtualservice/virtualservice-81-2.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set certificate chain file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set certificate chain file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-82.sh b/test/script/virtualservice/virtualservice-82.sh
index 3521a3b..0078fc1 100755 (executable)
--- a/test/script/virtualservice/virtualservice-82.sh
+++ b/test/script/virtualservice/virtualservice-82.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :"|grep "cert_chain_dir = /etc/l7vs/sslproxy/, cert_chain_file = server.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:"|grep "cert_chain_dir = /etc/l7vs/sslproxy/, cert_chain_file = server.pem"`
 
 if [ -z "${RET}" ]
 then

diff --git a/test/script/virtualservice/virtualservice-85-1.sh b/test/script/virtualservice/virtualservice-85-1.sh
index d4c98a8..0220bb0 100755 (executable)
--- a/test/script/virtualservice/virtualservice-85-1.sh
+++ b/test/script/virtualservice/virtualservice-85-1.sh
@@ -22,7 +22,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set certificate chain file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set certificate chain file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-85-2.sh b/test/script/virtualservice/virtualservice-85-2.sh
index 9494b40..eea294f 100755 (executable)
--- a/test/script/virtualservice/virtualservice-85-2.sh
+++ b/test/script/virtualservice/virtualservice-85-2.sh
@@ -24,7 +24,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set certificate chain file error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set certificate chain file error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-89.sh b/test/script/virtualservice/virtualservice-89.sh
index 6adc0e3..c4506a6 100755 (executable)
--- a/test/script/virtualservice/virtualservice-89.sh
+++ b/test/script/virtualservice/virtualservice-89.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "private_key_dir = /etc/l7vs/sslproxy/"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "private_key_dir = /etc/l7vs/sslproxy/"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-92-1.sh b/test/script/virtualservice/virtualservice-92-1.sh
index 6906800..656947c 100755 (executable)
--- a/test/script/virtualservice/virtualservice-92-1.sh
+++ b/test/script/virtualservice/virtualservice-92-1.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-92-2.sh b/test/script/virtualservice/virtualservice-92-2.sh
index bcdefe7..f88b849 100755 (executable)
--- a/test/script/virtualservice/virtualservice-92-2.sh
+++ b/test/script/virtualservice/virtualservice-92-2.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-93.sh b/test/script/virtualservice/virtualservice-93.sh
index a966b0e..fedb1e3 100755 (executable)
--- a/test/script/virtualservice/virtualservice-93.sh
+++ b/test/script/virtualservice/virtualservice-93.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "private_key_file = server.pem"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "private_key_file = server.pem"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-96-1.sh b/test/script/virtualservice/virtualservice-96-1.sh
index 0070927..ec03057 100755 (executable)
--- a/test/script/virtualservice/virtualservice-96-1.sh
+++ b/test/script/virtualservice/virtualservice-96-1.sh
@@ -22,7 +22,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-96-2.sh b/test/script/virtualservice/virtualservice-96-2.sh
index 7837189..0b06f97 100755 (executable)
--- a/test/script/virtualservice/virtualservice-96-2.sh
+++ b/test/script/virtualservice/virtualservice-96-2.sh
@@ -24,7 +24,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-97-2.sh b/test/script/virtualservice/virtualservice-97-2.sh
index feca65f..9a88e71 100755 (executable)
--- a/test/script/virtualservice/virtualservice-97-2.sh
+++ b/test/script/virtualservice/virtualservice-97-2.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-98-1.sh b/test/script/virtualservice/virtualservice-98-1.sh
index 763aaad..86aea66 100755 (executable)
--- a/test/script/virtualservice/virtualservice-98-1.sh
+++ b/test/script/virtualservice/virtualservice-98-1.sh
@@ -22,7 +22,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-98-2.sh b/test/script/virtualservice/virtualservice-98-2.sh
index 52d6540..a7c7cf0 100755 (executable)
--- a/test/script/virtualservice/virtualservice-98-2.sh
+++ b/test/script/virtualservice/virtualservice-98-2.sh
@@ -24,7 +24,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error : Invalid argument."`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[ERROR\] l7vsd_virtualservice VSD40700999 Set private key file and filetype error: Invalid argument."`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"

diff --git a/test/script/virtualservice/virtualservice-99.sh b/test/script/virtualservice/virtualservice-99.sh
index 14d5370..b6f7408 100755 (executable)
--- a/test/script/virtualservice/virtualservice-99.sh
+++ b/test/script/virtualservice/virtualservice-99.sh
@@ -21,7 +21,7 @@ then
         exit 1
 fi
 
-RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function :" |grep "private_key_filetype = 1"`
+RET=`cat ${L7VS_LOG_DIR}/l7vsd.log | grep "\[DEBUG\] l7vsd_virtualservice VSD10700105 out_function:" |grep "private_key_filetype = 1"`
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/l7vsd.log"