diff --git a/02-Keyword/tsg_bfapi/PolicyObject.robot b/02-Keyword/tsg_bfapi/PolicyObject.robot index e9a1c7b..3132f5d 100644 --- a/02-Keyword/tsg_bfapi/PolicyObject.robot +++ b/02-Keyword/tsg_bfapi/PolicyObject.robot @@ -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} diff --git a/02-Keyword/tsg_common/ManagePolicyBody.robot b/02-Keyword/tsg_common/ManagePolicyBody.robot index 1db9ca1..e185aa1 100644 --- a/02-Keyword/tsg_common/ManagePolicyBody.robot +++ b/02-Keyword/tsg_common/ManagePolicyBody.robot @@ -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}