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

更新初始化ip参数

Browse Source
This commit is contained in:
朱明明
2020-07-22 18:38:44 +08:00
parent 5aa321838b
commit 98760ccdeb
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ Resource ../../03-Variable/BifangApiVariable.txt
Resource ../tsg_common/ManagePolicyBody.robot Resource ../tsg_common/ManagePolicyBody.robot
Resource ../tsg_common/ManageObjectBody.robot Resource ../tsg_common/ManageObjectBody.robot
Resource ../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot Resource ../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
Resource ../../02-Keyword/tsg_bfapi/policy_object/Object.robot
Library REST http://${host}:${port} Library REST http://${host}:${port}
Library Collections Library Collections
Library RequestsLibrary Library RequestsLibrary
@@ -10,6 +11,7 @@ Resource Common.robot
*** Keywords *** *** Keywords ***
AddLocalIPObject AddLocalIPObject
#创建对象IP #创建对象IP
log to_AddLocalIPObject 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":[]}} #${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":[]}}
@@ -17,23 +19,32 @@ AddLocalIPObject
#${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":[]}} #${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} #${rescodesub} ${subiid} AddObject ${localSubIP}
# 创建对象-IP # 创建对象-IP
Create Dictionary # Create Dictionary
${objectDict} Create Dictionary # ${objectDict} Create Dictionary
... objectType=ip # ... objectType=ip
... objectSubType=${Default_ObjectSubType} # ... objectSubType=${Default_ObjectSubType}
... isInitialize=${Default_IsInitialize} # ... isInitialize=${Default_IsInitialize}
... isExclusion=${Default_IsExclusion} # ... isExclusion=${Default_IsExclusion}
... objectName=autotest_localIP_${testClentIP} # ... objectName=autotest_localIP_${testClentIP}
... objectDesc=${Default_ObjectDesc} # ... objectDesc=${Default_ObjectDesc}
... subObjectIds=${Default_SubObjectIds} # ... subObjectIds=${Default_SubObjectIds}
... isValid=${1} # ... isValid=${1}
... addItemList=range|${testClentIP}|${testClentIP}|0/0&${Default_AddItem_ServerIpFormat}|${Default_AddItem_ServerIp1}|${Default_AddItem_ServerIp2}|${Default_AddItem_ServerPort}|${Default_AddItem_IsInitialize}|${Default_AddItem_ItemName}|${Default_AddItem_ItemDesc} # ... addItemList=range|${testClentIP}|${testClentIP}|0/0&${Default_AddItem_ServerIpFormat}|${Default_AddItem_ServerIp1}|${Default_AddItem_ServerIp2}|${Default_AddItem_ServerPort}|${Default_AddItem_IsInitialize}|${Default_AddItem_ItemName}|${Default_AddItem_ItemDesc}
${rescode} ${objectId} AddObject2 ${1} ${objectDict} # ${rescode} ${objectId} AddObject2 ${1} ${objectDict}
#log ${rescodeip} # #log ${rescodeip}
log LocalIP：${objectId} # log LocalIP：${objectId}
SET GLOBAL VARIABLE ${testClentID} ${objectId}
Comment 创建IP
#object为IP→endpoint时的addItemList单个对象
${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP}-${testClentIP} port=0-0 direction=0 protocol=0 isInitialize=0
#可以添加多个
${addItemLists} Create list ${addItemList1}
#objectList对象
${objectDict} Create Dictionary objectType=ip isValid=${1} addItemList=${addItemLists}
${rescode} ${objectId1} AddObjects ${1} ${objectDict}
SET GLOBAL VARIABLE ${testClentID} ${objectId1}
log to_AddLocalSubidObject log to_AddLocalSubidObject
${objectDict} Create Dictionary ${objectDict} Create Dictionary
... objectType=subscriberid ... objectType=subscriberid