Merge branch 'develop' of https://git.mesalab.cn/chongming/tsg_test into develop

32 files changed, 35 insertions, 35 deletions

diff --git a/tests/monitor/monit_srcip_ftp_hex_content.py b/tests/monitor/monit_srcip_ftp_hex_content.py
index ecac899fb..44dee8ff5 100644
--- a/tests/monitor/monit_srcip_ftp_hex_content.py
+++ b/tests/monitor/monit_srcip_ftp_hex_content.py
@@ -67,7 +67,7 @@ def run(parameter):
                                 {
                                     "op": "add",
                                     "expr_type": "and",
-                                    "expression": "6175746F74657374"
+                                    "expression": "|6175746F74657374|"
                                 }
                             ]
                         }
diff --git a/tests/monitor/monit_srcip_ftp_multi_uri.py b/tests/monitor/monit_srcip_ftp_multi_uri.py
index e7f5beb96..8a2ae3784 100644
--- a/tests/monitor/monit_srcip_ftp_multi_uri.py
+++ b/tests/monitor/monit_srcip_ftp_multi_uri.py
@@ -91,7 +91,7 @@ def run(parameter):
 
         traffic_generation = {
             "tool": "ftp",  # or trex/http
-            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english.txt -u ftpuser:111111"
+            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english_big.txt -u ftpuser:111111"
         }
 
         verification_result = {
diff --git a/tests/monitor/monit_srcip_ftp_sub_account_sub_uri.py b/tests/monitor/monit_srcip_ftp_sub_account_sub_uri.py
index 0e3a79db3..165bd5981 100644
--- a/tests/monitor/monit_srcip_ftp_sub_account_sub_uri.py
+++ b/tests/monitor/monit_srcip_ftp_sub_account_sub_uri.py
@@ -109,7 +109,7 @@ def run(parameter):
 
         traffic_generation = {
             "tool": "ftp",  # or trex/http
-            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english.txt -u ftpuser:111111"
+            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english_big.txt -u ftpuser:111111"
         }
 
         verification_result = {
diff --git a/tests/monitor/monit_srcip_ftp_sub_content_sub_uri.py b/tests/monitor/monit_srcip_ftp_sub_content_sub_uri.py
index 9acb03439..299331fb1 100644
--- a/tests/monitor/monit_srcip_ftp_sub_content_sub_uri.py
+++ b/tests/monitor/monit_srcip_ftp_sub_content_sub_uri.py
@@ -109,7 +109,7 @@ def run(parameter):
 
         traffic_generation = {
             "tool": "ftp",  # or trex/http
-            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english.txt -u ftpuser:111111"
+            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english_big.txt -u ftpuser:111111"
         }
 
         verification_result = {
diff --git a/tests/monitor/monit_srcip_ftp_sub_content_sub_uri_sub_account.py b/tests/monitor/monit_srcip_ftp_sub_content_sub_uri_sub_account.py
index 8d48342eb..895af986b 100644
--- a/tests/monitor/monit_srcip_ftp_sub_content_sub_uri_sub_account.py
+++ b/tests/monitor/monit_srcip_ftp_sub_content_sub_uri_sub_account.py
@@ -127,7 +127,7 @@ def run(parameter):
 
         traffic_generation = {
             "tool": "ftp",  # or trex/http
-            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english.txt -u ftpuser:111111"
+            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english_big.txt -u ftpuser:111111"
         }
 
         verification_result = {
diff --git a/tests/monitor/monit_srcip_ftp_sub_uri.py b/tests/monitor/monit_srcip_ftp_sub_uri.py
index a86f0d6a2..236b3ffc1 100644
--- a/tests/monitor/monit_srcip_ftp_sub_uri.py
+++ b/tests/monitor/monit_srcip_ftp_sub_uri.py
@@ -91,7 +91,7 @@ def run(parameter):
 
         traffic_generation = {
             "tool": "ftp",  # or trex/http
-            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english.txt -u ftpuser:111111"
+            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english_big.txt -u ftpuser:111111"
         }
 
         verification_result = {
diff --git a/tests/monitor/monit_srcip_ftp_suff_uri.py b/tests/monitor/monit_srcip_ftp_suff_uri.py
index 0ac6de31e..3e80009a4 100644
--- a/tests/monitor/monit_srcip_ftp_suff_uri.py
+++ b/tests/monitor/monit_srcip_ftp_suff_uri.py
@@ -67,7 +67,7 @@ def run(parameter):
                                 {
                                     "op": "add",
                                     "expr_type": "and",
-                                    "expression": "autoFtp/english_big.txt$"
+                                    "expression": "autoFtp/english.txt$"
                                 }
                             ]
                         }
@@ -91,7 +91,7 @@ def run(parameter):
 
         traffic_generation = {
             "tool": "ftp",  # or trex/http
-            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english.txt -u ftpuser:111111"
+            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english_big.txt -u ftpuser:111111"
         }
 
         verification_result = {
diff --git a/tests/monitor/monit_srcip_ftp_xly_uri.py b/tests/monitor/monit_srcip_ftp_xly_uri.py
index dae90d460..05df459a1 100644
--- a/tests/monitor/monit_srcip_ftp_xly_uri.py
+++ b/tests/monitor/monit_srcip_ftp_xly_uri.py
@@ -91,7 +91,7 @@ def run(parameter):
 
         traffic_generation = {
             "tool": "ftp",  # or trex/http
-            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english.txt -u ftpuser:111111"
+            "command": "curl -m 20 ftp://192.168.40.206/autoFtp/english_big.txt -u ftpuser:111111"
         }
 
         verification_result = {
diff --git a/tests/monitor/monit_srcip_http_hex_reqbody.py b/tests/monitor/monit_srcip_http_hex_reqbody.py
index befecccdb..0f05b6667 100644
--- a/tests/monitor/monit_srcip_http_hex_reqbody.py
+++ b/tests/monitor/monit_srcip_http_hex_reqbody.py
@@ -67,7 +67,7 @@ def run(parameter):
                                 {
                                     "op": "add",
                                     "expr_type": "and",
-                                    "expression": "68656C6C6F4D6F6E69746F72"
+                                    "expression": "|68656C6C6F4D6F6E69746F72|"
                                 }
                             ]
                         }
diff --git a/tests/monitor/monit_srcip_http_hex_reqheader_by_ua.py b/tests/monitor/monit_srcip_http_hex_reqheader_by_ua.py
index 3a56c3619..6639cde47 100644
--- a/tests/monitor/monit_srcip_http_hex_reqheader_by_ua.py
+++ b/tests/monitor/monit_srcip_http_hex_reqheader_by_ua.py
@@ -67,7 +67,7 @@ def run(parameter):
                                 {
                                     "op": "add",
                                     "expr_type": "and",
-                                    "expression": "6375726C&User-Agent"
+                                    "expression": "|6375726C|"
                                 }
                             ]
                         }
diff --git a/tests/monitor/monit_srcip_http_hex_resbody.py b/tests/monitor/monit_srcip_http_hex_resbody.py
index da2985426..bba3e563d 100644
--- a/tests/monitor/monit_srcip_http_hex_resbody.py
+++ b/tests/monitor/monit_srcip_http_hex_resbody.py
@@ -67,7 +67,7 @@ def run(parameter):
                                 {
                                     "op": "add",
                                     "expr_type": "and",
-                                    "expression": "746573745F726573626F6479"
+                                    "expression": "|746573745F726573626F6479|"
                                 }
                             ]
                         }
