gfwleak/dongxiaoyan-tsg-autotest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:(策略新增修改)1.分隔符参数化，将分隔符定义于Variables中

Browse Source 
2.filterList分隔符向v1版本兼容，objectId和protocolField之间的分隔符默认值改成|，objectId之间的分隔符改成：
This commit is contained in:
wangxin
2020-07-01 10:59:42 +08:00
parent cec28c7a7a
commit 230d0b6634
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
02-Keyword/tsg_bfapi/policy_object/Policy.robot
View File

@@ -35,12 +35,14 @@ AddPolicies
... 为字符串类型，以','分隔
... v2版本特殊参数说明：
... v2版本中无referenceObject，取而代之的是source，destination，filterList
... source= ${265}|TSG_FIELD_HTTP_HOST,${266}|TSG_FIELD_SSL_SNI&TSG_FIELD_SSL_SAN
... destination= ${265}|TSG_FIELD_HTTP_HOST,${266}|TSG_FIELD_SSL_SNI&TSG_FIELD_SSL_SAN
... filterList= ${265}|${257}:TSG_FIELD_HTTP_HOST,${266}|${299}:TSG_FIELD_SSL_SNI
... filterList由多个数字用‘|’分隔，加上：对上对应的protocolFiled,
... source= ${265}|TSG_FIELD_HTTP_HOST,${266}|TSG_FIELD_SSL_SNI
... destination= ${265}|TSG_FIELD_HTTP_HOST,${266}|TSG_FIELD_SSL_SNI
... filterList= ${265}:${257}|TSG_FIELD_HTTP_HOST,${266}:${299}|TSG_FIELD_SSL_SNI
... filterList由多个数字用‘:’分隔，加上|对上对应的protocolFiled,
... 一个filter中的protocolFiled是确定的，一个protocolFiled对应多个objectId
... v2版本不支持protocolFiled之间的&符号连接,因为接口中protocolFiled不是数组结构
... appIdObjects==${2},${3}
... 20200701修订：分隔符号在Variables中定义,可替换
[Arguments] ${returnData} ${policyList} ${version}
Log To Console Call AddPolicies
${returnData}= Run Keyword If '${returnData}' == '${EMPTY}' Set Variable 1