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-04-14 18:20:47 +08:00
parent e61d81aad5
commit 8aee95b648
9 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,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}
Library Collections
Library RequestsLibrary
@@ -11,14 +12,30 @@ Resource Common.robot
AddLocalIPObject
#创建对象IP
log to_AddLocalIPObject
${localIP} set variable {"opAction":"add","returnData":1,"objectList":{"objectType":"ip","objectSubType":"endpoint","isValid":1,"isInitialize":0,"isExclusion":0,"objectName":"autotestLocalIPObject_${testClentIP}","objectDesc":"LocalIPObject_${testClentIP}自动化测试机IP","subObjectIds":[],"addItemList":[{"addrType":4,"protocol":0,"direction":0,"isSession":"endpoint","clientIp1":"${testClentIP}","clientIp2":"${testClentIP}","clientIpFormat":"range","clientPortFormat":"range","clientPort1":0,"clientPort2":0,"serverIpFormat":"range","serverIp1":"","serverIp2":"","serverPortFormat":"range","serverPort1":0,"serverPort2":0}],"updateItemList":[],"deleteItemIds":[]}}
${rescodeip} ${objidip} AddObject ${localIP}
#${localIP} set variable {"opAction":"add","returnData":1,"objectList":{"objectType":"ip","objectSubType":"endpoint","isValid":1,"isInitialize":0,"isExclusion":0,"objectName":"autotestLocalIPObject_${testClentIP}","objectDesc":"LocalIPObject_${testClentIP}自动化测试机IP","subObjectIds":[],"addItemList":[{"addrType":4,"protocol":0,"direction":0,"isSession":"endpoint","clientIp1":"${testClentIP}","clientIp2":"${testClentIP}","clientIpFormat":"range","clientPortFormat":"range","clientPort1":0,"clientPort2":0,"serverIpFormat":"range","serverIp1":"","serverIp2":"","serverPortFormat":"range","serverPort1":0,"serverPort2":0}],"updateItemList":[],"deleteItemIds":[]}}
#${rescodeip} ${objidip} AddObject ${localIP}
#${localSubIP} set variable {"opAction":"add","returnData":1,"objectList":{"objectType":"subscriberid","objectSubType":"","isValid":1,"isInitialize":0,"isExclusion":0,"objectName":"test57","objectDesc":"${testSubscriberID}","subObjectIds":[],"addItemList":[{"keywordArray":["${testSubscriberID}"],"itemId":"","isHexbin":0}],"updateItemList":[],"deleteItemIds":[]}}
#${rescodesub} ${subiid} AddObject ${localSubIP}
# 创建对象-IP
Create Dictionary
${objectDict} Create Dictionary
... objectType=ip
... objectName=autotest_localIP_${testClentIP}
... isValid=${1}
... addItemList=range|${testClentIP}|${testClentIP}|0/0
${rescode} ${objectId} AddObject2 ${1} ${objectDict}
#log ${rescodeip}
log LocalIP：${objidip}
SET GLOBAL VARIABLE ${testClentID} ${objidip}
log LocalIP：${objectId}
SET GLOBAL VARIABLE ${testClentID} ${objectId}
log to_AddLocalSubidObject
${localSubIP} set variable {"opAction":"add","returnData":1,"objectList":{"objectType":"subscriberid","objectSubType":"","isValid":1,"isInitialize":0,"isExclusion":0,"objectName":"test57","objectDesc":"${testSubscriberID}","subObjectIds":[],"addItemList":[{"keywordArray":["${testSubscriberID}"],"itemId":"","isHexbin":0}],"updateItemList":[],"deleteItemIds":[]}}
${rescodesub} ${subiid} AddObject ${localSubIP}
${objectDict} Create Dictionary
... objectType=subscriberid
... objectName=autotest_localSubId_${testSubscriberID}
... isValid=${1}
... addItemList=${testSubscriberID}
${rescode} ${subiid} AddObject2 ${1} ${objectDict}
#log ${subiid}
log LocalSubIP：${subiid}
SET GLOBAL VARIABLE ${testClentSubID} ${subiid}
@@ -139,3 +156,5 @@ DeletePolicyAndObject
#删除对象
log todeleteobj_DeletePolicyAndObject
DeleteObject ${objectids}

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

@@ -199,7 +199,7 @@ ManageReferenceObject
ManageClientObject
# 增加引用测试终端IP策略对象
${emptyList} Create List
${emptyList} Create List TSG_SECURITY_SOURCE_ADDR
${obj} Create Dictionary objectId=${testClentID} protocolFields=${emptyList}
[Return] ${obj}