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

将自动添加的ip和subid存入文件中，修改拼写错误的default

Browse Source
This commit is contained in:
hebingning
2021-03-11 15:45:36 +08:00
parent 1c6f2721c5
commit 8af6c69a1c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot
View File

@@ -4,6 +4,7 @@ Library Collections
Resource ../../../03-Variable/BifangApiVariable.txt Resource ../../../03-Variable/BifangApiVariable.txt
Resource ../../../03-Variable/PolicyObjectDefault.txt Resource ../../../03-Variable/PolicyObjectDefault.txt
Resource ../../tsg_common/ManagePolicyBody.robot Resource ../../tsg_common/ManagePolicyBody.robot
Resource ../../../02-Keyword/tsg_adc/FileOperation.robot
*** Variables *** *** Variables ***
#arraySplitor:数组元素之间的分隔符 #arraySplitor:数组元素之间的分隔符
@@ -247,7 +248,7 @@ ManageObjectV2
# 处理引用对象字符串 # 处理引用对象字符串
Log To Console Call ManageObjectV2 Log To Console Call ManageObjectV2
#默认客户端条件类型：clientip or clientsubid #默认客户端条件类型：clientip or clientsubid
${return} ${defaultClient} Run Keyword And Ignore Error Get From Dictionary ${policy} defalutClient ${return} ${defaultClient} Run Keyword And Ignore Error Get From Dictionary ${policy} defaultClient
${defaultClient} Run Keyword If "${return}"=="FAIL" or "${defaultClient}"=="${EMPTY}" Set Variable ${Default_Client_Type} ${defaultClient} Run Keyword If "${return}"=="FAIL" or "${defaultClient}"=="${EMPTY}" Set Variable ${Default_Client_Type}
... ELSE Set Variable ${defaultClient} ... ELSE Set Variable ${defaultClient}
${sourceList} Create List ${sourceList} Create List
@@ -264,8 +265,9 @@ ManageObjectV2
ManageClientIPObjectV2 ManageClientIPObjectV2
[Arguments] ${emptyList} [Arguments] ${emptyList}
# 增加引用测试终端IP策略对象 # 增加引用测试终端IP策略对象
${intid} Evaluate int(${testClentID})
${intid} Evaluate int(${testClentID}) log ${intid}
insert_policyId_to_file1 testClentIpId ${intid}
${obj1} Create Dictionary objectId=${intid} protocolField=TSG_SECURITY_SOURCE_ADDR ${obj1} Create Dictionary objectId=${intid} protocolField=TSG_SECURITY_SOURCE_ADDR
Append To List ${emptyList} ${obj1} Append To List ${emptyList} ${obj1}
@@ -273,6 +275,8 @@ ManageClientSubIDObjectV2
[Arguments] ${emptyList} [Arguments] ${emptyList}
# 增加引用测试终端IP策略对象 # 增加引用测试终端IP策略对象
${protocolField} Set Variable ${protocolField} Set Variable
log ${testClentSubID}
insert_policyId_to_file1 testClentSubId ${testClentSubID}
${obj1} Create Dictionary objectId=${testClentSubID} protocolField=${protocolField} ${obj1} Create Dictionary objectId=${testClentSubID} protocolField=${protocolField}
Append To List ${emptyList} ${obj1} Append To List ${emptyList} ${obj1}