diff options
307 files changed, 2212 insertions, 2076 deletions
diff --git a/support/api_utils/query_rule_log.py b/support/api_utils/query_rule_log.py index 8d516a00c..7f8ede0b6 100644 --- a/support/api_utils/query_rule_log.py +++ b/support/api_utils/query_rule_log.py @@ -3,6 +3,10 @@ import json import time import pytz import requests +import os +import configparser +from support.organize_config import * +from support.packet_generator.workpath import workdir from datetime import datetime from support.ui_utils.element_position.policy_element_position import * @@ -368,7 +372,18 @@ class QueryRuleLog: temp_log_result_list.append(False) elif query_field_key in {"sc_rsp_raw_uuid_list", "sc_rsp_decrypted_uuid_list"}: query_value = self.policy_configuration["action_parameter"]["sff_profiles"][0]["service_func_profiles"] - if query_value == log[query_field_key]: + conf_path = os.path.join(workdir, "configuration_file.ini") + conf = configparser.ConfigParser() + conf.read(conf_path, encoding="utf-8") + active_dst_ip_list = conf.get("sc_active_dst_ip", "ip_list") + effective_device_tag_list = ["group-xxg-tsgx", "center-xxg-tsgx"] + if log[query_field_key] == [] and self.policy_configuration["action_parameter"]["sf_configuration"][0]["connectivity"]["method"] == "vxlan_g" and self.policy_configuration["action_parameter"]["sf_configuration"][0]["connectivity"]["dest_ip"] not in active_dst_ip_list: + temp_log_result_list.append(True) + elif log[query_field_key] == [] and self.policy_configuration["action_parameter"]["sf_configuration"][0]["device_group"]["value"] not in effective_device_tag_list: + temp_log_result_list.append(True) + elif log[query_field_key] == [] and self.policy_configuration["action_parameter"]["sf_configuration"][0]["admin_status"] == 0: + temp_log_result_list.append(True) + elif query_value == log[query_field_key]: temp_log_result_list.append(True) else: temp_log_result_list.append(False) 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 a1da35286..4746b378b 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 @@ -70,7 +70,7 @@ def run(parameter): { "op": "add", "expr_type": "and", - "expression": "baidu.com", + "expression": "baidu", } ] } @@ -143,7 +143,7 @@ def run(parameter): return api_error # 等待下发配置生效 - time.sleep(20) + time.sleep(30) # 类实例化 generator = TrafficGenerator() 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 c3a2e347f..b7f7e74d1 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 @@ -266,8 +266,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_ext_geoip_cityblock_vlan_none" } 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 e8e05cd02..9e2958b66 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 @@ -249,12 +249,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "sc_" } run(parameter) """ 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 90672775c..1d8f4e7b9 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 @@ -248,10 +248,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "sc_fqdn_negate_extport_ssl" } run(parameter) """ 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 9addcbfe5..69b0c1cf5 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 @@ -249,8 +249,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vlan_none.py index 3129c4d9f..d8a3cdae8 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 @@ -230,10 +230,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnblock_vlan_none" } 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 796fe6bf0..7274adf02 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 @@ -225,10 +225,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnblock_vxlan_activeip_bfd" } 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 63af299d8..3e65e8873 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 @@ -228,10 +228,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnblock_vxlan_activeip_none" } 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 098428b35..49807fb40 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 @@ -225,10 +225,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnblock_vxlan_inactiveip_bfd" } 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 23a76ac08..d62484a48 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 @@ -227,10 +227,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnblock_vxlan_inactiveip_none" } 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 8f0c7b6b4..ca19a5ba9 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 @@ -228,10 +228,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnblock_vxlan_unavailableip_bfd" } 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 9524a56bf..ba956c873 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 @@ -227,10 +227,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnblock_vxlan_unavailableip_none" } 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 bc04b0a5e..3bfcbbd4d 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 @@ -229,10 +229,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_" } 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 37cab6a99..0a300d093 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 @@ -228,10 +228,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnbypass_vxlan_activeip_bfd" } 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 3ea913dd7..cdf44eecf 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 @@ -227,10 +227,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnbypass_vxlan_activeip_none" } 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 8e8642db6..50f87b6e8 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 @@ -230,8 +230,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnbypass_vxlan_inactiveip_bfd" } 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 b6be95c53..f6fb863b5 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 @@ -230,8 +230,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnbypass_vxlan_inactiveip_none" } 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 627498d24..41840afda 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 @@ -228,10 +228,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnbypass_vxlan_unavailableip_bfd" } 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 a2e40b3b6..826e6719f 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 @@ -229,8 +229,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnbypass_vxlan_unavailableip_none" } 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 27f95675f..7280fb30c 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 @@ -232,10 +232,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_block_vlan_none" } 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 65eb18b80..4c8753bce 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 @@ -229,10 +229,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_block_vxlan_activeip_bfd" } 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 5e2349175..8e4637c10 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 @@ -230,10 +230,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_block_vxlan_activeip_none" } 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 6e36934a5..88b9bc48b 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 @@ -229,10 +229,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_block_vxlan_inactiveip_bfd" } 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 13ab87b34..3b740d7fe 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 @@ -231,10 +231,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_block_vxlan_inactiveip_bfd" } 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 b56437473..60b11514a 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 @@ -231,10 +231,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_block_vxlan_unavailableip_bfd" } 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 5a7807169..b3710dcf2 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 @@ -230,10 +230,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_block_vxlan_unavailableip_none" } 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 4c7cc3b28..bd8193587 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 @@ -231,10 +231,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_bypass_disabled_vxlan_activeip_bfd" } 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 f839f9ead..766674e50 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 @@ -233,10 +233,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_bypass_vlan_none" } 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 0bab21fd0..33851fb8c 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 @@ -231,8 +231,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_bypass_vxlan_activeip_bfd" } 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 172c1b400..a74fae618 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 @@ -230,10 +230,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_bypass_vxlan_activeip_none" } 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 02098ab22..6f0db32ad 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 @@ -232,10 +232,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_bypass_vxlan_inactiveip_bfd" } 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 e1c4af223..6a62e7fe4 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 @@ -231,10 +231,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_bypass_vxlan_inactiveip_none" } 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 f17dd3252..90afb1353 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 @@ -229,10 +229,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_bypass_vxlan_unavailableip_bfd" } 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 c0e3f87db..333bd3b4f 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 @@ -231,10 +231,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_fqdnredispatch_bypass_vxlan_unavailableip_none" } 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 5816cdce9..a0fcb01ae 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 @@ -227,12 +227,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd" + "test_case_name": "_steer_block_disabled_vxlan_activeip_bfd" } run(parameter) """ 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 9ea76bea0..79c52fcee 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 @@ -227,12 +227,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_block_vxlan_activeip_bfd" + "test_case_name": "_steer_block_vxlan_activeip_bfd" } run(parameter) """ 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 d538f068b..2c008bb42 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 @@ -226,12 +226,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_block_vxlan_activeip_none" + "test_case_name": "_steer_block_vxlan_activeip_none" } run(parameter) """ 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 f146b32c3..aafd95b21 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 @@ -227,12 +227,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_block_vxlan_inactiveip_bfd" + "test_case_name": "_steer_block_vxlan_inactiveip_bfd" } run(parameter) """ 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 71ca63542..a54245e81 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 @@ -228,12 +228,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_block_vxlan_inactiveip_none" + "test_case_name": "_steer_block_vxlan_inactiveip_none" } run(parameter) """ 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 c553c0ea2..5cd91feb9 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 @@ -227,12 +227,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_block_vxlan_unavailableip_bfd" + "test_case_name": "_steer_block_vxlan_unavailableip_bfd" } run(parameter) """ 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 7cbd2cb62..de69d32f7 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 @@ -229,10 +229,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_block_vxlan_unavailableip_none" + "test_case_name": "_steer_block_vxlan_unavailableip_none" } run(parameter) """ 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 928b3589a..1a8f9f979 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 @@ -225,12 +225,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd" + "test_case_name": "_steer_bypass_disabled_vxlan_activeip_bfd" } run(parameter) """ 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 5e59708c2..6dc576ed8 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 @@ -228,12 +228,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_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_fqdn_ssl_steer_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py index e2313ef77..e01c64a52 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 @@ -226,12 +226,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_bypass_vxlan_activeip_none" + "test_case_name": "_steer_bypass_vxlan_activeip_none" } run(parameter) """ 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 dad204668..5fc5d9ba9 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 @@ -227,12 +227,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd" + "test_case_name": "_steer_bypass_vxlan_inactiveip_bfd" } run(parameter) """ 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 c2a484cd1..5d69dba90 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 @@ -227,12 +227,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_bypass_vxlan_inactiveip_none" + "test_case_name": "_steer_bypass_vxlan_inactiveip_none" } run(parameter) """ 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 a206b9d28..9458aaacb 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 @@ -227,12 +227,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd" + "test_case_name": "_steer_bypass_vxlan_unavailableip_bfd" } run(parameter) """ 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 2dc0333ca..836427c98 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 @@ -226,12 +226,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_bypass_vxlan_unavailableip_none" + "test_case_name": "_steer_bypass_vxlan_unavailableip_none" } run(parameter) """ 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 1284e80de..9b1b55a44 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 @@ -226,12 +226,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd" + "test_case_name": "_steer_global_bypass_diff_device_vxlan_activeip_bfd" } run(parameter) """ 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 333362c3b..63d9bf1ac 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 @@ -227,12 +227,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd" + "test_case_name": "_steer_nearby_bypass_diff_device_vxlan_activeip_bfd" } run(parameter) """ 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 8ac4c64fa..9f982eab6 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 @@ -229,12 +229,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_block_disabled_vxlan_activeip_bfd" + "test_case_name": "_steer_redispatch_block_disabled_vxlan_activeip_bfd" } run(parameter) """ 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 f6a95e7d8..5fb24d8bb 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 @@ -231,12 +231,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd" + "test_case_name": "_steer_redispatch_block_vxlan_activeip_bfd" } run(parameter) """ 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 70ae74757..efea2823b 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 @@ -230,12 +230,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none" + "test_case_name": "_steer_redispatch_block_vxlan_activeip_none" } run(parameter) """ 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 749cbcbfa..9edc31088 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 @@ -230,12 +230,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd" + "test_case_name": "_steer_redispatch_block_vxlan_inactiveip_bfd" } run(parameter) """ 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 4f6b63f75..febc08f6f 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 @@ -229,12 +229,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none" + "test_case_name": "_steer_redispatch_block_vxlan_inactiveip_none" } run(parameter) """ 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 4183f5b5b..c8d5cc68c 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 @@ -230,12 +230,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd" + "test_case_name": "_steer_redispatch_block_vxlan_unavailableip_bfd" } run(parameter) """ 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 6200e65c9..8ab04d15d 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 @@ -229,12 +229,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none" + "test_case_name": "_steer_redispatch_block_vxlan_unavailableip_none" } run(parameter) """ 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 23f40ed2b..e826ae94d 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 @@ -230,12 +230,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_bypass_disabled_vxlan_activeip_bfd" + "test_case_name": "_steer_redispatch_bypass_disabled_vxlan_activeip_bfd" } run(parameter) """ 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 cf33e25da..ab149b86f 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 @@ -232,12 +232,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd" + "test_case_name": "_steer_redispatch_bypass_vxlan_activeip_bfd" } run(parameter) """ 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 1ea3c72c9..9e2b80d07 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 @@ -230,12 +230,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none" + "test_case_name": "_steer_redispatch_bypass_vxlan_activeip_none" } run(parameter) """ 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 e29ac7d68..ad281548b 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 @@ -231,12 +231,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd" + "test_case_name": "_steer_redispatch_bypass_vxlan_inactiveip_bfd" } run(parameter) """ 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 493e223a0..95ea3d423 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 @@ -234,10 +234,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none" + "test_case_name": "_steer_redispatch_bypass_vxlan_inactiveip_none" } run(parameter) """ 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 08a9abbdd..3b260db7d 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 @@ -229,12 +229,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd" + "test_case_name": "_steer_redispatch_bypass_vxlan_unavailableip_bfd" } run(parameter) """ 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 c57529c5c..1d2afc439 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 @@ -230,12 +230,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none" + "test_case_name": "_steer_redispatch_bypass_vxlan_unavailableip_none" } run(parameter) """ 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 6719773f0..9df62db29 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 @@ -261,8 +261,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_int_compliance_riskblock_vlan_none" } 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 9cc928fc2..774b7a00e 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 @@ -260,8 +260,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_intblock_vlan_none" } 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 9a2430d36..9237c3c84 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 @@ -260,8 +260,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_int_geoip_cityblock_vlan_none" } 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 065fa03ac..ed6538c47 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 @@ -260,8 +260,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_int_geoip_countryblock_vlan_none" } 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 272161152..f02dcc7c4 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 @@ -260,8 +260,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_int_internet_serviceblock_vlan_none" } 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 78e7e6893..bda27df31 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 @@ -260,8 +260,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_int_security_threatblock_vlan_none" } 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 5e95684df..aa567f791 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 @@ -260,8 +260,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_int_website_classificationblock_vlan_none" } 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 b24fdc774..e898822fd 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 @@ -253,8 +253,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "imei_" } 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 8af44fcef..840b81584 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 @@ -252,10 +252,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "imei_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_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 78c399ac4..9e32e9bde 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 @@ -253,10 +253,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "imsi_" + "test_case_name": os.path.basename(__file__)[:-3] } 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 eb24005d8..8d2070ea6 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 @@ -252,8 +252,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_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 c6bc58b2f..6eea8649e 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 @@ -253,8 +253,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_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 2d834ad31..2ceeb7521 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 @@ -252,8 +252,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_negate_srcport_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_mirror_bypass_vlan_none.py index e9eca5874..bbd5dec47 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 @@ -223,8 +223,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_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 1348788af..694d18095 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 @@ -222,8 +222,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_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 158c83dae..b1f66e978 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 @@ -251,8 +251,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_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 e99442355..ab9ee0fb0 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 @@ -257,10 +257,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "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_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vlan_none.py index 6881d9cf9..7b9fdaca7 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 @@ -211,10 +211,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scblock_vlan_none" } 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 b8747d7c2..b41c6cba5 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 @@ -209,10 +209,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scblock_vxlan_activeip_none" } 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 0e4d3fefd..4a8431ebb 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 @@ -208,10 +208,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scbypass_disabled_vlan_none" } 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 f902aa71e..1533b05f6 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 @@ -210,10 +210,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scbypass_vlan_none" } 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 8640c8b43..336979fd0 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 @@ -210,10 +210,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scnearby_bypass_diff_device_vlan_none" } 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 5b9fdad4b..93ff9064f 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 @@ -210,10 +210,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scnearby_bypass_diff_device_vlan_none" } 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 e96f0e4ad..2d29ea7e2 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 @@ -210,10 +210,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scredispatch_block_disabled_vxlan_activeip_bfd" } 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 52d983887..f6a27210a 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 @@ -211,10 +211,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scredispatch_block_vxlan_activeip_bfd" } 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 68bc34e67..ef404a3b1 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 @@ -207,10 +207,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scredispatch_block_vxlan_inactiveip_bfd" } 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 b98a8eaca..ffd6c812b 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 @@ -215,10 +215,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scredispatch_block_vxlan_inactiveip_none" } 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 7830c9573..2fe38aa0d 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 @@ -215,10 +215,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "scredispatch_bypass_vlan_none" } 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 22ee029fa..a9e0a2692 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 @@ -208,10 +208,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_ssl_steer_bypass_vxlan_inactiveip_none" } 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 081eee855..47f52e13c 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 @@ -213,12 +213,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd" + "test_case_name": "_steer_redispatch_bypass_vxlan_activeip_bfd" } run(parameter) """ 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 6a172af09..c09ad39c2 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 @@ -211,10 +211,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd" } 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 365e7e1ff..f85781cdb 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 @@ -213,10 +213,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_ssl_steer_redispatch_bypass_vxlan_unavailableip_none" } 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 23345259e..9fb2fcf15 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 @@ -258,8 +258,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_" } 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 dd9af1238..ed79f1b01 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 @@ -249,10 +249,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_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_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 274601078..a44957ddb 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 @@ -277,10 +277,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_imsi_" + "test_case_name": "sc_" } 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 4ed58e00d..abe4d7413 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 @@ -271,10 +271,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_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_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 5ca8dd554..a32d2d05d 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 @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_pn_apn_" + "test_case_name": os.path.basename(__file__)[:-3] } 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 315d7863b..f715058d7 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 @@ -290,10 +290,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_pn_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_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 a6f539996..55f713a63 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 @@ -277,8 +277,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", "test_case_name": "sc_pn_" } 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 89fbfbaf6..384714108 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 @@ -271,10 +271,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_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_raw_dstip_dstport_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_dstip_dstport_range_mirror_bypass_vlan_none.py index ab9211d3a..cdc1d8231 100644 --- a/tests/service_chaining/sc_raw_dstip_dstport_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_dstip_dstport_range_mirror_bypass_vlan_none.py @@ -127,15 +127,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "server_port", "query_value": "443"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -145,6 +137,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_dstip_dstport_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_dstip_dstport_range_steer_bypass_vxlan_activeip_bfd.py index 8873daeb5..d8e31d8a0 100644 --- a/tests/service_chaining/sc_raw_dstip_dstport_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_dstip_dstport_range_steer_bypass_vxlan_activeip_bfd.py @@ -126,11 +126,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "server_port", "query_value": "443"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -140,6 +136,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -239,10 +239,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_dstip_dstport_range_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "_dstport_range" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_dstip_external_port_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_dstip_external_port_range_mirror_bypass_vlan_none.py index 2d13dfae8..42f1b92aa 100644 --- a/tests/service_chaining/sc_raw_dstip_external_port_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_dstip_external_port_range_mirror_bypass_vlan_none.py @@ -147,11 +147,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "server_port", "query_value": "443"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -161,6 +157,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -260,10 +260,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_dstip_external_port_range_mirror_bypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_dstip_external_port_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_dstip_external_port_range_steer_bypass_vxlan_activeip_bfd.py index 2f89caff1..624112e73 100644 --- a/tests/service_chaining/sc_raw_dstip_external_port_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_dstip_external_port_range_steer_bypass_vxlan_activeip_bfd.py @@ -126,11 +126,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "server_port", "query_value": "443"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -140,6 +136,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -239,10 +239,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_dstip_external_port_range_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_imsi_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_imsi_fqdn_http_url_mirror_bypass_vlan_none.py index ad498864d..0e066bae2 100644 --- a/tests/service_chaining/sc_raw_imsi_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_imsi_fqdn_http_url_mirror_bypass_vlan_none.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -161,11 +160,7 @@ def run(parameter): {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, {"query_field_key": "phone_number", "query_value": "12345678902"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -271,12 +266,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_imsi_fqdn_http_url_mirror_bypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 7e35d8dfd..8f49671e5 100644 --- a/tests/service_chaining/sc_raw_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -160,11 +159,7 @@ def run(parameter): {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, {"query_field_key": "phone_number", "query_value": "12345678902"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -270,12 +265,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_multiple_port_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_multiple_port_steer_bypass_vxlan_activeip_bfd.py index dabbff435..e9d4ae50d 100644 --- a/tests/service_chaining/sc_raw_multiple_port_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_multiple_port_steer_bypass_vxlan_activeip_bfd.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -160,11 +159,7 @@ def run(parameter): {"query_field_key": "server_port", "query_value": "443"}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -273,10 +268,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_multiple_port_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } 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 f7e2db53d..02d573adb 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 @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -131,10 +130,7 @@ def run(parameter): "excepted_traffic_result": {'total_packets': 175, 'total_packets_sent': 45, 'total_packets_received': 130, 'total_bytes': 180025, 'total_bytes_sent': 5799, 'total_bytes_received': 174226, 'total_syn_pkt': 1}, "expected_metric": {"hits": 0}, "expected_log": [] - } - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -247,7 +243,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_" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 118349854..cdb519d74 100644 --- a/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -129,10 +128,7 @@ def run(parameter): "excepted_traffic_result": {'total_packets': 175, 'total_packets_sent': 45, 'total_packets_received': 130, 'total_bytes': 180025, 'total_bytes_sent': 5799, 'total_bytes_received': 174226, 'total_syn_pkt': 1}, "expected_metric": {"hits": 0}, "expected_log": [] - } - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -245,7 +241,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_fqdn_ssl_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_mirror_bypass_vlan_none.py index 25c8fbf36..3bea52157 100644 --- a/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_mirror_bypass_vlan_none.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -150,11 +149,7 @@ def run(parameter): "excepted_traffic_result": "", "expected_metric": {"hits": 0}, "expected_log": [] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -262,10 +257,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_imei_fqdn_http_url_mirror_bypass_vlan_none" + "test_case_name": "imei_" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 9e62fb0e1..4aca0ad0d 100644 --- a/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -150,11 +149,6 @@ def run(parameter): "expected_metric": {"hits": 0}, "expected_log": [] } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - # 创建 if parameter["initiation_method"] == "ui": ui_client = UIClient() @@ -261,10 +255,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_imei_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "imei_" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_mirror_bypass_vlan_none.py index 6670d55ef..133954cba 100644 --- a/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_mirror_bypass_vlan_none.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -151,11 +150,7 @@ def run(parameter): "excepted_traffic_result": "", "expected_metric": {"hits": 0}, "expected_log": [] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -261,12 +256,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_imsi_fqdn_http_url_mirror_bypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 8df9f759b..a0c5ee76b 100644 --- a/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -149,11 +148,7 @@ def run(parameter): "excepted_traffic_result": "", "expected_metric": {"hits": 0}, "expected_log": [] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -261,10 +256,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_mirror_bypass_vlan_none.py index 9c6111eb2..13ffd51b4 100644 --- a/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_mirror_bypass_vlan_none.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -150,11 +149,7 @@ def run(parameter): "excepted_traffic_result": "", "expected_metric": {"hits": 0}, "expected_log": [] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -263,10 +258,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_pn_fqdn_http_url_mirror_bypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 2d69fd85a..b6788e5b8 100644 --- a/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -149,11 +148,7 @@ def run(parameter): "excepted_traffic_result": "", "expected_metric": {"hits": 0}, "expected_log": [] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -261,10 +256,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } 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 6394c6cc6..0e29967eb 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 @@ -153,11 +153,7 @@ def run(parameter): "excepted_traffic_result": {'total_packets': 175, 'total_packets_sent': 45, 'total_packets_received': 130, 'total_bytes': 180025, 'total_bytes_sent': 5799, 'total_bytes_received': 174226, 'total_syn_pkt': 1}, "expected_metric": {"hits": 0}, "expected_log": [] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -167,6 +163,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,10 +265,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_srcip_dstip_" + "test_case_name": "srcip_dstip_" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index a2ccf46d7..eea81004e 100644 --- a/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -152,11 +152,7 @@ def run(parameter): "excepted_traffic_result": {'total_packets': 175, 'total_packets_sent': 45, 'total_packets_received': 130, 'total_bytes': 180025, 'total_bytes_sent': 5799, 'total_bytes_received': 174226, 'total_syn_pkt': 1}, "expected_metric": {"hits": 0}, "expected_log": [] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -166,6 +162,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -264,10 +264,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } 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 40abd4e13..540819122 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 @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -148,11 +147,7 @@ def run(parameter): "excepted_traffic_result": "", "expected_metric": {"hits": 0}, "expected_log": [] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -260,10 +255,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_fqdn_http_url_mirror_bypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } 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 738a3cb2e..a8b9479bf 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 @@ -147,11 +147,7 @@ def run(parameter): "excepted_traffic_result": "", "expected_metric": {"hits": 0}, "expected_log": [] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -259,10 +255,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_negate_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_pn_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_pn_fqdn_http_url_mirror_bypass_vlan_none.py index 14956322e..d63bcb952 100644 --- a/tests/service_chaining/sc_raw_pn_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_pn_fqdn_http_url_mirror_bypass_vlan_none.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -161,11 +160,7 @@ def run(parameter): {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, {"query_field_key": "phone_number", "query_value": "12345678902"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -271,12 +266,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_pn_fqdn_http_url_mirror_bypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 52bd0b8eb..0409c32a6 100644 --- a/tests/service_chaining/sc_raw_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -161,10 +160,7 @@ def run(parameter): {"query_field_key": "phone_number", "query_value": "12345678902"} ] } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + # 创建 if parameter["initiation_method"] == "ui": @@ -270,12 +266,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_rtp_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_rtp_mirror_bypass_vlan_none.py index 3ca5f56f2..f629e5ff3 100644 --- a/tests/service_chaining/sc_raw_rtp_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_rtp_mirror_bypass_vlan_none.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -97,11 +96,7 @@ def run(parameter): "expected_log": [ {"query_field_key": "sc_rsp_raw_uuid_list", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -207,12 +202,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_rtp_mirror_bypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_rtp_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_rtp_steer_bypass_vxlan_activeip_bfd.py index 65e7bc358..4238506d7 100644 --- a/tests/service_chaining/sc_raw_rtp_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_rtp_steer_bypass_vxlan_activeip_bfd.py @@ -8,7 +8,6 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate def run(parameter): @@ -96,11 +95,7 @@ def run(parameter): "expected_log": [ {"query_field_key": "sc_rsp_raw_uuid_list", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -206,12 +201,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_rtp_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_scrip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_scrip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py index b1f585162..d72509d3d 100644 --- a/tests/service_chaining/sc_raw_scrip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_scrip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py @@ -157,11 +157,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -171,6 +167,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -267,12 +267,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_scrip_dstip_fqdnbypass_vxlan_unavailableip_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 0f6d333a6..356308ac8 100644 --- a/tests/service_chaining/sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -191,11 +191,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -205,6 +201,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -303,10 +303,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_src_geoip_asn_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_geoip_asn_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index dac3e2026..b03029746 100644 --- a/tests/service_chaining/sc_raw_src_geoip_asn_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_geoip_asn_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -190,11 +190,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -204,6 +200,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -302,10 +302,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_src_geoip_city_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_geoip_city_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 4d8666ebe..1587212e1 100644 --- a/tests/service_chaining/sc_raw_src_geoip_city_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_geoip_city_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -185,11 +185,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -199,6 +195,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -297,10 +297,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_src_geoip_city_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_src_geoip_country_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_geoip_country_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 8fab03ed1..88d278aae 100644 --- a/tests/service_chaining/sc_raw_src_geoip_country_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_geoip_country_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -189,11 +189,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -203,6 +199,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -301,10 +301,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_src_geoip_country_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_src_internet_service_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_internet_service_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index f2e7c8aaa..b546f93e7 100644 --- a/tests/service_chaining/sc_raw_src_internet_service_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_internet_service_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -191,11 +191,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -205,6 +201,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -303,10 +303,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index ebb266ccd..962d60733 100644 --- a/tests/service_chaining/sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -184,11 +184,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -198,6 +194,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_http_url_mirror_bypass_vlan_none" + "test_case_name": "sc" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_src_security_threat_library_iprange_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_security_threat_library_iprange_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 5880c0cf7..c3020f796 100644 --- a/tests/service_chaining/sc_raw_src_security_threat_library_iprange_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_security_threat_library_iprange_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -184,11 +184,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -198,6 +194,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_src_library_iprange_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "src_library_iprange_dstip_" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_src_website_classification_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_website_classification_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index aa5512c46..40d524649 100644 --- a/tests/service_chaining/sc_raw_src_website_classification_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_website_classification_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -189,11 +189,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -203,6 +199,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -301,10 +305,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dst_compliance_risk_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_compliance_risk_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 592b6999f..6791876c0 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_compliance_risk_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_compliance_risk_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -184,11 +184,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -198,6 +194,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sccompliance_risk_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "sccompliance_risk_http_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dst_geoip_asn_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_geoip_asn_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 1e2b8fecb..61fcdb329 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_geoip_asn_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_geoip_asn_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -184,11 +184,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -198,6 +194,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "schttp_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "schttp_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dst_geoip_city_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_geoip_city_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 38af788dd..33fa95442 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_geoip_city_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_geoip_city_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -184,11 +184,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -198,6 +194,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scgeoip_city_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scgeoip_city_http_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dst_geoip_country_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_geoip_country_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index d04c219cb..7a9b4c4cf 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_geoip_country_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_geoip_country_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -184,11 +184,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -198,6 +194,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scgeoip_country_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scgeoip_country_http_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dst_internet_service_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_internet_service_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index e1c30979b..614eddcdd 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_internet_service_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_internet_service_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -184,11 +184,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -198,6 +194,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "schttp_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "schttp_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dst_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 5e3e58184..e06aa8ff9 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -184,11 +184,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -198,6 +194,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "schttp_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "schttp_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dst_security_threat_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_security_threat_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 6ae56f736..b3fe24917 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_security_threat_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_security_threat_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -184,11 +184,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -198,6 +194,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "schttp_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "schttp_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dst_website_classification_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_website_classification_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 935ad86ed..b74271cdc 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_website_classification_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_website_classification_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -214,10 +214,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "schttp_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "schttp_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_dns_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_dns_mirror_bypass_vlan_none.py index 2625f7f36..d86e0f0fa 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_dns_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_dns_mirror_bypass_vlan_none.py @@ -141,11 +141,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -155,6 +151,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -251,12 +251,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scdns_mirror_bypass_vlan_none" + "test_case_name": "scdns" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_mirror_bypass_vlan_none.py index 41e3ba2bd..ce319e304 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_mirror_bypass_vlan_none.py @@ -159,11 +159,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -173,6 +169,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -269,12 +269,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scdns_qname_mirror_bypass_vlan_none" + "test_case_name": "scdns_qname" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_steer_bypass_vxlan_activeip_bfd.py index 656e92280..f64211276 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_steer_bypass_vxlan_activeip_bfd.py @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -172,6 +168,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -268,12 +268,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scdns_qname_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scdns_qname" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_dns_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_dns_steer_bypass_vxlan_activeip_bfd.py index 24cc5c0bf..70407aecb 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_dns_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_dns_steer_bypass_vxlan_activeip_bfd.py @@ -140,11 +140,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -154,6 +150,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -250,12 +250,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scdns_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scdns" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_category_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_category_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 299e10374..d208f8a14 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_category_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_category_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -186,11 +186,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -200,6 +196,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -298,10 +298,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scexact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scexact_fqdn_library_http_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_geoip_city_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_geoip_city_library_http_url_steer_bypass_vxlan_activeip_bfd.py index c8306c58d..79c19fef8 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_geoip_city_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_geoip_city_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -185,11 +185,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -199,6 +195,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -297,10 +297,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scexact_fqdn_geoip_city_library_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scexact_fqdn_geoip_city_library_http_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 30d56fc24..516686c1d 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -185,11 +185,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -199,6 +195,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -297,10 +297,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scexact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scexact_fqdn_library_http_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_security_threat_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_security_threat_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 3a2670cb9..39597e1f5 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_security_threat_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_security_threat_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -185,11 +185,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -199,6 +195,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +300,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scexact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scexact_fqdn_library_http_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_http_url_steer_bypass_vxlan_activeip_bfd.py index f18c9ca00..360782116 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -186,11 +186,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -200,6 +196,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -298,10 +298,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_all_ipproto_http_url_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scfqdn_all_ipproto_http_url" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_quic_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_quic_steer_bypass_vxlan_activeip_bfd.py index eb2823401..fd5a5e98c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_quic_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_quic_steer_bypass_vxlan_activeip_bfd.py @@ -26,7 +26,7 @@ def run(parameter): # 测试数据 policy_configuration = { "type": "service_chaining", - "name": "scfqdn_all_ipproto_quic_steer_bypass_vxlan_activeip_bfd", + "name": "scfqdn_all_ipproto_quic", "action": "service_chaining", "and_conditions": [ { @@ -170,11 +170,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ip_protocol", "query_value": "udp"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -184,6 +180,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + # {uuid, type}, i.e., {"12341-232-a21", "ip"} objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_mirror_bypass_vlan_none.py index a7610b70f..48d6c482b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_mirror_bypass_vlan_none.py @@ -177,11 +177,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -191,6 +187,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -287,10 +287,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 4a874644b..e68d5f8e3 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -176,11 +176,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -190,6 +186,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -286,10 +290,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_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 4f85fd341..59705698e 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 @@ -187,11 +187,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -201,6 +197,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_steer_bypass_vxlan_activeip_bfd.py index 55d3e3491..3f58c229c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -186,11 +186,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -200,6 +196,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -296,10 +296,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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 756e7421b..91ea6394b 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 @@ -192,11 +192,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -206,6 +202,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 3cf2f8f5b..6f471f977 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 @@ -176,11 +176,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -190,6 +186,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 5456f3edb..de051bb1c 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 @@ -175,11 +175,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -189,6 +185,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 f701d1e3c..8c00b6a35 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 @@ -176,11 +176,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -190,6 +186,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 d0c2d87ba..2130bf1a2 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 @@ -176,11 +176,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -190,6 +186,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 319f177eb..50fdf1d3e 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 @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -172,6 +168,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 03978045d..b6a55db1e 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 @@ -157,11 +157,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -171,6 +167,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_mirror_bypass_vlan_none.py index 340f1b8ac..1f839d7a7 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_mirror_bypass_vlan_none.py @@ -170,11 +170,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ssl_ech_flag", "query_value": "False"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -184,6 +180,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -282,10 +286,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_ech_false_mirror_bypass_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_steer_bypass_vxlan_activeip_bfd.py index 07ff947a1..9c252f67b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_steer_bypass_vxlan_activeip_bfd.py @@ -169,11 +169,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ssl_ech_flag", "query_value": "False"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -183,6 +179,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -281,10 +281,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_ech_false_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ 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 0075fe382..50030c0a8 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 @@ -170,11 +170,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ssl_ech_flag", "query_value": "True"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -184,6 +180,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_steer_bypass_vxlan_activeip_bfd.py index c35405338..309b940d0 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_steer_bypass_vxlan_activeip_bfd.py @@ -169,11 +169,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ssl_ech_flag", "query_value": "True"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -183,6 +179,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -281,10 +281,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_ech_true_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ 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 9a531c88f..c98179d27 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 @@ -170,11 +170,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ssl_esni_flag", "query_value": "False"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -184,6 +180,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_steer_bypass_vxlan_activeip_bfd.py index c160b953b..8dd899895 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_steer_bypass_vxlan_activeip_bfd.py @@ -169,11 +169,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ssl_esni_flag", "query_value": "False"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -183,6 +179,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -281,10 +285,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_esni_false_steer_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py index 4b0bd2cdd..96ace3424 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py @@ -156,11 +156,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -170,6 +166,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -266,10 +270,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py index 5c12d6868..2890a0fd3 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py @@ -154,11 +154,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -168,6 +164,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -264,10 +264,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_none.py index 3f945f5e9..e8e40e68e 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_none.py @@ -156,11 +156,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -170,6 +166,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -266,10 +270,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py index 1872b456e..5146ab5ef 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py @@ -153,11 +153,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -167,6 +163,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -263,10 +267,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py index 950d54462..19dbdee03 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py @@ -155,11 +155,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -169,6 +165,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,10 +269,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py index aa302fd48..0147cb688 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -159,11 +159,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -173,6 +169,26 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -269,10 +285,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py index 8599c5515..933ec459c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py @@ -153,11 +153,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -167,6 +163,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -263,10 +267,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py index ec711f360..8b896a454 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -172,6 +168,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -268,10 +268,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py index 6f384a1c4..99e3204d8 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py @@ -156,11 +156,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -170,6 +166,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -266,10 +270,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py index 38ae5b7a5..aa040675c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py @@ -8,8 +8,8 @@ from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient from support.packet_generator.traffic_generator import * -from support.organize_config import OrganizeConfig from support.report_update import ReportUpdate +from support.organize_config import OrganizeConfig def run(parameter): try: @@ -150,11 +150,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -164,6 +160,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -260,10 +264,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py index 18f094549..e7691bc35 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py @@ -152,11 +152,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -166,6 +162,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -262,10 +262,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_global_bypass_diff_device_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_global_bypass_diff_device_vlan_none.py index b83b58bd4..671c2b4b7 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_global_bypass_diff_device_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_global_bypass_diff_device_vlan_none.py @@ -157,11 +157,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -171,6 +167,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -267,10 +271,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_nearby_bypass_diff_device_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_nearby_bypass_diff_device_vlan_none.py index feb9d0f90..7625e88cc 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_nearby_bypass_diff_device_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_nearby_bypass_diff_device_vlan_none.py @@ -156,11 +156,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -170,6 +166,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -266,10 +266,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py index 16018797f..79fa82633 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py @@ -161,11 +161,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -175,6 +171,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -271,10 +275,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_block_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vlan_none.py index 2a960a601..8bf42f1f7 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vlan_none.py @@ -163,11 +163,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -177,6 +173,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -275,8 +275,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_mirror_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py index eaae270b8..78ef9f540 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py @@ -161,11 +161,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -175,6 +171,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -271,10 +275,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py index e4626e340..54232d1b0 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -172,6 +168,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -268,10 +268,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py index 4670d28c5..04c4ec378 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py @@ -161,11 +161,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -175,6 +171,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -271,10 +271,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py index 31812389d..ee7138f62 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py @@ -161,11 +161,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -175,6 +171,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -271,10 +271,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py index 539c16cd3..153f39230 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py @@ -154,11 +154,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -168,6 +164,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -264,10 +268,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py index acdbb6fb4..1505a8323 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py @@ -161,11 +161,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -175,6 +171,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -271,10 +275,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py index 0375f39c0..e9987974a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py @@ -162,11 +162,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -176,6 +172,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -272,10 +276,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py index 08173223c..f455f0505 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py @@ -163,11 +163,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -177,6 +173,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -273,10 +277,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py index fa099d038..a05ce6607 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py @@ -162,11 +162,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -176,6 +172,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -272,10 +276,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py index 860363828..29d541d82 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py @@ -162,11 +162,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -176,6 +172,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -272,10 +276,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py index 6e73b526b..23f756b7b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py @@ -162,11 +162,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -176,6 +172,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -272,10 +276,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py index 38a6e96a4..309641774 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py @@ -162,11 +162,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -176,6 +172,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -272,10 +276,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py index b6e50369b..9a10123c2 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py @@ -162,11 +162,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -176,6 +172,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -272,10 +272,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py index c3b50b6f2..23785c446 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py @@ -162,11 +162,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -176,6 +172,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -272,10 +276,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_mirror_bypass_vlan_none.py index e434cb599..b4b32e9b5 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_mirror_bypass_vlan_none.py @@ -170,11 +170,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ssl_sni", "query_value": "www.baidu.com"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -184,6 +180,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + # {uuid, type}, i.e., {"12341-232-a21", "ip"} objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: 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 856268476..7a995b622 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 @@ -168,11 +168,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -182,6 +178,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py index 0e91bc1a5..36dded2b6 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py @@ -155,11 +155,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -169,6 +165,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,10 +265,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_none.py index 2311650fa..3abd89245 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_none.py @@ -155,11 +155,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -169,6 +165,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,10 +269,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py index 382544851..4f72b4e83 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py @@ -149,11 +149,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -163,6 +159,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -259,10 +259,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py index 005da4999..2664062e4 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py @@ -155,11 +155,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -169,6 +165,18 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,10 +273,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py index 3c1ad3930..f866b0b55 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py @@ -148,11 +148,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -162,6 +158,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -258,10 +262,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py index 88e6c36af..8e995d84a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py @@ -152,11 +152,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -166,6 +162,22 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -262,10 +274,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 6ca695ee0..b9801d98c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -172,6 +168,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -268,10 +268,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py index 3c2085ab8..7a3973719 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py @@ -155,11 +155,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -169,6 +165,18 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,10 +273,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py index 6a018240f..1ee825d14 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py @@ -149,11 +149,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -163,6 +159,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -259,10 +263,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py index 1894cd46e..c6bff4bf1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py @@ -155,11 +155,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -169,6 +165,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,10 +269,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py index 5d9539bde..76c91b9da 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py @@ -146,11 +146,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -160,6 +156,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -256,10 +260,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py index 571e948c1..b4b2bd7a7 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py @@ -153,11 +153,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -167,6 +163,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -263,10 +267,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py index 5c3efe0ce..e122d9d39 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py @@ -153,11 +153,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -167,6 +163,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -263,12 +263,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py index 00d616a64..62fb098a6 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -172,6 +168,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -268,12 +272,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_block_vxlan_activeip_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py index 34d241f13..6d937ded1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py @@ -152,11 +152,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -166,6 +162,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -262,12 +266,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py index 4b2e56597..2dd6383ef 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -172,6 +168,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -268,12 +272,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py index 2f78d7e05..02cd5e0a7 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py @@ -153,11 +153,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -167,6 +163,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -263,12 +267,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py index 2b90918b7..f18607a31 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py @@ -155,11 +155,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -169,6 +165,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,12 +265,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py index c7cd6522e..fd435b90c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py @@ -153,11 +153,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -167,6 +163,18 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -263,12 +271,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py index 27ad46a83..342c53a6e 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py @@ -159,11 +159,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -173,6 +169,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -269,12 +273,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py index 98cfbe356..395920001 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py @@ -153,11 +153,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -167,6 +163,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -263,12 +267,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py index 6a4baa2d8..85d37f000 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py @@ -159,11 +159,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -173,6 +169,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -269,12 +273,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py index 2e064ea51..4ed9911e9 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py @@ -155,11 +155,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -169,6 +165,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,12 +269,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py index 1325255a4..5069a6214 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py @@ -156,11 +156,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -170,6 +166,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -266,12 +266,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scfqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_mirror_bypass_vlan_none.py index 0f0afbff0..94bf2a88f 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_mirror_bypass_vlan_none.py @@ -169,6 +169,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -265,12 +269,12 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "sc_raw_srcip_dstipblock_vlan_none" + "test_case_name": os.path.basename(__file__)[:-3] } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_steer_bypass_vxlan_activeip_bfd.py index f5e5000e1..a345ad922 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_steer_bypass_vxlan_activeip_bfd.py @@ -166,6 +166,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -262,10 +266,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_ipprototcp_ftp_account_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ipprototcp_ftp_account_steer_bypass_vxlan_activeip_bfd.py index 5b3008433..1981ae7e1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ipprototcp_ftp_account_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ipprototcp_ftp_account_steer_bypass_vxlan_activeip_bfd.py @@ -165,11 +165,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ip_protocol", "query_value": "tcp"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -179,6 +175,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -277,10 +277,10 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "root_path": workdir, + "path": workdir + "/tests", "module_name": "service_chaining", - "test_case_name": "scipprototcp_ftp_account_steer_bypass_vxlan_activeip_bfd" + "test_case_name": "scipprototcp_ftp_account" } run(parameter) """ diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ipprotoudp_dns_qname_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ipprotoudp_dns_qname_steer_bypass_vxlan_activeip_bfd.py index 636ebfcf7..5a7d54fd3 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ipprotoudp_dns_qname_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ipprotoudp_dns_qname_steer_bypass_vxlan_activeip_bfd.py @@ -169,11 +169,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ip_protocol", "query_value": "udp"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -183,6 +179,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -279,10 +279,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_mail_from_to_account_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_mirror_bypass_vlan_none.py index 6b8a04f50..e550b8eba 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_mirror_bypass_vlan_none.py @@ -195,11 +195,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -209,6 +205,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -305,10 +309,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mail_from_to_account_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_steer_bypass_vxlan_activeip_bfd.py index 47f0132f5..0af85a321 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_steer_bypass_vxlan_activeip_bfd.py @@ -189,11 +189,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -203,6 +199,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -299,10 +303,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_mirror_block_vxlan_activeip_none.py index 958f9d464..73b877a4a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mirror_block_vxlan_activeip_none.py @@ -127,11 +127,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -141,6 +137,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -237,10 +241,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_disabled_vxlan_activeip_bfd.py index 0de1ea85a..478516c52 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_disabled_vxlan_activeip_bfd.py @@ -125,11 +125,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -139,6 +135,22 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -235,10 +247,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_bfd.py index 02e32ffdb..cc250a9c2 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_bfd.py @@ -125,11 +125,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -139,6 +135,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -235,10 +239,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_none.py index 10e17a811..9900c4eb4 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_none.py @@ -127,11 +127,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -141,6 +137,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -237,10 +241,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_multiple_port_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_multiple_port_mirror_bypass_vlan_none.py index 161763025..5cb18700a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_multiple_port_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_multiple_port_mirror_bypass_vlan_none.py @@ -201,11 +201,7 @@ def run(parameter): {"query_field_key": "server_port", "query_value": "443"}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -215,6 +211,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -314,8 +318,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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 97a8658fb..6d6f521f3 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 @@ -178,11 +178,7 @@ def run(parameter): {"query_field_key": "server_port", "query_value": "443"}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -192,6 +188,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 b8e21aa4a..0467c6299 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 @@ -177,11 +177,7 @@ def run(parameter): {"query_field_key": "server_port", "query_value": "443"}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -191,6 +187,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 213a850fb..7a74349ad 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 @@ -159,11 +159,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -173,6 +169,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 cf1784660..f6f318d73 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 @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -172,6 +168,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_openvpn_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_openvpn_mirror_bypass_vlan_none.py index 53261ba5a..32317ae41 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_openvpn_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_openvpn_mirror_bypass_vlan_none.py @@ -141,11 +141,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -155,6 +151,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -251,10 +251,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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 948714645..cea0cf5a6 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 @@ -141,11 +141,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""} ] } - - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + # 创建 if parameter["initiation_method"] == "ui": @@ -155,6 +151,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_quic_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_quic_mirror_bypass_vlan_none.py index 7faee998e..d2edbdb2f 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_quic_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_quic_mirror_bypass_vlan_none.py @@ -140,11 +140,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -154,6 +150,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -250,10 +250,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_quic_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_quic_steer_bypass_vxlan_activeip_bfd.py index fbda86344..b145d3a8d 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_quic_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_quic_steer_bypass_vxlan_activeip_bfd.py @@ -139,11 +139,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -153,6 +149,18 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -249,10 +257,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_rdp_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_rdp_mirror_bypass_vlan_none.py index d372a6410..fbdaec15b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_rdp_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_rdp_mirror_bypass_vlan_none.py @@ -141,11 +141,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -155,6 +151,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -251,10 +255,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_rdp_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_rdp_steer_bypass_vxlan_activeip_bfd.py index 44dd02739..384104fd1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_rdp_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_rdp_steer_bypass_vxlan_activeip_bfd.py @@ -140,11 +140,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -154,6 +150,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -250,10 +254,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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 e82792c19..4dab9c5cd 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 @@ -152,11 +152,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ssl_esni_flag", "query_value": "True"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -166,6 +162,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 26befb1bd..75ce66e74 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 @@ -151,11 +151,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ssl_esni_flag", "query_value": "True"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -165,6 +161,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vlan_none.py index f98a5f03a..dc4c1aa7b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vlan_none.py @@ -139,11 +139,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -153,6 +149,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -249,10 +253,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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 df5879375..06d7594a8 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 @@ -131,11 +131,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -145,6 +141,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_none.py index e4593b2ec..9abb8c971 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_none.py @@ -137,11 +137,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -151,6 +147,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -247,10 +251,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_bfd.py index 792142197..70d7f55d8 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_bfd.py @@ -131,11 +131,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -145,6 +141,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -241,10 +245,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_none.py index 3b9890c02..66688992a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_none.py @@ -138,11 +138,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -152,6 +148,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -248,10 +252,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_bfd.py index 7feff6364..10360bc46 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_bfd.py @@ -128,11 +128,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -142,6 +138,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -238,10 +238,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_none.py index ae654951c..476dd916a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_none.py @@ -134,11 +134,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -148,6 +144,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -244,10 +248,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 5, - "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_bypass_disabled_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_disabled_vlan_none.py index b1b8b80b2..a5c450a87 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_disabled_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_disabled_vlan_none.py @@ -139,11 +139,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -153,6 +149,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -249,10 +253,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_vlan_none.py index 47a62945a..d4ec1bf90 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_vlan_none.py @@ -141,11 +141,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -155,6 +151,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -251,10 +255,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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 150c2a2b5..2924cb032 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 @@ -151,11 +151,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -165,6 +161,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 f8f468dbc..55a0ae310 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 @@ -150,11 +150,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -164,6 +160,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_disabled_vxlan_activeip_bfd.py index e346053c3..9c2b73c90 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_disabled_vxlan_activeip_bfd.py @@ -124,11 +124,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -138,6 +134,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -234,10 +238,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_vxlan_activeip_bfd.py index 0ad42aa02..41c8d0d76 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_vxlan_activeip_bfd.py @@ -121,11 +121,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -135,6 +131,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -231,10 +231,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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 acad63da3..b442de7f6 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 @@ -185,11 +185,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -199,6 +195,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 0e01d187f..f0c0131b5 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 @@ -192,11 +192,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -206,6 +202,26 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 efd548698..8a0c67d4c 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 @@ -186,11 +186,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -200,6 +196,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 bfd39826c..c1c9e6403 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 @@ -185,11 +185,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -199,6 +195,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 37e6ba636..20067d594 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 @@ -191,11 +191,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -205,6 +201,18 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_dstport_external_port_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstport_external_port_steer_bypass_vxlan_activeip_bfd.py index 26062faaa..4d5822262 100644 --- a/tests/service_chaining/sc_raw_srcip_dstport_external_port_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstport_external_port_steer_bypass_vxlan_activeip_bfd.py @@ -145,11 +145,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "server_port", "query_value": "443"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -159,6 +155,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -258,8 +262,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_dstport_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstport_mirror_bypass_vlan_none.py index af003a0d9..14638e2a4 100644 --- a/tests/service_chaining/sc_raw_srcip_dstport_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstport_mirror_bypass_vlan_none.py @@ -128,11 +128,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -142,6 +138,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -241,8 +245,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_dstport_range_external_port_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstport_range_external_port_range_mirror_bypass_vlan_none.py index 7a143c37e..0655aed44 100644 --- a/tests/service_chaining/sc_raw_srcip_dstport_range_external_port_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstport_range_external_port_range_mirror_bypass_vlan_none.py @@ -146,11 +146,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -160,6 +156,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -259,8 +259,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_dstport_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstport_steer_bypass_vxlan_activeip_bfd.py index fa4a13d47..8bbe88a0c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstport_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstport_steer_bypass_vxlan_activeip_bfd.py @@ -128,11 +128,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "server_port", "query_value": "443"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -142,6 +138,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -241,8 +245,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_dtsip_mirror_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dtsip_mirror_bypass_vxlan_inactiveip_bfd.py index 329042e40..51a807206 100644 --- a/tests/service_chaining/sc_raw_srcip_dtsip_mirror_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dtsip_mirror_bypass_vxlan_inactiveip_bfd.py @@ -122,11 +122,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -136,6 +132,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -232,10 +236,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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 e4382d78a..343f00cd0 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 @@ -147,11 +147,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "ip_protocol", "query_value": "tcp"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -161,6 +157,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 2a6063632..77b7238b8 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 @@ -137,11 +137,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -151,6 +147,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 5aff11594..78eeeefb8 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 @@ -136,11 +136,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -150,6 +146,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 9307b0388..7a66f610c 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 @@ -134,11 +134,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -148,6 +144,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 84f6028bc..191da0da1 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 @@ -133,11 +133,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -147,6 +143,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_internal_port_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_internal_port_range_mirror_bypass_vlan_none.py index f86ed8041..bb039e6a5 100644 --- a/tests/service_chaining/sc_raw_srcip_internal_port_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_internal_port_range_mirror_bypass_vlan_none.py @@ -128,11 +128,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -142,6 +138,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -241,8 +241,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_internal_port_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_internal_port_range_steer_bypass_vxlan_activeip_bfd.py index b6af6f70b..a16983b9f 100644 --- a/tests/service_chaining/sc_raw_srcip_internal_port_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_internal_port_range_steer_bypass_vxlan_activeip_bfd.py @@ -127,11 +127,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -141,6 +137,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -240,8 +240,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_mirror_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_bfd.py index a8d398f6b..1eca0bb32 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_bfd.py @@ -110,11 +110,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -124,6 +120,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -220,10 +220,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_none.py index 362839fa5..053da1588 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_none.py @@ -110,11 +110,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -124,6 +120,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -220,10 +220,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_bfd.py index 95bf52c03..413ed232a 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_bfd.py @@ -110,11 +110,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -124,6 +120,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -220,10 +224,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_none.py index cbf2fc262..3b18512f4 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_none.py @@ -110,11 +110,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -124,6 +120,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -222,10 +226,10 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_mirror_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_mirror_bypass_vxlan_unavailableip_bfd.py index 81e5f2d04..8160dee1b 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_bypass_vxlan_unavailableip_bfd.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -122,6 +118,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -218,10 +222,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_mirror_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_mirror_redispatch_block_vxlan_inactiveip_bfd.py index 34e21d886..d4891ba42 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_redispatch_block_vxlan_inactiveip_bfd.py @@ -113,11 +113,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -127,6 +123,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -223,10 +227,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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 aca432558..ad41d53c2 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 @@ -159,11 +159,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -173,6 +169,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error 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 38f7198cf..e620ec524 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 @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -172,6 +168,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error diff --git a/tests/service_chaining/sc_raw_srcip_negate_srcport_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_negate_srcport_range_mirror_bypass_vlan_none.py index 80d370416..95f06b5be 100644 --- a/tests/service_chaining/sc_raw_srcip_negate_srcport_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_negate_srcport_range_mirror_bypass_vlan_none.py @@ -128,11 +128,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -142,6 +138,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -241,8 +245,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_srcport_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py index 80d370416..95f06b5be 100644 --- a/tests/service_chaining/sc_raw_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py @@ -128,11 +128,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -142,6 +138,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -241,8 +245,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_steer_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_bfd.py index ca411aa34..1f5eb3e24 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_bfd.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -122,6 +118,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -218,10 +222,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_none.py index 5e924f61b..422b1ac9c 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_none.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -122,6 +118,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -218,10 +222,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_bfd.py index c08ee9e43..599eb25c6 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_bfd.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -122,6 +118,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -218,10 +222,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_none.py index 831ec6f24..c522de3e8 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_none.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -122,6 +118,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -218,10 +222,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_inactiveip_bfd.py index 27f65e295..d73d258e0 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_inactiveip_bfd.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -122,6 +118,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -218,10 +222,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_bfd.py index 9e93d803f..a3c4a1adb 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_bfd.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -122,6 +118,14 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -218,10 +222,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_none.py index 63e2158a0..03d000af0 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_none.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -122,6 +118,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -218,10 +218,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_redispatch_block_vxlan_inactiveip_bfd.py index 05a79daf2..9d0f8265d 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_redispatch_block_vxlan_inactiveip_bfd.py @@ -111,11 +111,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -125,6 +121,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -221,10 +221,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_steer_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_redispatch_bypass_vxlan_inactiveip_bfd.py index ba83b5397..e401b1dd0 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_redispatch_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_redispatch_bypass_vxlan_inactiveip_bfd.py @@ -112,11 +112,7 @@ def run(parameter): {"query_field_key": "sent_bytes", "query_value": ""}, {"query_field_key": "received_bytes", "query_value": ""} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -126,6 +122,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -222,10 +222,9 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, - "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_srcport_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcport_mirror_bypass_vlan_none.py index 4ce9c1645..2edbb8fa0 100644 --- a/tests/service_chaining/sc_raw_srcport_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcport_mirror_bypass_vlan_none.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -122,6 +118,10 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error @@ -221,8 +221,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_srcport_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcport_range_mirror_bypass_vlan_none.py index c4665b2cd..3d294385f 100644 --- a/tests/service_chaining/sc_raw_srcport_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcport_range_mirror_bypass_vlan_none.py @@ -108,11 +108,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -221,8 +217,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_srcport_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcport_range_steer_bypass_vxlan_activeip_bfd.py index 88cee1429..1bd97cbd3 100644 --- a/tests/service_chaining/sc_raw_srcport_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcport_range_steer_bypass_vxlan_activeip_bfd.py @@ -115,11 +115,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -228,8 +224,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_srcport_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcport_steer_bypass_vxlan_activeip_bfd.py index f47cbda65..2081b81ce 100644 --- a/tests/service_chaining/sc_raw_srcport_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcport_steer_bypass_vxlan_activeip_bfd.py @@ -103,11 +103,7 @@ def run(parameter): {"query_field_key": "received_bytes", "query_value": ""}, {"query_field_key": "client_port", "query_value": "41668"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -216,8 +212,8 @@ if __name__ == '__main__': "env": "tsgx", "vsys_id": 1, "is_log": 1, - "root_path": "C:/automation_project/tsg_test", - "path": "C:/automation_project/tsg_test/tests/ui", + "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_subid_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_subid_fqdn_http_url_mirror_bypass_vlan_none.py index 32a569bdc..ecdb031a9 100644 --- a/tests/service_chaining/sc_raw_subid_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_subid_fqdn_http_url_mirror_bypass_vlan_none.py @@ -159,11 +159,7 @@ def run(parameter): {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, {"query_field_key": "phone_number", "query_value": "12345678902"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": diff --git a/tests/service_chaining/sc_raw_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 4d6e7dbf1..0f893fbaa 100644 --- a/tests/service_chaining/sc_raw_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -158,11 +158,7 @@ def run(parameter): {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, {"query_field_key": "phone_number", "query_value": "12345678902"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": diff --git a/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_mirror_bypass_vlan_none.py index 7980fae90..c22a37f86 100644 --- a/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_mirror_bypass_vlan_none.py @@ -196,15 +196,7 @@ def run(parameter): {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, {"query_field_key": "phone_number", "query_value": "12345678902"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": diff --git a/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 8fb783200..fd2289c3f 100644 --- a/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -195,175 +195,7 @@ def run(parameter): {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, {"query_field_key": "phone_number", "query_value": "12345678902"} ] - } - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) - - # 替换condition中的ip为随机ip - organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) - organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + } # 创建 if parameter["initiation_method"] == "ui": @@ -373,6 +205,18 @@ def run(parameter): return ui_error elif parameter["initiation_method"] == "api": api_client = APIClient(parameter) + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + + + organize_config = OrganizeConfig(parameter, policy_configuration, api_client.token, ()) + organize_config.generate_random_ip(parameter, policy_configuration, traffic_generation) + objects_tuple, api_error = api_client.create_objects(policy_configuration) if len(api_error) > 0: return api_error |