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

1、策略修改接口不支持返回数据，所以删除修改时的是否返回数据参数；

Browse Source 
2、修改拼接对象json时把policyid置空逻辑为修改不置空，新增置空
This commit is contained in:
dongxiaoyan
2020-05-07 20:00:23 +08:00
parent 3734bbd3cf
commit 8ccae9a967
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
02-Keyword/tsg_bfapi/PolicyObject.robot
View File

@@ -117,13 +117,13 @@ AddPolicy2
[Return] ${rescode} ${policyId}
EditPolicy
[Arguments] ${returnData} ${policyList} ${opAction}
[Arguments] ${policyList} ${opAction}
#add:表示新增
#update:表示修改策略内容，包括策略名称，策略动作，策略动作参数，引用的策略文件，引用的策略对象等有修改时
#disable:表示停用，只修改isValid属性为0
#enable：表示启用，只修改isValid属性为1
${body} PolicyParamsOpertion ${1} ${policyList} ${opAction}
${body} PolicyParamsOpertion ${0} ${policyList} ${opAction}
${response} BaseEditRequest /policy/compile ${body}
${rescode} Set Variable ${response['code']}
[Return] ${rescode} ${response}

4
02-Keyword/tsg_common/ManagePolicyBody.robot
View File

@@ -63,8 +63,10 @@ PolicyParamsOpertion
${appObjectIdArrayV} Run Keyword If "${return}"=="FAIL" or "${appObjectIdArray}"=="${EMPTY}" Evaluate list(map(int, re.split('[,]', '${Default_AppObjectIdArray}'))) re
... ELSE Evaluate list(map(int, re.split('[,]', '${appObjectIdArray}'))) re
Set To Dictionary ${policyList} appObjectIdArray=${appObjectIdArrayV}
${policyId} Run Keyword If "${opAction}"=="add" Set Variable ${EMPTY}
... ELSE Set Variable ${policyList}[policyId]
# 固定值
Set To Dictionary ${policyList} doBlacklist=${0}
Set To Dictionary ${policyList} policyId=${policyId} doBlacklist=${0}
# 分别处理EffectiveRange、UserRegion和ReferenceObject参数
ManageEffectiveRange ${policyList}
#ManageUserRegion ${policyList}