diff --git a/tests/monitor/monit_srcip_http_hex_resheader_by_ct.py b/tests/monitor/monit_srcip_http_hex_resheader_by_ct.py
index 53bc60f35..2ced301f0 100644
--- a/tests/monitor/monit_srcip_http_hex_resheader_by_ct.py
+++ b/tests/monitor/monit_srcip_http_hex_resheader_by_ct.py
@@ -67,7 +67,7 @@ def run(parameter):
                                 {
                                     "op": "add",
                                     "expr_type": "and",
-                                    "expression": "74657874&Content-Type"
+                                    "expression": "|74657874|"
                                 }
                             ]
                         }
diff --git a/tests/monitor/monit_srcip_mail_hex_attachment_content.py b/tests/monitor/monit_srcip_mail_hex_attachment_content.py
index e6e4c1d23..e3b036a15 100644
--- a/tests/monitor/monit_srcip_mail_hex_attachment_content.py
+++ b/tests/monitor/monit_srcip_mail_hex_attachment_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
@@ -67,7 +67,7 @@ def run(parameter):
                                 {
                                     "op": "add",
                                     "expr_type": "and",
-                                    "expression": "54526578"
+                                    "expression": "|54526578|"
                                 }
                             ]
                         }
diff --git a/tests/monitor/monit_srcip_mail_hex_attachment_name.py b/tests/monitor/monit_srcip_mail_hex_attachment_name.py
index e1a29d563..52457e2d7 100644
--- a/tests/monitor/monit_srcip_mail_hex_attachment_name.py
+++ b/tests/monitor/monit_srcip_mail_hex_attachment_name.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
@@ -67,7 +67,7 @@ def run(parameter):
                                 {
                                     "op": "add",
                                     "expr_type": "and",
-                                    "expression": "74657374"
+                                    "expression": "|74657374|"
                                 }
                             ]
                         }
