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-06-16 16:42:04 +08:00
parent d49bacc3ac
commit a2b1f8e435
32 changed files with 123 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ Resource ../../03-Variable/BifangApiVariable.txt
Resource ../tsg_common/ManagePolicyBody.robot
Resource ../tsg_common/ManageObjectBody.robot
Resource ../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Library REST http://${host}:${port}/${version}
Library REST http://${host}:${port}
Library Collections
Library RequestsLibrary
Resource Common.robot
@@ -52,17 +52,17 @@ AddLocalIPObject
DelLocalIPObject
log to_DelLocalIPObject
${response} BaseDeleteRequest /policy/object {"objectIds":[${testClentID}]}
${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 /policy/object {"objectIds":[${testClentSubID}]}
${response} BaseDeleteRequest /${version}/policy/object {"objectIds":[${testClentSubID}]}
SET GLOBAL VARIABLE ${testClentSubID} ${EMPTY}
AddObject
[Arguments] ${body}
#addIPobject#################################################################################
${response} BasePostRequest /policy/object body=${body}
${response} BasePostRequest /${version}/policy/object body=${body}
#log ${response}
${objectId} Set Variable ${response['data']['objectList'][0]['objectId']}
${rescodeReturn} Set Variable ${response['code']}
@@ -72,7 +72,7 @@ AddObject2
[Arguments] ${returnData} ${objectList}
${body} ObjectParamsOpertion ${returnData} ${objectList} add
${response} BasePostRequest /policy/object body=${body}
${response} BasePostRequest /${version}/policy/object body=${body}
${objectId} Set Variable ${response['data']['objectList'][0]['objectId']}
${rescodeReturn} Set Variable ${response['code']}
[Return] ${rescodeReturn} ${objectId}
@@ -80,7 +80,7 @@ AddObject2
EditObject
[Arguments] ${objectList} ${opAction}
${body} ObjectParamsOpertion ${0} ${objectList} ${opAction}
${response} BaseEditRequest /policy/object ${body}
${response} BaseEditRequest /${version}/policy/object ${body}
${rescodeReturn} Set Variable ${response['code']}
[Return] ${rescodeReturn}
@@ -99,14 +99,14 @@ DeleteObjectbak
AddPolicy
[Arguments] ${body}
${response} BasePostRequest V2/policy/compile body=${body}
${response} BasePostRequest /${version}/policy/compile body=${body}
#log ${response}
${policyId} Set Variable ${response['data']['policyList'][0]['policyId']}
${rescode} Set Variable ${response['code']}
[Return] ${rescode} ${policyId}
QueryPolicy
[Arguments] ${body}
${response} BaseGetRequest /policy/compile body=${body}
${response} BaseGetRequest /${version}/policy/compile body=${body}
#log ${response}
${rescode} Set Variable ${response['code']}
[Return] ${rescode} ${response}
@@ -114,7 +114,7 @@ AddPolicy2
[Arguments] ${returnData} ${policyList}
${body} PolicyParamsOpertion ${returnData} ${policyList} add
${response} BasePostRequest /policy/compile body=${body}
${response} BasePostRequest /${version}/policy/compile body=${body}
${policyId} Set Variable ${response['data']['policyList'][0]['policyId']}
${rescode} Set Variable ${response['code']}
[Return] ${rescode} ${policyId}
@@ -125,7 +125,7 @@ AddPolicy2006
${body} json.Dumps ${objectDict}
#${body} PolicyParamsOpertion ${returnData} ${policyList} add
${response} BasePostRequest /policy/compile body=${body}
${response} BasePostRequest /${version}/policy/compile body=${body}
${policyId} Set Variable ${response['data']['policyList'][0]['policyId']}
${rescode} Set Variable ${response['code']}
[Return] ${rescode} ${policyId}
@@ -138,14 +138,14 @@ EditPolicy
#disable:表示停用，只修改isValid属性为0
#enable：表示启用，只修改isValid属性为1
${body} PolicyParamsOpertion ${0} ${policyList} ${opAction}
${response} BaseEditRequest /policy/compile ${body}
${response} BaseEditRequest /${version}/policy/compile ${body}
${rescode} Set Variable ${response['code']}
[Return] ${rescode} ${response}
DeletePolicybak
[Arguments] ${policyids}
${body} String {"policyType":"tsg_security","policyIds":[${policyids}]}
DELETE /policy/compile body=${body} headers=${headers}
DELETE /${version}/policy/compile body=${body} headers=${headers}
Object response body
log DeletePolicy
Output response body
@@ -157,7 +157,7 @@ DeletePolicy
[Arguments] ${body}
#删除策略
log toDeletePolicy_DeletePolicyDeletePolicy
${response} BaseDeleteRequest /policy/compile ${body}
${response} BaseDeleteRequest /${version}/policy/compile ${body}
#{"policyType":"tsg_security","policyIds":[${policyids}]}
${response_code} Get From Dictionary ${response} code
Should Be Equal As Strings ${response_code} 200
@@ -169,7 +169,7 @@ DeleteObject
[Arguments] ${objectids}
#删除对象
log todeleteobj
${response} BaseDeleteRequest /policy/object {"objectIds":[${objectids}]}
${response} BaseDeleteRequest /${version}/policy/object {"objectIds":[${objectids}]}
${response_code} Get From Dictionary ${response} code
#log aaaaaaaaaa:${response_code}
Should Be Equal As Strings ${response_code} 200