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

1、Allow_Http_test.robot修改错误用例：ProxyPolicy-Allow-Http-00001

Browse Source 
2、LoginLogout.robot调整UIAPI白名单删除问题；
3、ManaeObjectBody.robot修改格式错误；
4、合并删除一级对象和多级对象方法
This commit is contained in:
dongxiaoyan
2020-09-01 16:39:09 +08:00
parent 920d871fe9
commit e9e809e1a8
4 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,12 +63,19 @@ AddLocalIPObject
DelLocalIPObject
log to_DelLocalIPObject
${response} BaseDeleteRequest /${version}/policy/object {"objectIds":[${testClentID}]}
${emptyList} Create List
${objectId1} Create List [${testClentID},${testClentSubID}]
DeletePolicyAndGroupObject ${emptyList} ${objectId1}
SET GLOBAL VARIABLE ${testClentID} ${EMPTY}
SET GLOBAL VARIABLE ${testClentSubID} ${EMPTY}
#${response} BaseDeleteRequest /${version}/policy/object {"objectIds":[${testClentID}]}
#${response_code} Get From Dictionary ${response} code
#Should Be Equal As Strings ${response} {'code': 200, 'msg': 'Success', 'success': True}
SET GLOBAL VARIABLE ${testClentID} ${EMPTY}
${response} BaseDeleteRequest /${version}/policy/object {"objectIds":[${testClentSubID}]}
SET GLOBAL VARIABLE ${testClentSubID} ${EMPTY}
#SET GLOBAL VARIABLE ${testClentID} ${EMPTY}
#${response} BaseDeleteRequest /${version}/policy/object {"objectIds":[${testClentSubID}]}
#SET GLOBAL VARIABLE ${testClentSubID} ${EMPTY}
AddObject
[Arguments] ${body}
@@ -303,19 +310,23 @@ DeleteProfiles
DeletePolicyAndObject
[Arguments] ${policyids} ${objectids}
#删除和对象
#2020-09-01修改，引用DeletePolicyAndGroupObject，避免分别维护并兼容之前用例
${objectId1} Create List [${objectids}]
DeletePolicyAndGroupObject ${policyIds} ${objectId1}
#删除策略
log toDeletePolicy_DeletePolicyAndObject
${listlenth}= Get Length ${policyids}
FOR ${var} IN RANGE ${listlenth}
#log toDeletePolicy_DeletePolicyAndObject
#${listlenth}= Get Length ${policyids}
#FOR ${var} IN RANGE ${listlenth}
#log dxytest111111
log ${var}
DeletePolicy ${policyids}[${var}]
#log ${var}
#DeletePolicy ${policyids}[${var}]
#Should Contain ${commandreturn} ${ca}
END
#END
#删除对象
log todeleteobj_DeletePolicyAndObject
Run Keyword If "${objectids}"=="${EMPTY}" log no obj to del
... ELSE DeleteObject ${objectids}
#log todeleteobj_DeletePolicyAndObject
#Run Keyword If "${objectids}"=="${EMPTY}" log no obj to del
# ... ELSE DeleteObject ${objectids}
DeletePolicyAndGroupObject
[Arguments] ${policyids} ${objectids}