diff --git a/tests/monitor/monit_srcip_mail_multi_account_mirror_on.py b/tests/monitor/monit_srcip_mail_multi_account_mirror_on.py
index 0e8e5cd3f..9e7efeb56 100644
--- a/tests/monitor/monit_srcip_mail_multi_account_mirror_on.py
+++ b/tests/monitor/monit_srcip_mail_multi_account_mirror_on.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_multi_attachment_content.py b/tests/monitor/monit_srcip_mail_multi_attachment_content.py
index 79007b37e..10e822ec1 100644
--- a/tests/monitor/monit_srcip_mail_multi_attachment_content.py
+++ b/tests/monitor/monit_srcip_mail_multi_attachment_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_multi_attachment_name.py b/tests/monitor/monit_srcip_mail_multi_attachment_name.py
index b3b7f6d68..752eef9ab 100644
--- a/tests/monitor/monit_srcip_mail_multi_attachment_name.py
+++ b/tests/monitor/monit_srcip_mail_multi_attachment_name.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_multi_content.py b/tests/monitor/monit_srcip_mail_multi_content.py
index 0fcf629f2..15a4601bc 100644
--- a/tests/monitor/monit_srcip_mail_multi_content.py
+++ b/tests/monitor/monit_srcip_mail_multi_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_pre_attachment_content.py b/tests/monitor/monit_srcip_mail_pre_attachment_content.py
index f0e5cb5e9..0b8af0af1 100644
--- a/tests/monitor/monit_srcip_mail_pre_attachment_content.py
+++ b/tests/monitor/monit_srcip_mail_pre_attachment_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_pre_attachment_name.py b/tests/monitor/monit_srcip_mail_pre_attachment_name.py
index 15327c438..799a5b1ab 100644
--- a/tests/monitor/monit_srcip_mail_pre_attachment_name.py
+++ b/tests/monitor/monit_srcip_mail_pre_attachment_name.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_pre_content.py b/tests/monitor/monit_srcip_mail_pre_content.py
index e29023813..d69699608 100644
--- a/tests/monitor/monit_srcip_mail_pre_content.py
+++ b/tests/monitor/monit_srcip_mail_pre_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_sub_attachment_content.py b/tests/monitor/monit_srcip_mail_sub_attachment_content.py
index 2fb933969..993c645b1 100644
--- a/tests/monitor/monit_srcip_mail_sub_attachment_content.py
+++ b/tests/monitor/monit_srcip_mail_sub_attachment_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_sub_attachment_content_sub_content.py b/tests/monitor/monit_srcip_mail_sub_attachment_content_sub_content.py
index a6b5ab6ac..56027a1e2 100644
--- a/tests/monitor/monit_srcip_mail_sub_attachment_content_sub_content.py
+++ b/tests/monitor/monit_srcip_mail_sub_attachment_content_sub_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_sub_attachment_name.py b/tests/monitor/monit_srcip_mail_sub_attachment_name.py
index dc279aca8..f6ec28199 100644
--- a/tests/monitor/monit_srcip_mail_sub_attachment_name.py
+++ b/tests/monitor/monit_srcip_mail_sub_attachment_name.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_attachment_content.py b/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_attachment_content.py
index fdb9a94d3..a1a8d505d 100644
--- a/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_attachment_content.py
+++ b/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_attachment_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_attachment_content_sub_content.py b/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_attachment_content_sub_content.py
index 0f929259c..f23027a25 100644
--- a/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_attachment_content_sub_content.py
+++ b/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_attachment_content_sub_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_content.py b/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_content.py
index 406c20f4a..1b8be9207 100644
--- a/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_content.py
+++ b/tests/monitor/monit_srcip_mail_sub_attachment_name_sub_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_sub_content.py b/tests/monitor/monit_srcip_mail_sub_content.py
index 8337b2f01..6ab7923e9 100644
--- a/tests/monitor/monit_srcip_mail_sub_content.py
+++ b/tests/monitor/monit_srcip_mail_sub_content.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_sub_content_mirror_on.py b/tests/monitor/monit_srcip_mail_sub_content_mirror_on.py
index 8cda749b7..34bbfcc24 100644
--- a/tests/monitor/monit_srcip_mail_sub_content_mirror_on.py
+++ b/tests/monitor/monit_srcip_mail_sub_content_mirror_on.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_suff_attachment_name.py b/tests/monitor/monit_srcip_mail_suff_attachment_name.py
index 491d59d44..c93369067 100644
--- a/tests/monitor/monit_srcip_mail_suff_attachment_name.py
+++ b/tests/monitor/monit_srcip_mail_suff_attachment_name.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mail_xly_attachment_name.py b/tests/monitor/monit_srcip_mail_xly_attachment_name.py
index 37c8de994..38d06f4fb 100644
--- a/tests/monitor/monit_srcip_mail_xly_attachment_name.py
+++ b/tests/monitor/monit_srcip_mail_xly_attachment_name.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]
diff --git a/tests/monitor/monit_srcip_mirror_on.py b/tests/monitor/monit_srcip_mirror_on.py
index c5b791a3a..061bd4a3d 100644
--- a/tests/monitor/monit_srcip_mirror_on.py
+++ b/tests/monitor/monit_srcip_mirror_on.py
@@ -38,7 +38,7 @@ def run(parameter):
                             "items": [
                                 {
                                     "op": "add",
-                                    "ip": "10.64.224.7",
+                                    "ip": "10.64.224.3",
                                     "interval": "0-65535"
                                 }
                             ]