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

调整公共方法适应修改策略

Browse Source
This commit is contained in:
dongxiaoyan
2020-05-07 19:50:49 +08:00
parent 60cba6422c
commit 3734bbd3cf
2 changed files with 3 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,7 +117,7 @@ AddPolicy2
[Return] ${rescode} ${policyId} [Return] ${rescode} ${policyId}
EditPolicy EditPolicy
[Arguments] ${policyList} ${returnData} ${opAction} [Arguments] ${returnData} ${policyList} ${opAction}
#add:表示新增 #add:表示新增
#update:表示修改策略内容，包括策略名称，策略动作，策略动作参数，引用的策略文件，引用的策略对象等有修改时 #update:表示修改策略内容，包括策略名称，策略动作，策略动作参数，引用的策略文件，引用的策略对象等有修改时
@@ -126,7 +126,7 @@ EditPolicy
${body} PolicyParamsOpertion ${1} ${policyList} ${opAction} ${body} PolicyParamsOpertion ${1} ${policyList} ${opAction}
${response} BaseEditRequest /policy/compile ${body} ${response} BaseEditRequest /policy/compile ${body}
${rescode} Set Variable ${response['code']} ${rescode} Set Variable ${response['code']}
[Return] ${rescode} ${policyId} ${response} [Return] ${rescode} ${response}
DeletePolicybak DeletePolicybak
[Arguments] ${policyids} [Arguments] ${policyids}

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

@@ -64,7 +64,7 @@ PolicyParamsOpertion
... ELSE Evaluate list(map(int, re.split('[,]', '${appObjectIdArray}'))) re ... ELSE Evaluate list(map(int, re.split('[,]', '${appObjectIdArray}'))) re
Set To Dictionary ${policyList} appObjectIdArray=${appObjectIdArrayV} Set To Dictionary ${policyList} appObjectIdArray=${appObjectIdArrayV}
# 固定值 # 固定值
Set To Dictionary ${policyList} policyId= doBlacklist=${0} Set To Dictionary ${policyList} doBlacklist=${0}
# 分别处理EffectiveRange、UserRegion和ReferenceObject参数 # 分别处理EffectiveRange、UserRegion和ReferenceObject参数
ManageEffectiveRange ${policyList} ManageEffectiveRange ${policyList}
#ManageUserRegion ${policyList} #ManageUserRegion ${policyList}