diff options
| author | zhaokun <[email protected]> | 2024-11-28 11:19:46 +0800 |
|---|---|---|
| committer | zhaokun <[email protected]> | 2024-11-28 11:19:46 +0800 |
| commit | eecd484389657f9745df767363108b9b4e27e923 (patch) | |
| tree | 35c3a72d8dfcbd60dc8927f423549ac0d220a9da | |
| parent | 924f4cd44f21480d380997990c6746087e3b0277 (diff) | |
| parent | ff98188cd811500c32e0a4a8aad6a5c25b4137d0 (diff) | |
merge
392 files changed, 424 insertions, 412 deletions
diff --git a/support/packet_generator/traffic_generator.py b/support/packet_generator/traffic_generator.py index ddbe762ad..fc6c5580f 100644 --- a/support/packet_generator/traffic_generator.py +++ b/support/packet_generator/traffic_generator.py @@ -103,7 +103,7 @@ class TrafficGenerator: yaml_name = traffic_generation.get("yaml_name") + ".yaml" m = traffic_generation.get("m",0) d = traffic_generation.get("d",0) - if policy_configuration.get("type") == "dos_protection" and policy_configuration["action_parameter"]["type"] == "concurrency": + if policy_configuration.get("type") == "dos_protection" and policy_configuration["action_parameter"]["threshold"]["type"] == "concurrency": active_flows = policy_configuration.get("active_flows") else: active_flows = 0 diff --git a/tests/manipulation/man_run_script_srcip_2item_in_fqdn_http_substr_url.py b/tests/manipulation/man_execute_srcip_2item_in_fqdn_http_substr_url.py index 6d0066aed..6d0066aed 100644 --- a/tests/manipulation/man_run_script_srcip_2item_in_fqdn_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_2item_in_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_dstip_http_substr_url.py b/tests/manipulation/man_execute_srcip_dstip_http_substr_url.py index 402f0383e..402f0383e 100644 --- a/tests/manipulation/man_run_script_srcip_dstip_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_dstip_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_dstport_http_substr_url.py b/tests/manipulation/man_execute_srcip_dstport_http_substr_url.py index 145a1d461..145a1d461 100644 --- a/tests/manipulation/man_run_script_srcip_dstport_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_dstport_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_extip_http_substr_url.py b/tests/manipulation/man_execute_srcip_extip_http_substr_url.py index 402f0383e..402f0383e 100644 --- a/tests/manipulation/man_run_script_srcip_extip_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_extip_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_extport_http_substr_url.py b/tests/manipulation/man_execute_srcip_extport_http_substr_url.py index 3c30faf50..3c30faf50 100644 --- a/tests/manipulation/man_run_script_srcip_extport_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_extport_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_http_2item_in_url.py b/tests/manipulation/man_execute_srcip_http_2item_in_url.py index 9306b0982..9306b0982 100644 --- a/tests/manipulation/man_run_script_srcip_http_2item_in_url.py +++ b/tests/manipulation/man_execute_srcip_http_2item_in_url.py diff --git a/tests/manipulation/man_run_script_srcip_http_8andmultisubstr_url.py b/tests/manipulation/man_execute_srcip_http_8andmultisubstr_url.py index b9a82b8c7..b9a82b8c7 100644 --- a/tests/manipulation/man_run_script_srcip_http_8andmultisubstr_url.py +++ b/tests/manipulation/man_execute_srcip_http_8andmultisubstr_url.py diff --git a/tests/manipulation/man_run_script_srcip_http_pre_url.py b/tests/manipulation/man_execute_srcip_http_pre_url.py index 82a49b977..82a49b977 100644 --- a/tests/manipulation/man_run_script_srcip_http_pre_url.py +++ b/tests/manipulation/man_execute_srcip_http_pre_url.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url.py b/tests/manipulation/man_execute_srcip_http_substr_url.py index 974a1b7cd..974a1b7cd 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_2item_in_reqheader_by_ua.py b/tests/manipulation/man_execute_srcip_http_substr_url_2item_in_reqheader_by_ua.py index bfb0a9179..bfb0a9179 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_2item_in_reqheader_by_ua.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_2item_in_reqheader_by_ua.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_2item_in_resheader_by_ct.py b/tests/manipulation/man_execute_srcip_http_substr_url_2item_in_resheader_by_ct.py index 7b8047c4b..7b8047c4b 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_2item_in_resheader_by_ct.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_2item_in_resheader_by_ct.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua.py b/tests/manipulation/man_execute_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua.py index 2c5c15241..2c5c15241 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_8andmultisubstr_resheader_by_ct.py b/tests/manipulation/man_execute_srcip_http_substr_url_8andmultisubstr_resheader_by_ct.py index 0ca2e6c16..0ca2e6c16 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_8andmultisubstr_resheader_by_ct.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_8andmultisubstr_resheader_by_ct.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_pre_reqheader_by_ua.py b/tests/manipulation/man_execute_srcip_http_substr_url_pre_reqheader_by_ua.py index 1b0386050..1b0386050 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_pre_reqheader_by_ua.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_pre_reqheader_by_ua.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_pre_resheader_by_ct.py b/tests/manipulation/man_execute_srcip_http_substr_url_pre_resheader_by_ct.py index 0c436da8c..0c436da8c 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_pre_resheader_by_ct.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_pre_resheader_by_ct.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_reqheader_by_ua.py b/tests/manipulation/man_execute_srcip_http_substr_url_substr_reqheader_by_ua.py index 0f2b0951b..0f2b0951b 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_reqheader_by_ua.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_substr_reqheader_by_ua.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_reqheader_by_ua_logall.py b/tests/manipulation/man_execute_srcip_http_substr_url_substr_reqheader_by_ua_logall.py index 95fb030cd..95fb030cd 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_reqheader_by_ua_logall.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_substr_reqheader_by_ua_logall.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_reqheader_hex_by_ua.py b/tests/manipulation/man_execute_srcip_http_substr_url_substr_reqheader_hex_by_ua.py index d33cc07d2..d33cc07d2 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_reqheader_hex_by_ua.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_substr_reqheader_hex_by_ua.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_resheader_by_ct.py b/tests/manipulation/man_execute_srcip_http_substr_url_substr_resheader_by_ct.py index 27c65e65a..27c65e65a 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_resheader_by_ct.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_substr_resheader_by_ct.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_resheader_hex_by_ct.py b/tests/manipulation/man_execute_srcip_http_substr_url_substr_resheader_hex_by_ct.py index 2a905392a..2a905392a 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_substr_resheader_hex_by_ct.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_substr_resheader_hex_by_ct.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_suff_reqheader_by_ua.py b/tests/manipulation/man_execute_srcip_http_substr_url_suff_reqheader_by_ua.py index 1b0386050..1b0386050 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_suff_reqheader_by_ua.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_suff_reqheader_by_ua.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_suff_resheader_by_ct.py b/tests/manipulation/man_execute_srcip_http_substr_url_suff_resheader_by_ct.py index 7800cf42b..7800cf42b 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_suff_resheader_by_ct.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_suff_resheader_by_ct.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_xly_reqheader_by_ua.py b/tests/manipulation/man_execute_srcip_http_substr_url_xly_reqheader_by_ua.py index 453112e77..453112e77 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_xly_reqheader_by_ua.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_xly_reqheader_by_ua.py diff --git a/tests/manipulation/man_run_script_srcip_http_substr_url_xly_resheader_by_ct.py b/tests/manipulation/man_execute_srcip_http_substr_url_xly_resheader_by_ct.py index f000697f0..f000697f0 100644 --- a/tests/manipulation/man_run_script_srcip_http_substr_url_xly_resheader_by_ct.py +++ b/tests/manipulation/man_execute_srcip_http_substr_url_xly_resheader_by_ct.py diff --git a/tests/manipulation/man_run_script_srcip_http_suff_url.py b/tests/manipulation/man_execute_srcip_http_suff_url.py index 856e55053..856e55053 100644 --- a/tests/manipulation/man_run_script_srcip_http_suff_url.py +++ b/tests/manipulation/man_execute_srcip_http_suff_url.py diff --git a/tests/manipulation/man_run_script_srcip_http_suff_url_datacenter.py b/tests/manipulation/man_execute_srcip_http_suff_url_datacenter.py index fabadb86c..fabadb86c 100644 --- a/tests/manipulation/man_run_script_srcip_http_suff_url_datacenter.py +++ b/tests/manipulation/man_execute_srcip_http_suff_url_datacenter.py diff --git a/tests/manipulation/man_run_script_srcip_http_xly_url.py b/tests/manipulation/man_execute_srcip_http_xly_url.py index ca33e7a88..ca33e7a88 100644 --- a/tests/manipulation/man_run_script_srcip_http_xly_url.py +++ b/tests/manipulation/man_execute_srcip_http_xly_url.py diff --git a/tests/manipulation/man_run_script_srcip_intip_http_substr_url.py b/tests/manipulation/man_execute_srcip_intip_http_substr_url.py index cb800a47a..cb800a47a 100644 --- a/tests/manipulation/man_run_script_srcip_intip_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_intip_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_intport_http_substr_url.py b/tests/manipulation/man_execute_srcip_intport_http_substr_url.py index fe54436a8..fe54436a8 100644 --- a/tests/manipulation/man_run_script_srcip_intport_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_intport_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_pre_fqdn_http_substr_url.py b/tests/manipulation/man_execute_srcip_pre_fqdn_http_substr_url.py index 537531fc0..537531fc0 100644 --- a/tests/manipulation/man_run_script_srcip_pre_fqdn_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_pre_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_srcport_http_substr_url.py b/tests/manipulation/man_execute_srcip_srcport_http_substr_url.py index 9c396c3b1..9c396c3b1 100644 --- a/tests/manipulation/man_run_script_srcip_srcport_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_srcport_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_subid_http_pre_url.py b/tests/manipulation/man_execute_srcip_subid_http_pre_url.py index 82e605898..82e605898 100644 --- a/tests/manipulation/man_run_script_srcip_subid_http_pre_url.py +++ b/tests/manipulation/man_execute_srcip_subid_http_pre_url.py diff --git a/tests/manipulation/man_run_script_srcip_subid_http_substr_url_substr_reqheader_by_ua.py b/tests/manipulation/man_execute_srcip_subid_http_substr_url_substr_reqheader_by_ua.py index d00a0f49f..d00a0f49f 100644 --- a/tests/manipulation/man_run_script_srcip_subid_http_substr_url_substr_reqheader_by_ua.py +++ b/tests/manipulation/man_execute_srcip_subid_http_substr_url_substr_reqheader_by_ua.py diff --git a/tests/manipulation/man_run_script_srcip_subid_http_substr_url_suff_reqheader_by_ua.py b/tests/manipulation/man_execute_srcip_subid_http_substr_url_suff_reqheader_by_ua.py index 1fc0dc54a..1fc0dc54a 100644 --- a/tests/manipulation/man_run_script_srcip_subid_http_substr_url_suff_reqheader_by_ua.py +++ b/tests/manipulation/man_execute_srcip_subid_http_substr_url_suff_reqheader_by_ua.py diff --git a/tests/manipulation/man_run_script_srcip_subid_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py b/tests/manipulation/man_execute_srcip_subid_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py index a93788209..a93788209 100644 --- a/tests/manipulation/man_run_script_srcip_subid_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py +++ b/tests/manipulation/man_execute_srcip_subid_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py diff --git a/tests/manipulation/man_run_script_srcip_substr_fqdn_http_substr_url.py b/tests/manipulation/man_execute_srcip_substr_fqdn_http_substr_url.py index 698b90930..698b90930 100644 --- a/tests/manipulation/man_run_script_srcip_substr_fqdn_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_substr_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py b/tests/manipulation/man_execute_srcip_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py index 787327cf3..787327cf3 100644 --- a/tests/manipulation/man_run_script_srcip_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py +++ b/tests/manipulation/man_execute_srcip_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py diff --git a/tests/manipulation/man_run_script_srcip_suff_fqdn_http_substr_url.py b/tests/manipulation/man_execute_srcip_suff_fqdn_http_substr_url.py index dc83fdb27..dc83fdb27 100644 --- a/tests/manipulation/man_run_script_srcip_suff_fqdn_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_suff_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_run_script_srcip_xly_fqdn_http_substr_url.py b/tests/manipulation/man_execute_srcip_xly_fqdn_http_substr_url.py index 331ae320f..331ae320f 100644 --- a/tests/manipulation/man_run_script_srcip_xly_fqdn_http_substr_url.py +++ b/tests/manipulation/man_execute_srcip_xly_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_edit_element_srcip_2item_in_fqdn_http_substr_url_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_2item_in_fqdn_http_substr_url_whole_file_mark.py index e06aac806..e06aac806 100644 --- a/tests/manipulation/man_edit_element_srcip_2item_in_fqdn_http_substr_url_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_2item_in_fqdn_http_substr_url_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_dstip_subid_substr_url_http_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_dstip_subid_substr_url_http_whole_file_mark.py index cbc96df4a..cbc96df4a 100644 --- a/tests/manipulation/man_edit_element_srcip_dstip_subid_substr_url_http_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_dstip_subid_substr_url_http_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_dstip_substr_url_http_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_dstip_substr_url_http_whole_file_mark.py index d334e2f53..d334e2f53 100644 --- a/tests/manipulation/man_edit_element_srcip_dstip_substr_url_http_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_dstip_substr_url_http_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_extip_substr_url_http_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_extip_substr_url_http_whole_file_mark.py index 888a7cdb8..888a7cdb8 100644 --- a/tests/manipulation/man_edit_element_srcip_extip_substr_url_http_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_extip_substr_url_http_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_1_1_xly_url_inside_element_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_1_1_xly_url_inside_element_mark.py index 789541eb2..789541eb2 100644 --- a/tests/manipulation/man_edit_element_srcip_http_1_1_xly_url_inside_element_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_1_1_xly_url_inside_element_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_2_xly_url_inside_element_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_2_xly_url_inside_element_mark.py index 26f38888f..26f38888f 100644 --- a/tests/manipulation/man_edit_element_srcip_http_2_xly_url_inside_element_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_2_xly_url_inside_element_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_2item_in_url_inside_element_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_2item_in_url_inside_element_mark.py index 98a8d016e..98a8d016e 100644 --- a/tests/manipulation/man_edit_element_srcip_http_2item_in_url_inside_element_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_2item_in_url_inside_element_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_8andmultisubstr_url_inside_element_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_8andmultisubstr_url_inside_element_mark.py index db5fb11d2..db5fb11d2 100644 --- a/tests/manipulation/man_edit_element_srcip_http_8andmultisubstr_url_inside_element_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_8andmultisubstr_url_inside_element_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_pre_url_inside_element_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_pre_url_inside_element_mark.py index 463d5aceb..463d5aceb 100644 --- a/tests/manipulation/man_edit_element_srcip_http_pre_url_inside_element_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_pre_url_inside_element_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_sub_url_sub_fqdn_sub_reqheader_by_ua_sub_resheader_by_ct_wholefilemark.py b/tests/manipulation/man_modify_editelement_srcip_http_sub_url_sub_fqdn_sub_reqheader_sub_resheader_wholefilemark.py index 786c8efd7..786c8efd7 100644 --- a/tests/manipulation/man_edit_element_srcip_http_sub_url_sub_fqdn_sub_reqheader_by_ua_sub_resheader_by_ct_wholefilemark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_sub_url_sub_fqdn_sub_reqheader_sub_resheader_wholefilemark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_2item_in_reqbody_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_2item_in_reqbody_whole_file_mark.py index 2516ead36..2516ead36 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_2item_in_reqbody_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_2item_in_reqbody_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_2item_in_reqheader_by_ua_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_2item_in_reqheader_by_ua_whole_file_mark.py index 7796bba0a..7796bba0a 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_2item_in_reqheader_by_ua_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_2item_in_reqheader_by_ua_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_2item_in_resheader_by_ct_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_2item_in_resheader_by_ct_whole_file_mark.py index 493e5b5b1..493e5b5b1 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_2item_in_resheader_by_ct_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_2item_in_resheader_by_ct_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_whole_file_mark.py index d4553f545..d4553f545 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_whole_file_mark.py index ad7367d4c..ad7367d4c 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_inside_element_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_inside_element_mark.py index a3b0d2f39..a3b0d2f39 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_inside_element_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_inside_element_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_inside_element_mark_inside_element_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_inside_element_mark_inside_element_mark.py index 251f5f51c..251f5f51c 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_inside_element_mark_inside_element_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_inside_element_mark_inside_element_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_inside_element_remove.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_inside_element_remove.py index d40bda06f..d40bda06f 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_inside_element_remove.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_inside_element_remove.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_pre_reqheader_by_cookie_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_pre_reqheader_by_cookie_whole_file_mark.py index 53031523c..53031523c 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_pre_reqheader_by_cookie_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_pre_reqheader_by_cookie_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_pre_reqheader_by_ua_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_pre_reqheader_by_ua_whole_file_mark.py index 7c9609814..7c9609814 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_pre_reqheader_by_ua_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_pre_reqheader_by_ua_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_pre_resheader_by_ct_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_pre_resheader_by_ct_whole_file_mark.py index 8d1e6597d..8d1e6597d 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_pre_resheader_by_ct_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_pre_resheader_by_ct_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqbody_hex_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqbody_hex_whole_file_mark.py index 34694e47c..34694e47c 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqbody_hex_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqbody_hex_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqbody_regex_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqbody_regex_whole_file_mark.py index 875aded8a..875aded8a 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqbody_regex_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqbody_regex_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqbody_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqbody_whole_file_mark.py index b5c7c8c09..b5c7c8c09 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqbody_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqbody_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqheader_by_ua_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqheader_by_ua_whole_file_mark.py index 773df6e8c..773df6e8c 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqheader_by_ua_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqheader_by_ua_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqheader_hex_by_ua_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqheader_hex_by_ua_whole_file_mark.py index fd02a74e6..fd02a74e6 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqheader_hex_by_ua_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqheader_hex_by_ua_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqheader_regex_by_ua_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqheader_regex_by_ua_whole_file_mark.py index 733f46974..733f46974 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_reqheader_regex_by_ua_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_reqheader_regex_by_ua_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_resheader_by_ct_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_resheader_by_ct_whole_file_mark.py index e606a8747..e606a8747 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_resheader_by_ct_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_resheader_by_ct_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_resheader_by_setcookie_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_resheader_by_setcookie_whole_file_mark.py index 0a465ddc8..0a465ddc8 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_resheader_by_setcookie_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_resheader_by_setcookie_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_resheader_hex_by_setcookie_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_resheader_hex_by_setcookie_whole_file_mark.py index e3f89a871..e3f89a871 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_resheader_hex_by_setcookie_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_resheader_hex_by_setcookie_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_resheader_regex_by_ct_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_resheader_regex_by_ct_whole_file_mark.py index 6a43b622e..6a43b622e 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_substr_resheader_regex_by_ct_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_substr_resheader_regex_by_ct_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_suff_reqheader_by_ua_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_suff_reqheader_by_ua_whole_file_mark.py index 7ace196f5..7ace196f5 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_suff_reqheader_by_ua_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_suff_reqheader_by_ua_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_suff_resheader_by_ct_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_suff_resheader_by_ct_whole_file_mark.py index 45e592ed7..45e592ed7 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_suff_resheader_by_ct_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_suff_resheader_by_ct_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_mark.py index 4ad7f7176..4ad7f7176 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_mark_devicegroup.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_mark_devicegroup.py index 8014ac43a..8014ac43a 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_mark_devicegroup.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_mark_devicegroup.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_mark_logall.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_mark_logall.py index 961c60f89..961c60f89 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_mark_logall.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_mark_logall.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_mark_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_mark_whole_file_mark.py index 11a0a8669..11a0a8669 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_mark_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_mark_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_remove.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_remove.py index 641f99e19..641f99e19 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_whole_file_remove.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_whole_file_remove.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_xly_reqheader_by_ua_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_xly_reqheader_by_ua_whole_file_mark.py index 7b463136a..7b463136a 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_xly_reqheader_by_ua_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_xly_reqheader_by_ua_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_substr_url_xly_resheader_by_ct_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_xly_resheader_by_ct_whole_file_mark.py index 79145e599..79145e599 100644 --- a/tests/manipulation/man_edit_element_srcip_http_substr_url_xly_resheader_by_ct_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_substr_url_xly_resheader_by_ct_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_suff_url_inside_element_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_suff_url_inside_element_mark.py index a19e9749b..a19e9749b 100644 --- a/tests/manipulation/man_edit_element_srcip_http_suff_url_inside_element_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_suff_url_inside_element_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_http_xly_url_inside_element_mark.py b/tests/manipulation/man_modify_editelement_srcip_http_xly_url_inside_element_mark.py index dd619db49..dd619db49 100644 --- a/tests/manipulation/man_edit_element_srcip_http_xly_url_inside_element_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_http_xly_url_inside_element_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_intip_http_substr_url_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_intip_http_substr_url_whole_file_mark.py index 961c60f89..961c60f89 100644 --- a/tests/manipulation/man_edit_element_srcip_intip_http_substr_url_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_intip_http_substr_url_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_pre_fqdn_http_substr_url_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_pre_fqdn_http_substr_url_whole_file_mark.py index 8f20e0831..8f20e0831 100644 --- a/tests/manipulation/man_edit_element_srcip_pre_fqdn_http_substr_url_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_pre_fqdn_http_substr_url_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_subid_http_substr_url_inside_element_remove.py b/tests/manipulation/man_modify_editelement_srcip_subid_http_substr_url_inside_element_remove.py index 877494de2..877494de2 100644 --- a/tests/manipulation/man_edit_element_srcip_subid_http_substr_url_inside_element_remove.py +++ b/tests/manipulation/man_modify_editelement_srcip_subid_http_substr_url_inside_element_remove.py diff --git a/tests/manipulation/man_edit_element_srcip_subid_http_substr_url_substr_reqbody_hex_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_subid_http_substr_url_substr_reqbody_hex_whole_file_mark.py index 2053fddbf..2053fddbf 100644 --- a/tests/manipulation/man_edit_element_srcip_subid_http_substr_url_substr_reqbody_hex_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_subid_http_substr_url_substr_reqbody_hex_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_subid_xly_fqdn_http_substr_url_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_subid_xly_fqdn_http_substr_url_whole_file_mark.py index 656e77126..656e77126 100644 --- a/tests/manipulation/man_edit_element_srcip_subid_xly_fqdn_http_substr_url_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_subid_xly_fqdn_http_substr_url_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_substr_fqdn_http_substr_url_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_substr_fqdn_http_substr_url_whole_file_mark.py index a36303b32..a36303b32 100644 --- a/tests/manipulation/man_edit_element_srcip_substr_fqdn_http_substr_url_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_substr_fqdn_http_substr_url_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_suff_fqdn_http_substr_url_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_suff_fqdn_http_substr_url_whole_file_mark.py index 6dda8b8ae..6dda8b8ae 100644 --- a/tests/manipulation/man_edit_element_srcip_suff_fqdn_http_substr_url_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_suff_fqdn_http_substr_url_whole_file_mark.py diff --git a/tests/manipulation/man_edit_element_srcip_xly_fqdn_http_substr_url_whole_file_mark.py b/tests/manipulation/man_modify_editelement_srcip_xly_fqdn_http_substr_url_whole_file_mark.py index 876b8cff6..876b8cff6 100644 --- a/tests/manipulation/man_edit_element_srcip_xly_fqdn_http_substr_url_whole_file_mark.py +++ b/tests/manipulation/man_modify_editelement_srcip_xly_fqdn_http_substr_url_whole_file_mark.py diff --git a/tests/manipulation/man_insert_srcip_http_2item_in_url_css.py b/tests/manipulation/man_modify_injectcss_srcip_http_2item_in_url.py index cc9bc4d2c..cc9bc4d2c 100644 --- a/tests/manipulation/man_insert_srcip_http_2item_in_url_css.py +++ b/tests/manipulation/man_modify_injectcss_srcip_http_2item_in_url.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_css.py b/tests/manipulation/man_modify_injectcss_srcip_http_substr_url.py index 06179b99c..06179b99c 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_css.py +++ b/tests/manipulation/man_modify_injectcss_srcip_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_css_datacenter.py b/tests/manipulation/man_modify_injectcss_srcip_http_substr_url_datacenter.py index 699914dfa..699914dfa 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_css_datacenter.py +++ b/tests/manipulation/man_modify_injectcss_srcip_http_substr_url_datacenter.py diff --git a/tests/manipulation/man_insert_srcip_2item_in_fqdn_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_2item_in_fqdn_http_substr_url.py index 547c675c6..547c675c6 100644 --- a/tests/manipulation/man_insert_srcip_2item_in_fqdn_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_2item_in_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_dstip_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_dstip_http_substr_url.py index 9029a56f4..9029a56f4 100644 --- a/tests/manipulation/man_insert_srcip_dstip_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_dstip_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_dstport_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_dstport_http_substr_url.py index 5fb303ffa..5fb303ffa 100644 --- a/tests/manipulation/man_insert_srcip_dstport_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_dstport_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_extip_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_extip_http_substr_url.py index 934faf890..934faf890 100644 --- a/tests/manipulation/man_insert_srcip_extip_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_extip_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_extip_subid_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_extip_subid_http_substr_url.py index 4236099c3..4236099c3 100644 --- a/tests/manipulation/man_insert_srcip_extip_subid_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_extip_subid_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_extport_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_extport_http_substr_url.py index 3cb4d8772..3cb4d8772 100644 --- a/tests/manipulation/man_insert_srcip_extport_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_extport_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_http_8andmultisubstr_url_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_8andmultisubstr_url_jsbeforepageload.py index 3af1c05d8..3af1c05d8 100644 --- a/tests/manipulation/man_insert_srcip_http_8andmultisubstr_url_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_8andmultisubstr_url_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_http_pre_url_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_pre_url_jsbeforepageload.py index a6be18839..a6be18839 100644 --- a/tests/manipulation/man_insert_srcip_http_pre_url_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_pre_url_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url.py index 408ad76fb..408ad76fb 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_2item_in_reqheader_by_ua.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_2item_in_reqheader_by_ua.py index 9b7024680..9b7024680 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_2item_in_reqheader_by_ua.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_2item_in_reqheader_by_ua.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_2item_in_resheader_by_ct.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_2item_in_resheader_by_ct.py index 7726ee5f5..7726ee5f5 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_2item_in_resheader_by_ct.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_2item_in_resheader_by_ct.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_jsafterpageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_jsafterpageload.py index 3a0984f6c..3a0984f6c 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_jsafterpageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_jsafterpageload.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_jsbeforepageload.py index df5de2383..df5de2383 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_jsafterpageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_jsafterpageload.py index f514b02cd..f514b02cd 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_jsafterpageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_jsafterpageload.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_pre_reqheader_by_ua_jsafterpageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_pre_reqheader_by_ua_jsafterpageload.py index 703e44c63..703e44c63 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_pre_reqheader_by_ua_jsafterpageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_pre_reqheader_by_ua_jsafterpageload.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_pre_reqheader_by_ua_jsafterpageload_logall.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_pre_reqheader_by_ua_jsafterpageload_logall.py index 3f804fbcb..3f804fbcb 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_pre_reqheader_by_ua_jsafterpageload_logall.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_pre_reqheader_by_ua_jsafterpageload_logall.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_pre_resheader_by_ct_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_pre_resheader_by_ct_jsbeforepageload.py index 6d69b3c90..6d69b3c90 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_pre_resheader_by_ct_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_pre_resheader_by_ct_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_substr_reqheader_by_cookie.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_reqheader_by_cookie.py index 22fbfd370..22fbfd370 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_substr_reqheader_by_cookie.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_reqheader_by_cookie.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_substr_reqheader_by_ua.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_reqheader_by_ua.py index bd74412da..bd74412da 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_substr_reqheader_by_ua.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_reqheader_by_ua.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_substr_reqheader_hex_by_cookie.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_reqheader_hex_by_cookie.py index 3d843f220..3d843f220 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_substr_reqheader_hex_by_cookie.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_reqheader_hex_by_cookie.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_substr_reqheader_regex_by_ua.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_reqheader_regex_by_ua.py index 10f091bb2..10f091bb2 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_substr_reqheader_regex_by_ua.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_reqheader_regex_by_ua.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_substr_resheader_by_ct.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_resheader_by_ct.py index fe3062caf..fe3062caf 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_substr_resheader_by_ct.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_resheader_by_ct.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_substr_resheader_by_setcookie.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_resheader_by_setcookie.py index e7398df04..e7398df04 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_substr_resheader_by_setcookie.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_resheader_by_setcookie.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_substr_resheader_hex_by_setcookie.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_resheader_hex_by_setcookie.py index 00bad4cea..00bad4cea 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_substr_resheader_hex_by_setcookie.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_resheader_hex_by_setcookie.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_substr_resheader_regex_by_ct.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_resheader_regex_by_ct.py index 5541e7175..5541e7175 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_substr_resheader_regex_by_ct.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_substr_resheader_regex_by_ct.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_suff_reqheader_by_ua_jsafterpageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_suff_reqheader_by_ua_jsafterpageload.py index 03a7dc32c..03a7dc32c 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_suff_reqheader_by_ua_jsafterpageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_suff_reqheader_by_ua_jsafterpageload.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_suff_resheader_by_ct_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_suff_resheader_by_ct_jsbeforepageload.py index 1a6319fa8..1a6319fa8 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_suff_resheader_by_ct_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_suff_resheader_by_ct_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_xly_reqheader_by_ua_jsafterpageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_xly_reqheader_by_ua_jsafterpageload.py index c71d0249c..c71d0249c 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_xly_reqheader_by_ua_jsafterpageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_xly_reqheader_by_ua_jsafterpageload.py diff --git a/tests/manipulation/man_insert_srcip_http_substr_url_xly_resheader_by_ct_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_xly_resheader_by_ct_jsbeforepageload.py index ac76ee7e2..ac76ee7e2 100644 --- a/tests/manipulation/man_insert_srcip_http_substr_url_xly_resheader_by_ct_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_substr_url_xly_resheader_by_ct_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_http_suff_url_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_suff_url_jsbeforepageload.py index ee10d9111..ee10d9111 100644 --- a/tests/manipulation/man_insert_srcip_http_suff_url_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_suff_url_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_http_xly_url_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_http_xly_url_jsbeforepageload.py index a3dda1550..a3dda1550 100644 --- a/tests/manipulation/man_insert_srcip_http_xly_url_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_http_xly_url_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_intip_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_intip_http_substr_url.py index 0fab20175..0fab20175 100644 --- a/tests/manipulation/man_insert_srcip_intip_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_intip_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_intport_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_intport_http_substr_url.py index f8202e5cc..f8202e5cc 100644 --- a/tests/manipulation/man_insert_srcip_intport_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_intport_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_pre_fqdn_http_substr_url_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_pre_fqdn_http_substr_url_jsbeforepageload.py index c204794b9..c204794b9 100644 --- a/tests/manipulation/man_insert_srcip_pre_fqdn_http_substr_url_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_pre_fqdn_http_substr_url_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_srcport_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_srcport_http_substr_url.py index 132e10a38..132e10a38 100644 --- a/tests/manipulation/man_insert_srcip_srcport_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_srcport_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_subid_http_substr_url_pre_reqheader_by_ua_jsafterpageload.py b/tests/manipulation/man_modify_injectjs_srcip_subid_http_substr_url_pre_reqheader_by_ua_jsafterpageload.py index b5d33cfa5..b5d33cfa5 100644 --- a/tests/manipulation/man_insert_srcip_subid_http_substr_url_pre_reqheader_by_ua_jsafterpageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_subid_http_substr_url_pre_reqheader_by_ua_jsafterpageload.py diff --git a/tests/manipulation/man_insert_srcip_subid_http_substr_url_substr_resheader_by_ct.py b/tests/manipulation/man_modify_injectjs_srcip_subid_http_substr_url_substr_resheader_by_ct.py index 7be009e00..7be009e00 100644 --- a/tests/manipulation/man_insert_srcip_subid_http_substr_url_substr_resheader_by_ct.py +++ b/tests/manipulation/man_modify_injectjs_srcip_subid_http_substr_url_substr_resheader_by_ct.py diff --git a/tests/manipulation/man_insert_srcip_substr_fqdn_http_substr_url.py b/tests/manipulation/man_modify_injectjs_srcip_substr_fqdn_http_substr_url.py index 2a3f62ced..2a3f62ced 100644 --- a/tests/manipulation/man_insert_srcip_substr_fqdn_http_substr_url.py +++ b/tests/manipulation/man_modify_injectjs_srcip_substr_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_insert_srcip_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py b/tests/manipulation/man_modify_injectjs_srcip_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py index 4fe16db30..4fe16db30 100644 --- a/tests/manipulation/man_insert_srcip_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py +++ b/tests/manipulation/man_modify_injectjs_srcip_substr_fqdn_http_substr_url_substr_reqheader_by_ua_substr_resheader_by_ct.py diff --git a/tests/manipulation/man_insert_srcip_suff_fqdn_http_substr_url_jsbeforepageload.py b/tests/manipulation/man_modify_injectjs_srcip_suff_fqdn_http_substr_url_jsbeforepageload.py index b239b4bec..b239b4bec 100644 --- a/tests/manipulation/man_insert_srcip_suff_fqdn_http_substr_url_jsbeforepageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_suff_fqdn_http_substr_url_jsbeforepageload.py diff --git a/tests/manipulation/man_insert_srcip_xly_fqdn_http_substr_url_jsafterpageload.py b/tests/manipulation/man_modify_injectjs_srcip_xly_fqdn_http_substr_url_jsafterpageload.py index f69acc1c3..f69acc1c3 100644 --- a/tests/manipulation/man_insert_srcip_xly_fqdn_http_substr_url_jsafterpageload.py +++ b/tests/manipulation/man_modify_injectjs_srcip_xly_fqdn_http_substr_url_jsafterpageload.py diff --git a/tests/manipulation/man_hijack_srcip_2item_in_fqdn_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_2item_in_fqdn_http_substr_url.py index a3e424e8d..a3e424e8d 100644 --- a/tests/manipulation/man_hijack_srcip_2item_in_fqdn_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_2item_in_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_dstip_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_dstip_http_substr_url.py index 7e872e915..7e872e915 100644 --- a/tests/manipulation/man_hijack_srcip_dstip_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_dstip_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_dstport_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_dstport_http_substr_url.py index 21ea384e4..21ea384e4 100644 --- a/tests/manipulation/man_hijack_srcip_dstport_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_dstport_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_extip_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_extip_http_substr_url.py index ddf5892c8..ddf5892c8 100644 --- a/tests/manipulation/man_hijack_srcip_extip_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_extip_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_extport_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_extport_http_substr_url.py index 75e264c77..75e264c77 100644 --- a/tests/manipulation/man_hijack_srcip_extport_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_extport_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_http_1_1_pre_url.py b/tests/manipulation/man_modify_replacefile_srcip_http_1_1_pre_url.py index 0c788dd79..0c788dd79 100644 --- a/tests/manipulation/man_hijack_srcip_http_1_1_pre_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_1_1_pre_url.py diff --git a/tests/manipulation/man_hijack_srcip_http_2_pre_url.py b/tests/manipulation/man_modify_replacefile_srcip_http_2_pre_url.py index 1f2e615ae..1f2e615ae 100644 --- a/tests/manipulation/man_hijack_srcip_http_2_pre_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_2_pre_url.py diff --git a/tests/manipulation/man_hijack_srcip_http_2item_in_url.py b/tests/manipulation/man_modify_replacefile_srcip_http_2item_in_url.py index 1a2704fb6..1a2704fb6 100644 --- a/tests/manipulation/man_hijack_srcip_http_2item_in_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_2item_in_url.py diff --git a/tests/manipulation/man_hijack_srcip_http_8andmultisubstr_url.py b/tests/manipulation/man_modify_replacefile_srcip_http_8andmultisubstr_url.py index f446c661b..f446c661b 100644 --- a/tests/manipulation/man_hijack_srcip_http_8andmultisubstr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_8andmultisubstr_url.py diff --git a/tests/manipulation/man_hijack_srcip_http_pre_url.py b/tests/manipulation/man_modify_replacefile_srcip_http_pre_url.py index b252eb078..b252eb078 100644 --- a/tests/manipulation/man_hijack_srcip_http_pre_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_pre_url.py diff --git a/tests/manipulation/man_hijack_srcip_http_sub_fqdn_sub_url_sub_reqheader_by_ua_sub_resheader_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_http_sub_fqdn_sub_url_sub_reqheader_by_ua_sub_resheader_by_ct.py index d637ff367..d637ff367 100644 --- a/tests/manipulation/man_hijack_srcip_http_sub_fqdn_sub_url_sub_reqheader_by_ua_sub_resheader_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_sub_fqdn_sub_url_sub_reqheader_by_ua_sub_resheader_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url.py index e721dfbeb..e721dfbeb 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_2item_in_reqheader_by_ua.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_2item_in_reqheader_by_ua.py index f2a98f309..f2a98f309 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_2item_in_reqheader_by_ua.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_2item_in_reqheader_by_ua.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_2item_in_resheader_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_2item_in_resheader_by_ct.py index ebb3b54c4..ebb3b54c4 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_2item_in_resheader_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_2item_in_resheader_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua.py index 4585cff94..4585cff94 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_8andmultisubstr_resheader_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_8andmultisubstr_resheader_by_ct.py index 786c4fc2d..786c4fc2d 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_8andmultisubstr_resheader_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_8andmultisubstr_resheader_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_datacenter.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_datacenter.py index cc8adb922..cc8adb922 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_datacenter.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_datacenter.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackapk.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefileapk.py index bea4fb491..bea4fb491 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackapk.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefileapk.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackexe.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefileexe.py index 7dc64208b..7dc64208b 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackexe.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefileexe.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackgif.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefilegif.py index 0e34241ae..0e34241ae 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackgif.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefilegif.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackjpeg.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefilejpeg.py index c1ecdce2f..c1ecdce2f 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackjpeg.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefilejpeg.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackpng.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefilepng.py index d9326bb25..d9326bb25 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_hijackpng.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefilepng.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_hijacksvg.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefilesvg.py index 0f31b08c5..0f31b08c5 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_hijacksvg.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_modify_replacefilesvg.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_pre_reqheader_by_ua.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_pre_reqheader_by_ua.py index 74d30a02d..74d30a02d 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_pre_reqheader_by_ua.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_pre_reqheader_by_ua.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_pre_resheader_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_pre_resheader_by_ct.py index 82c421223..82c421223 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_pre_resheader_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_pre_resheader_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_reqheader_by_cookie.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_reqheader_by_cookie.py index 462bb95f6..462bb95f6 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_reqheader_by_cookie.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_reqheader_by_cookie.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_reqheader_by_ua.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_reqheader_by_ua.py index 2b7db98ea..2b7db98ea 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_reqheader_by_ua.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_reqheader_by_ua.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_reqheader_hex_by_ua.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_reqheader_hex_by_ua.py index db73d916b..db73d916b 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_reqheader_hex_by_ua.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_reqheader_hex_by_ua.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_reqheader_regex_by_ua.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_reqheader_regex_by_ua.py index 2894e493d..2894e493d 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_reqheader_regex_by_ua.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_reqheader_regex_by_ua.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_resheader_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_resheader_by_ct.py index 69544fca8..69544fca8 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_resheader_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_resheader_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_resheader_by_setcookie.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_resheader_by_setcookie.py index aba81ced2..aba81ced2 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_resheader_by_setcookie.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_resheader_by_setcookie.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_resheader_hex_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_resheader_hex_by_ct.py index 0614374f4..0614374f4 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_resheader_hex_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_resheader_hex_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_resheader_regex_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_resheader_regex_by_ct.py index 16e79ca6c..16e79ca6c 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_substr_resheader_regex_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_substr_resheader_regex_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_suff_reqheader_by_ua.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_suff_reqheader_by_ua.py index 3ec7e0120..3ec7e0120 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_suff_reqheader_by_ua.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_suff_reqheader_by_ua.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_suff_resheader_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_suff_resheader_by_ct.py index 9efb45630..9efb45630 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_suff_resheader_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_suff_resheader_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_xly_reqheader_by_ua.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_xly_reqheader_by_ua.py index 05c8236ca..05c8236ca 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_xly_reqheader_by_ua.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_xly_reqheader_by_ua.py diff --git a/tests/manipulation/man_hijack_srcip_http_substr_url_xly_resheader_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_xly_resheader_by_ct.py index 4667ccce0..4667ccce0 100644 --- a/tests/manipulation/man_hijack_srcip_http_substr_url_xly_resheader_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_substr_url_xly_resheader_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_http_suff_url.py b/tests/manipulation/man_modify_replacefile_srcip_http_suff_url.py index f134eb870..f134eb870 100644 --- a/tests/manipulation/man_hijack_srcip_http_suff_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_suff_url.py diff --git a/tests/manipulation/man_hijack_srcip_http_xly_url.py b/tests/manipulation/man_modify_replacefile_srcip_http_xly_url.py index 76b18f8b7..76b18f8b7 100644 --- a/tests/manipulation/man_hijack_srcip_http_xly_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_http_xly_url.py diff --git a/tests/manipulation/man_hijack_srcip_intip_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_intip_http_substr_url.py index 5b56ea43a..5b56ea43a 100644 --- a/tests/manipulation/man_hijack_srcip_intip_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_intip_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_intport_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_intport_http_substr_url.py index b0f184b56..b0f184b56 100644 --- a/tests/manipulation/man_hijack_srcip_intport_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_intport_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_pre_fqdn_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_pre_fqdn_http_substr_url.py index d2d815315..d2d815315 100644 --- a/tests/manipulation/man_hijack_srcip_pre_fqdn_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_pre_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_srcport_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_srcport_http_substr_url.py index 30ba6886e..30ba6886e 100644 --- a/tests/manipulation/man_hijack_srcip_srcport_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_srcport_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_subid_http_sub_fqdn_sub_url_sub_reqheader_by_ua_sub_resheader_by_ct.py b/tests/manipulation/man_modify_replacefile_srcip_subid_http_sub_fqdn_sub_url_sub_reqheader_by_ua_sub_resheader_by_ct.py index ba6d01f27..ba6d01f27 100644 --- a/tests/manipulation/man_hijack_srcip_subid_http_sub_fqdn_sub_url_sub_reqheader_by_ua_sub_resheader_by_ct.py +++ b/tests/manipulation/man_modify_replacefile_srcip_subid_http_sub_fqdn_sub_url_sub_reqheader_by_ua_sub_resheader_by_ct.py diff --git a/tests/manipulation/man_hijack_srcip_subid_http_substr_url_hijackgif.py b/tests/manipulation/man_modify_replacefile_srcip_subid_http_substr_url_modify_replacefilegif.py index 9d75ce355..9d75ce355 100644 --- a/tests/manipulation/man_hijack_srcip_subid_http_substr_url_hijackgif.py +++ b/tests/manipulation/man_modify_replacefile_srcip_subid_http_substr_url_modify_replacefilegif.py diff --git a/tests/manipulation/man_hijack_srcip_subid_http_substr_url_substr_reqheader_hex_by_ua.py b/tests/manipulation/man_modify_replacefile_srcip_subid_http_substr_url_substr_reqheader_hex_by_ua.py index 0de0d79d6..0de0d79d6 100644 --- a/tests/manipulation/man_hijack_srcip_subid_http_substr_url_substr_reqheader_hex_by_ua.py +++ b/tests/manipulation/man_modify_replacefile_srcip_subid_http_substr_url_substr_reqheader_hex_by_ua.py diff --git a/tests/manipulation/man_hijack_srcip_subid_http_substr_url_substr_resheader_by_setcookie.py b/tests/manipulation/man_modify_replacefile_srcip_subid_http_substr_url_substr_resheader_by_setcookie.py index 609507cf4..609507cf4 100644 --- a/tests/manipulation/man_hijack_srcip_subid_http_substr_url_substr_resheader_by_setcookie.py +++ b/tests/manipulation/man_modify_replacefile_srcip_subid_http_substr_url_substr_resheader_by_setcookie.py diff --git a/tests/manipulation/man_hijack_srcip_substr_fqdn_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_substr_fqdn_http_substr_url.py index 0c44751c7..0c44751c7 100644 --- a/tests/manipulation/man_hijack_srcip_substr_fqdn_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_substr_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_suff_fqdn_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_suff_fqdn_http_substr_url.py index 3178ae741..3178ae741 100644 --- a/tests/manipulation/man_hijack_srcip_suff_fqdn_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_suff_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_hijack_srcip_xly_fqdn_http_substr_url.py b/tests/manipulation/man_modify_replacefile_srcip_xly_fqdn_http_substr_url.py index 39661bcce..39661bcce 100644 --- a/tests/manipulation/man_hijack_srcip_xly_fqdn_http_substr_url.py +++ b/tests/manipulation/man_modify_replacefile_srcip_xly_fqdn_http_substr_url.py diff --git a/tests/manipulation/man_replace_srcip_2item_in_fqdn_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_2item_in_fqdn_http_substr_url_search_in_uri.py index 52583d216..52583d216 100644 --- a/tests/manipulation/man_replace_srcip_2item_in_fqdn_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_2item_in_fqdn_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_dstport_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_dstport_http_substr_url_search_in_uri.py index 5c161f1b9..5c161f1b9 100644 --- a/tests/manipulation/man_replace_srcip_dstport_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_dstport_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_extport_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_extport_http_substr_url_search_in_uri.py index a94d8ff3b..a94d8ff3b 100644 --- a/tests/manipulation/man_replace_srcip_extport_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_extport_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_2item_in_url_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_2item_in_url_search_in_response_body.py index ff9ecb667..ff9ecb667 100644 --- a/tests/manipulation/man_replace_srcip_http_2item_in_url_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_2item_in_url_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_8andmultisubstr_url_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_8andmultisubstr_url_search_in_response_body.py index 2473ec5a3..2473ec5a3 100644 --- a/tests/manipulation/man_replace_srcip_http_8andmultisubstr_url_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_8andmultisubstr_url_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_pre_url_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_pre_url_search_in_response_body.py index f55e3fdb5..f55e3fdb5 100644 --- a/tests/manipulation/man_replace_srcip_http_pre_url_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_pre_url_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_2item_in_reqheader_by_ua_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_2item_in_reqheader_by_ua_search_in_uri.py index dba6c7dad..dba6c7dad 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_2item_in_reqheader_by_ua_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_2item_in_reqheader_by_ua_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_2item_in_resheader_by_ct_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_2item_in_resheader_by_ct_search_in_response_body.py index 562d05720..562d05720 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_2item_in_resheader_by_ct_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_2item_in_resheader_by_ct_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_search_in_uri.py index 71504891e..71504891e 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_8andmultisubstr_reqheader_by_ua_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_search_in_response_body.py index cfcc228c4..cfcc228c4 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_8andmultisubstr_resheader_by_ct_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_pre_reqheader_by_ua_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_pre_reqheader_by_ua_search_in_uri.py index 4034c832e..4034c832e 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_pre_reqheader_by_ua_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_pre_reqheader_by_ua_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_pre_reqheader_by_ua_search_in_uri_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_pre_reqheader_by_ua_search_in_uri_response_body.py index 6efeb5cb9..6efeb5cb9 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_pre_reqheader_by_ua_search_in_uri_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_pre_reqheader_by_ua_search_in_uri_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_pre_resheader_by_ct_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_pre_resheader_by_ct_search_in_response_body.py index 44c3bf164..44c3bf164 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_pre_resheader_by_ct_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_pre_resheader_by_ct_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_request_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_request_body.py index 61450b264..61450b264 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_request_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_request_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_request_header.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_request_header.py index 2e546f988..2e546f988 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_request_header.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_request_header.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_response_body.py index 1de73e0cd..1de73e0cd 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_response_body_2.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_response_body_2.py index c4073f5cb..c4073f5cb 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_response_body_2.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_response_body_2.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_response_header.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_response_header.py index 56ab19d63..56ab19d63 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_response_header.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_response_header.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_uri.py index e87c7dc88..e87c7dc88 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_regex_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_regex_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_body.py index acd266f99..acd266f99 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_body_and_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_body_and_response_body.py index 6ea4fe3df..6ea4fe3df 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_body_and_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_body_and_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_body_logall.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_body_logall.py index c7b4079ea..c7b4079ea 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_body_logall.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_body_logall.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_header.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_header.py index d2ebc3345..d2ebc3345 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_header.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_header.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_header_and_response_header.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_header_and_response_header.py index d3be8863c..d3be8863c 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_header_and_response_header.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_header_and_response_header.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_header_request_body_and_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_header_request_body_and_response_body.py index d4194eb60..d4194eb60 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_request_header_request_body_and_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_request_header_request_body_and_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_response_body.py index 128da63ee..128da63ee 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_response_header.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_response_header.py index a4e375908..a4e375908 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_response_header.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_response_header.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_uri.py index 87e52d2da..87e52d2da 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_substr_reqheader_by_ua_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_reqheader_by_ua_search_in_uri.py index 80f15357b..80f15357b 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_substr_reqheader_by_ua_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_reqheader_by_ua_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_substr_reqheader_hex_by_ua_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_reqheader_hex_by_ua_search_in_uri.py index 7c161739e..7c161739e 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_substr_reqheader_hex_by_ua_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_reqheader_hex_by_ua_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_substr_reqheader_regex_by_ua_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_reqheader_regex_by_ua_search_in_uri.py index cfab3af9f..cfab3af9f 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_substr_reqheader_regex_by_ua_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_reqheader_regex_by_ua_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_substr_resheader_by_ct_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_resheader_by_ct_search_in_response_body.py index 5d30a8207..5d30a8207 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_substr_resheader_by_ct_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_resheader_by_ct_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_substr_resheader_hex_by_ct_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_resheader_hex_by_ct_search_in_response_body.py index 872e4b5e2..872e4b5e2 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_substr_resheader_hex_by_ct_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_resheader_hex_by_ct_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_substr_resheader_regex_by_ct_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_resheader_regex_by_ct_search_in_response_body.py index 11a9d4f4f..11a9d4f4f 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_substr_resheader_regex_by_ct_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_substr_resheader_regex_by_ct_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_suff_reqheader_by_ua_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_suff_reqheader_by_ua_search_in_uri.py index d2e0ffaa5..d2e0ffaa5 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_suff_reqheader_by_ua_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_suff_reqheader_by_ua_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_suff_resheader_by_ct_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_suff_resheader_by_ct_search_in_response_body.py index a42180fa1..a42180fa1 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_suff_resheader_by_ct_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_suff_resheader_by_ct_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_xly_reqheader_by_ua_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_xly_reqheader_by_ua_search_in_uri.py index 6e5a21a54..6e5a21a54 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_xly_reqheader_by_ua_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_xly_reqheader_by_ua_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_http_substr_url_xly_resheader_by_ct_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_xly_resheader_by_ct_search_in_response_body.py index 3e9313877..3e9313877 100644 --- a/tests/manipulation/man_replace_srcip_http_substr_url_xly_resheader_by_ct_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_substr_url_xly_resheader_by_ct_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_suff_url_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_suff_url_search_in_response_body.py index 8c6824ea5..8c6824ea5 100644 --- a/tests/manipulation/man_replace_srcip_http_suff_url_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_suff_url_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_http_suff_url_search_in_response_body_datacenter.py b/tests/manipulation/man_modify_replacetext_srcip_http_suff_url_search_in_response_body_datacenter.py index 1a9711352..1a9711352 100644 --- a/tests/manipulation/man_replace_srcip_http_suff_url_search_in_response_body_datacenter.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_suff_url_search_in_response_body_datacenter.py diff --git a/tests/manipulation/man_replace_srcip_http_xly_url_search_in_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_http_xly_url_search_in_response_body.py index aa2337b18..aa2337b18 100644 --- a/tests/manipulation/man_replace_srcip_http_xly_url_search_in_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_http_xly_url_search_in_response_body.py diff --git a/tests/manipulation/man_replace_srcip_intip_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_intip_http_substr_url_search_in_uri.py index b5416d9ce..b5416d9ce 100644 --- a/tests/manipulation/man_replace_srcip_intip_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_intip_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_intport_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_intport_http_substr_url_search_in_uri.py index 9e579be5d..9e579be5d 100644 --- a/tests/manipulation/man_replace_srcip_intport_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_intport_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_pre_fqdn_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_pre_fqdn_http_substr_url_search_in_uri.py index 7893eb047..7893eb047 100644 --- a/tests/manipulation/man_replace_srcip_pre_fqdn_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_pre_fqdn_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_srcport_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_srcport_http_substr_url_search_in_uri.py index 1c1ba5a25..1c1ba5a25 100644 --- a/tests/manipulation/man_replace_srcip_srcport_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_srcport_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_subid_http_substr_url_search_in_regex_uri.py b/tests/manipulation/man_modify_replacetext_srcip_subid_http_substr_url_search_in_regex_uri.py index b51c6c8ea..b51c6c8ea 100644 --- a/tests/manipulation/man_replace_srcip_subid_http_substr_url_search_in_regex_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_subid_http_substr_url_search_in_regex_uri.py diff --git a/tests/manipulation/man_replace_srcip_subid_http_substr_url_search_in_request_header_request_body_and_response_body.py b/tests/manipulation/man_modify_replacetext_srcip_subid_http_substr_url_search_in_request_header_body_response_body.py index 9f34c47a8..9f34c47a8 100644 --- a/tests/manipulation/man_replace_srcip_subid_http_substr_url_search_in_request_header_request_body_and_response_body.py +++ b/tests/manipulation/man_modify_replacetext_srcip_subid_http_substr_url_search_in_request_header_body_response_body.py diff --git a/tests/manipulation/man_replace_srcip_subid_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_subid_http_substr_url_search_in_uri.py index c8660cfc3..c8660cfc3 100644 --- a/tests/manipulation/man_replace_srcip_subid_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_subid_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_subid_http_substr_url_substr_reqheader_regex_by_ua_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_subid_http_substr_url_substr_reqheader_regex_by_ua_search_in_uri.py index 2466ec53b..2466ec53b 100644 --- a/tests/manipulation/man_replace_srcip_subid_http_substr_url_substr_reqheader_regex_by_ua_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_subid_http_substr_url_substr_reqheader_regex_by_ua_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_substr_fqdn_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_substr_fqdn_http_substr_url_search_in_uri.py index 63721d2cc..63721d2cc 100644 --- a/tests/manipulation/man_replace_srcip_substr_fqdn_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_substr_fqdn_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_suff_fqdn_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_suff_fqdn_http_substr_url_search_in_uri.py index 0209b79fb..0209b79fb 100644 --- a/tests/manipulation/man_replace_srcip_suff_fqdn_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_suff_fqdn_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/man_replace_srcip_xly_fqdn_http_substr_url_search_in_uri.py b/tests/manipulation/man_modify_replacetext_srcip_xly_fqdn_http_substr_url_search_in_uri.py index 92ec6fd16..92ec6fd16 100644 --- a/tests/manipulation/man_replace_srcip_xly_fqdn_http_substr_url_search_in_uri.py +++ b/tests/manipulation/man_modify_replacetext_srcip_xly_fqdn_http_substr_url_search_in_uri.py diff --git a/tests/manipulation/test.py b/tests/manipulation/test.py index a37526aa3..cae280746 100644 --- a/tests/manipulation/test.py +++ b/tests/manipulation/test.py @@ -380,6 +380,7 @@ def replace_test_data_from_py_2(case_directory_path='C:/zcw/tsg_test/tests/目� faile_path = os.path.join(case_directory_path, name) print(faile_path) resource_text = "" + parameter = [] parameter = {"test_pc_ip":'2.2.2.2', "test_case_name":parameter["test_case_name"]} tmp_resource_text = copy.deepcopy(resource_text) @@ -963,18 +964,63 @@ def replace_test_data_from_py_2(case_directory_path='C:/zcw/tsg_test/tests/目� # 输出匹配的内容 #print(match_text) result_text = tmp_resource_text.replace(" replace_text", match_text) + +def re_name(case_directory_path='C:/zcw/tsg_test/tests/目录名', file_startwith = "man_"): + # 存储文件名（去掉.py后缀） + file_names = [] + # 获取目录下所有文件的名称 + # for filename in os.listdir(case_directory_path): + # if filename.endswith(file_endswith) and filename.startswith(file_startwith): + # 去掉.py后缀并添加到列表中 + # pass + # if "run_script" in filename: + # tmp = filename.replace("run_script", "execute") + # old_path = os.path.join(case_directory_path, filename) + # new_path = os.path.join(case_directory_path, tmp) + # os.rename(old_path, new_path) + # elif "man_replace_" in filename: + # tmp = filename.replace("replace", "modify_replacetext") + # old_path = os.path.join(case_directory_path, filename) + # new_path = os.path.join(case_directory_path, tmp) + # os.rename(old_path, new_path) + # elif "man_hijack" in filename: + # tmp = filename.replace("hijack", "modify_replacefile") + # old_path = os.path.join(case_directory_path, filename) + # new_path = os.path.join(case_directory_path, tmp) + # os.rename(old_path, new_path) + # elif "edit_element" in filename: + # tmp = filename.replace("edit_element", "modify_editelement") + # old_path = os.path.join(case_directory_path, filename) + # new_path = os.path.join(case_directory_path, tmp) + # os.rename(old_path, new_path) + # if "injectcss" in filename: + # tmp = filename.replace("injectcss", "injectjs") + # old_path = os.path.join(case_directory_path, filename) + # new_path = os.path.join(case_directory_path, tmp) + # os.rename(old_path, new_path) + n = 0 + for filename in os.listdir(case_directory_path): + if filename.endswith(file_endswith) and filename.startswith(file_startwith): + # 去掉.py后缀并添加到列表中 + if len(filename) - 3 > 100: + print(filename, " ======= " ,(len(filename)-3)) + n = n + 1 + print(n) + + + if __name__ == '__main__': # 定义目录和目标文件 需要调整的变量 - ms_json_path = 'C:/Users/root/Downloads/Metersphere_Api_TSG (29).json' + ms_json_path = 'C:/Users/root/Downloads/Metersphere_Api_TSG (32).json' case_directory_path = 'C:/zcw/tsg_test/tests/manipulation' file_startwith = "man_" file_endswith = ".py" # 本地运行所有用例 - local_run() + # local_run() # 对比MS工具 - # diff_ms(ms_json_path=ms_json_path, case_directory_path=case_directory_path, file_startwith=file_startwith, file_endswith=file_endswith) + diff_ms(ms_json_path=ms_json_path, case_directory_path=case_directory_path, file_startwith=file_startwith, file_endswith=file_endswith) # 生成excle使用数据工具 #get_excel_formate_from_case(case_directory_path=case_directory_path, file_startwith=file_startwith, file_endswith=file_endswith) @@ -982,7 +1028,8 @@ if __name__ == '__main__': # 替换test_data #replace_test_data_from_py(case_directory_path=case_directory_path, file_startwith=file_startwith, file_endswith=file_endswith) - + # 重命名 + #re_name(case_directory_path=case_directory_path, file_startwith=file_startwith) diff --git a/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_mirror_bypass_vlan_none.py index 2c1bc0e33..07b130fc0 100644 --- a/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -115,8 +115,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com/" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { "excepted_traffic_result": "vip", diff --git a/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 029e8fedb..fcad1386d 100644 --- a/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -228,10 +228,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_decrypted_scrip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_scrip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py index be056bef8..b09dd965c 100644 --- a/tests/service_chaining/sc_decrypted_scrip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_scrip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { @@ -228,10 +228,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_cidr_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_cidr_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py index d10f640e1..1a6c80a71 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_cidr_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_cidr_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py @@ -25,7 +25,7 @@ def run(parameter): # 测试数据 policy_configuration = { "type": "service_chaining", - "name": "sc_decrypted_scrip_fqdnblock_disabled_vxlan_activeip_bfd", + "name": os.path.basename(__file__)[:-3], "action": "service_chaining", "and_conditions": [ { @@ -145,8 +145,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.example.com/" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.example.com/" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py index bae35c70c..2bb0c492d 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py @@ -151,8 +151,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.example.com/" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.example.com/" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py index 964b9b5bf..c3a2e347f 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py @@ -145,8 +145,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.example.com/" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.example.com/" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py index 4dede594a..e0f61194b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py @@ -151,8 +151,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.example.com/" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.example.com/" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_iprange_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_iprange_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py index f58b810a1..bba67cc4d 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_iprange_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_iprange_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py @@ -145,8 +145,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.example.com/" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.example.com/" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_iprange_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_iprange_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py index a75027044..4cd1395ef 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_iprange_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_iprange_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py @@ -145,8 +145,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.example.com/" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.example.com/" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py index 8a3a2b307..8224fc268 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py @@ -151,8 +151,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.example.com/" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.example.com/" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_mirror_bypass_vlan_none.py index 2110e6218..6cc5c8def 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_mirror_bypass_vlan_none.py @@ -135,8 +135,8 @@ def run(parameter): } traffic_generation = { - "tool": "http", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.ct.cn" + "tool": "http", + "command": "curl -kv --connect-timeout 20 -m 20 http://www.ct.cn" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index a90a14174..e8e05cd02 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -136,8 +136,8 @@ def run(parameter): } traffic_generation = { - "tool": "http", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.yumi.com" + "tool": "http", + "command": "curl -kv --connect-timeout 20 -m 20 http://www.yumi.com" } verification_result = { "excepted_traffic_result": "yumi", diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py index 783125102..90672775c 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_EXTERNAL_PORT", @@ -133,12 +133,12 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { "excepted_traffic_result": "baidu", - "expected_metric": {"hits": 1}, + "expected_metric": {"hits": 0}, "expected_log": [] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py index 9751f4cf3..9addcbfe5 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_INTERNAL_PORT", @@ -134,12 +134,12 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { "excepted_traffic_result": "baidu", - "expected_metric": {"hits": 1}, + "expected_metric": {"hits": 0}, "expected_log": [] } @@ -252,7 +252,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_negate_intportbypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vlan_none.py index 6ed81c548..3129c4d9f 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vlan_none.py @@ -116,8 +116,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py index 55e6d2d72..796fe6bf0 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py @@ -112,8 +112,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_none.py index da605d9f9..63af299d8 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_none.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py index 8cbacacaa..098428b35 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py @@ -112,8 +112,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py index 8f7c7b51c..23a76ac08 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_bfd.py index e148acf90..8f0c7b6b4 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_bfd.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_none.py index b61bfe072..9524a56bf 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_none.py @@ -113,8 +113,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_disabled_vxlan_activeip_bfd.py index 4660f5549..b85a89d30 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_disabled_vxlan_activeip_bfd.py @@ -117,8 +117,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vlan_none.py index 17b22270d..bc04b0a5e 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -115,8 +115,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -234,7 +234,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_fqdnbypass_vlan_none" + "test_case_name": "sc_" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py index 6a6d5d857..37cab6a99 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py index ffe3afc56..3ea913dd7 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py @@ -113,8 +113,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_bfd.py index 42b9c1cf8..8e8642db6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_bfd.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py index b73a0dbc3..b6be95c53 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py index d9f0dc6ad..627498d24 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py index 4f046c548..a2e40b3b6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py @@ -113,8 +113,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vlan_none.py index c21435750..27f95675f 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vlan_none.py @@ -118,8 +118,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py index 6b13b895f..65eb18b80 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py @@ -115,8 +115,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py index 68e4a894f..5e2349175 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py @@ -117,8 +117,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py index 2a9871250..6e36934a5 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py @@ -115,8 +115,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py index d6e8960cb..13ab87b34 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py @@ -117,8 +117,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py index 64ef8bbe3..b56437473 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py @@ -117,8 +117,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py index 0acc6c908..5a7807169 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py @@ -116,8 +116,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py index 7589f7050..4c7cc3b28 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py @@ -117,8 +117,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py index a0fbcc7df..f839f9ead 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py @@ -119,8 +119,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py index 3220369f8..0bab21fd0 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py @@ -115,8 +115,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py index 6c341d538..172c1b400 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py @@ -116,8 +116,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py index ce60cd88b..02098ab22 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py @@ -118,8 +118,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py index 760d492ec..e1c4af223 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py @@ -117,8 +117,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py index acfa00dea..f17dd3252 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py @@ -115,8 +115,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py index a9454b9a4..c0e3f87db 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py @@ -117,8 +117,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py index 3603e6bdd..5816cdce9 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py @@ -113,8 +113,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py index 62e34ba78..9ea76bea0 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py @@ -113,8 +113,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_none.py index 6146fc481..d538f068b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_none.py @@ -112,8 +112,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py index 557bef4ac..f146b32c3 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py @@ -113,8 +113,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py index 172f60658..71ca63542 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py index ad28111b7..c553c0ea2 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py @@ -113,8 +113,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py index 1329a2f17..7cbd2cb62 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py @@ -113,8 +113,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py index a2d9cf544..928b3589a 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py @@ -111,8 +111,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 946bfe389..5e59708c2 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -114,8 +114,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py index 0c2eabf5b..e2313ef77 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py @@ -112,8 +112,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py index 81471c416..dad204668 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py @@ -113,8 +113,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py index 383ac8112..c2a484cd1 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py @@ -113,8 +113,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py index c835d5f98..a206b9d28 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py @@ -113,8 +113,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py index 3f7aef273..2dc0333ca 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py @@ -112,8 +112,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py index ab8876a6f..1284e80de 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py @@ -112,8 +112,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py index b31308796..333362c3b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py @@ -113,8 +113,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_disabled_vxlan_activeip_bfd.py index 299397933..8ac4c64fa 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_disabled_vxlan_activeip_bfd.py @@ -115,8 +115,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py index 792e10598..f6a95e7d8 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py @@ -117,8 +117,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py index ad980f0aa..70ae74757 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py @@ -116,8 +116,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py index b5f35bf70..749cbcbfa 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py @@ -116,8 +116,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py index a251233b3..4f6b63f75 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py @@ -115,8 +115,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py index 4b19d2634..4183f5b5b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py @@ -116,8 +116,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py index ad7e93e82..6200e65c9 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py @@ -115,8 +115,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_disabled_vxlan_activeip_bfd.py index 93dcac462..23f40ed2b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_disabled_vxlan_activeip_bfd.py @@ -116,8 +116,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py index bd06e261b..cf33e25da 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py @@ -118,8 +118,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py index 819301713..1ea3c72c9 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py @@ -116,8 +116,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py index 184b90d07..e29ac7d68 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py @@ -117,8 +117,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py index fd8e8d34c..493e223a0 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py @@ -118,8 +118,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py index c7ce883fe..08a9abbdd 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py @@ -115,8 +115,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py index 03fc4b10b..c57529c5c 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py @@ -116,8 +116,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_int_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py index cb5b01035..6719773f0 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py @@ -145,8 +145,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_int_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py index 1af94ca8d..9cc928fc2 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py @@ -144,8 +144,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_int_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py index 33fd2ea53..9a2430d36 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py @@ -144,8 +144,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_int_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py index c743b0b3a..065fa03ac 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py @@ -144,8 +144,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_int_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py index a08ae337a..272161152 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py @@ -144,8 +144,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_int_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py index 7be1d063e..78e7e6893 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py @@ -144,8 +144,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_int_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py index 56a2ebca8..5e95684df 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py @@ -144,8 +144,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py index 97402d071..c0536af8f 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -135,14 +135,14 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com/" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { "excepted_traffic_result": "vip", "expected_metric": {"hits": 0}, - "expected_log": [{"query_field_key": "sc_rsp_decrypted_uuid_list", "query_value": ""}] + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 7bdc3c198..0eeafbd65 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -134,8 +134,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -255,7 +255,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests", "module_name": "service_chaining", - "test_case_name": "sc_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_mirror_bypass_vlan_none.py index 77d530874..b24fdc774 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_mirror_bypass_vlan_none.py @@ -136,8 +136,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -256,7 +256,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_imei_fqdnbypass_vlan_none" + "test_case_name": "imei_" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index b4ced3c9e..8af44fcef 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -135,8 +135,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -255,7 +255,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_mirror_bypass_vlan_none.py index 5c606b30c..78c399ac4 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_mirror_bypass_vlan_none.py @@ -136,8 +136,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -256,7 +256,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_imsi_fqdnbypass_vlan_none" + "test_case_name": "imsi_" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index c99bd07fd..eb24005d8 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -135,8 +135,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -255,7 +255,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_mirror_bypass_vlan_none.py index 99685a44d..c6bc58b2f 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -136,8 +136,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -256,7 +256,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_pn_fqdnbypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 8844ade03..2d834ad31 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -135,8 +135,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -255,7 +255,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_mirror_bypass_vlan_none.py index 2cdcc8d17..e9eca5874 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_mirror_bypass_vlan_none.py @@ -106,8 +106,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -226,7 +226,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_srcport_range_mirror_bypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py index a6db249bb..1348788af 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py @@ -105,8 +105,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -225,7 +225,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_srcport_range_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_mirror_bypass_vlan_none.py index e0c37be7a..158c83dae 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_mirror_bypass_vlan_none.py @@ -134,8 +134,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -254,7 +254,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_subid_fqdnbypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index f5334c64d..e99442355 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -133,8 +133,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -260,7 +260,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_negate_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "fqdn_ssl_steer_bypass_vxlan_activeip_bfd" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vlan_none.py index 4d0b319cf..6881d9cf9 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vlan_none.py @@ -97,8 +97,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vxlan_activeip_none.py index 4aa51324c..b8747d7c2 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vxlan_activeip_none.py @@ -95,8 +95,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_disabled_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_disabled_vlan_none.py index b19c1ed74..0e4d3fefd 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_disabled_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_disabled_vlan_none.py @@ -94,8 +94,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_vlan_none.py index 57fff1e18..f902aa71e 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_vlan_none.py @@ -96,8 +96,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_global_bypass_diff_device_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_global_bypass_diff_device_vlan_none.py index 3a01cfec1..8640c8b43 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_global_bypass_diff_device_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_global_bypass_diff_device_vlan_none.py @@ -96,8 +96,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_nearby_bypass_diff_device_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_nearby_bypass_diff_device_vlan_none.py index b1270ed8a..5b9fdad4b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_nearby_bypass_diff_device_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_nearby_bypass_diff_device_vlan_none.py @@ -96,8 +96,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py index 302223a7f..e96f0e4ad 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py @@ -96,8 +96,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py index 1d8980bd2..52d983887 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py @@ -97,8 +97,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py index 216252e0c..68bc34e67 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py @@ -93,8 +93,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py index da02176a2..b98a8eaca 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py @@ -101,8 +101,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_bypass_vlan_none.py index 4ca4e88ac..7830c9573 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_bypass_vlan_none.py @@ -101,8 +101,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.baidu.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.baidu.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_bypass_vxlan_inactiveip_none.py index 378545c59..22ee029fa 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_bypass_vxlan_inactiveip_none.py @@ -94,8 +94,8 @@ def run(parameter): "log_option": "metadata", } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py index d7d3b2436..081eee855 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py @@ -99,8 +99,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py index 8c2989ac7..6a172af09 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py @@ -97,8 +97,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py index a9529138f..365e7e1ff 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py @@ -99,8 +99,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_mirror_bypass_vlan_none.py index 7b1880fda..23345259e 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_mirror_bypass_vlan_none.py @@ -134,8 +134,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -261,7 +261,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_subid_fqdnbypass_vlan_none" + "test_case_name": "sc_" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 760ee22ee..dd9af1238 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -133,8 +133,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv https://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -252,7 +252,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "sc_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_mirror_bypass_vlan_none.py index 2d6e9b532..50e41d520 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -171,8 +171,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index f41919d8c..fdd418278 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -166,8 +166,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_mirror_bypass_vlan_none.py index 7d99ec473..274601078 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_mirror_bypass_vlan_none.py @@ -153,8 +153,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -280,7 +280,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_subid_imsi_fqdnbypass_vlan_none" + "test_case_name": "sc_imsi_" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index fd5445983..4ed58e00d 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -147,8 +147,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -274,7 +274,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_subid_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "sc_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_mirror_bypass_vlan_none.py index 82329fd36..5ca8dd554 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -171,8 +171,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -299,7 +299,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_subid_pn_apn_fqdnbypass_vlan_none" + "test_case_name": "sc_pn_apn_" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 1fbe69e7c..315d7863b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -165,8 +165,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -293,7 +293,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_subid_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "sc_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_mirror_bypass_vlan_none.py index d800bb810..a6f539996 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -153,8 +153,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -280,7 +280,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_subid_pn_fqdnbypass_vlan_none" + "test_case_name": "sc_pn_" } run(parameter) """ diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index d4722afaf..89fbfbaf6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -147,8 +147,8 @@ def run(parameter): } traffic_generation = { - "tool": "ssl", # or trex/http - "command": "curl --connect-timeout 10 --max-time 30 -kv http://www.vip.com" + "tool": "ssl", + "command": "curl -kv --connect-timeout 20 -m 20 https://www.vip.com" } verification_result = { @@ -274,7 +274,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_subid_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "sc_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py index 89c6a84ca..ef331800f 100644 --- a/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -242,7 +242,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_apn_fqdnbypass_vlan_none" + "test_case_name": "sc_raw_negate_apn_" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py index 35b276a75..819cd585a 100644 --- a/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -263,7 +263,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_srcip_dstip_fqdnbypass_vlan_none" + "test_case_name": "sc_raw_negate_srcip_dstip_" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_mirror_bypass_vlan_none.py index e92a6651a..502d68f01 100644 --- a/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_mirror_bypass_vlan_none.py @@ -258,7 +258,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_subid_fqdn_http_url_mirror_bypass_vlan_none" + "test_case_name": "sc_raw_negate_fqdn_http_url_mirror_bypass_vlan_none" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index e6ef01110..b981e7808 100644 --- a/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -257,7 +257,7 @@ if __name__ == '__main__': "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "sc_raw_negate_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_mirror_bypass_vlan_none.py index 5a89405bf..3ea6985a6 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_mirror_bypass_vlan_none.py @@ -292,10 +292,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 64f1c330f..7992afcab 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -297,10 +297,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_mirror_bypass_vlan_none.py index ae21e7a2d..b1ac57a56 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_mirror_bypass_vlan_none.py @@ -281,10 +281,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py index e0e3ddcbc..a44b01f66 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -280,10 +280,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py index ff16000bd..38d015639 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py @@ -281,10 +281,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_steer_bypass_vxlan_activeip_bfd.py index ff16000bd..38d015639 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -281,10 +281,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_mirror_bypass_vlan_none.py index 05d37661d..4c384dc59 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_mirror_bypass_vlan_none.py @@ -263,10 +263,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_steer_bypass_vxlan_activeip_bfd.py index 26660adf4..11b029d3e 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_steer_bypass_vxlan_activeip_bfd.py @@ -262,10 +262,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_mirror_bypass_vlan_none.py index d3eaca21c..456b7a9f5 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_mirror_bypass_vlan_none.py @@ -275,10 +275,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_mirror_bypass_vlan_none.py index ea01c9320..16dc2859c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_mirror_bypass_vlan_none.py @@ -275,10 +275,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_steer_bypass_vxlan_activeip_bfd.py index 376a15501..7ede22333 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_steer_bypass_vxlan_activeip_bfd.py @@ -273,10 +273,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_mirror_bypass_vlan_none.py index 5419860cd..e072b6466 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_mirror_bypass_vlan_none.py @@ -283,10 +283,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_steer_bypass_vxlan_activeip_bfd.py index e495d5a1a..45bc32dcc 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_steer_bypass_vxlan_activeip_bfd.py @@ -282,10 +282,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_mirror_bypass_vlan_none.py index 4a8752856..b15c0530b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_mirror_bypass_vlan_none.py @@ -264,10 +264,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 6478fe328..29521daf9 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -263,10 +263,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_openvpn_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_openvpn_steer_bypass_vxlan_activeip_bfd.py index b4073ee6f..d31d4b860 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_openvpn_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_openvpn_steer_bypass_vxlan_activeip_bfd.py @@ -246,10 +246,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_mirror_bypass_vlan_none.py index 81ec2b9e1..6bd4ed4a1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_mirror_bypass_vlan_none.py @@ -257,10 +257,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_steer_bypass_vxlan_activeip_bfd.py index ecca2f66a..f521b6bb4 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_steer_bypass_vxlan_activeip_bfd.py @@ -256,10 +256,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_bfd.py index 662303ab8..cc7f10b6a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_bfd.py @@ -236,10 +236,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_mirror_bypass_vlan_none.py index 31b026a0a..622b35aa5 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_mirror_bypass_vlan_none.py @@ -256,10 +256,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_steer_bypass_vxlan_activeip_bfd.py index 356178518..ee5e52b91 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_steer_bypass_vxlan_activeip_bfd.py @@ -255,10 +255,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_compliance_risk_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_compliance_risk_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 339cab2fc..785bfe0b9 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_compliance_risk_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_compliance_risk_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -290,10 +290,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_geoip_asn_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_geoip_asn_library_http_url_steer_bypass_vxlan_activeip_bfd.py index a7c99d1a7..6391d3706 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_geoip_asn_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_geoip_asn_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -297,10 +297,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_geoip_country_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_geoip_country_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 543521adc..4349ef884 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_geoip_country_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_geoip_country_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -291,10 +291,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_service_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_service_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 05777f67d..47451e393 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_service_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_service_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -290,10 +290,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 4c8fc37f9..02805fc65 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -296,10 +296,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ipprototcp_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ipprototcp_ssl_steer_bypass_vxlan_activeip_bfd.py index 957ecc375..cabfa0226 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ipprototcp_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ipprototcp_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -252,10 +252,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py index da3533d57..a1de210c0 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py @@ -242,10 +242,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py index 51cd8499b..d5def1442 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py @@ -241,10 +241,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py index 8e3f37994..99dce68e9 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py @@ -239,10 +239,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py index 4c55e2e2a..28f5fa232 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py @@ -238,10 +238,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_mirror_bypass_vlan_none.py index 8d2c37d56..963effa70 100644 --- a/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -264,10 +264,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } diff --git a/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 315efb7cb..b067508a2 100644 --- a/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -263,10 +263,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 1, - "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "vsys": 5, + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": os.path.basename(__file__)[:-3] } |