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:
zhangwenqing
2020-04-16 14:27:54 +08:00
parent 1903bf814d
commit 23c7bf117a
6 changed files with 63 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
02-Keyword/tsg_common/Case.robot
View File

@@ -23,7 +23,7 @@ case01
# 创建对象-http_signature
# addItemList全参数：（参数不可跳跃，[keywordArray]|[district]为必填，其它可省略）
# [keywordArray]|[district]|[isHexbin]|[isSession]|[isInitialize]|[itemName]|[itemDesc],...
# [keywordArray]|[district]|[isHexbin]|[isInitialize]|[itemName]|[itemDesc],...
${objectDict} Create Dictionary
... objectType=http_signature
... isValid=${1}
@@ -32,7 +32,7 @@ case01
# 创建对象-url/fqdn/keywords/subscriberid/fqdn_category/account
# addItemList全参数：（参数不可跳跃，[keywordArray]为必填，其它可省略）
# [keywordArray]|[isHexbin]|[isSession]|[isInitialize]|[itemName]|[itemDesc],...
# [keywordArray]|[isHexbin]|[isInitialize]|[itemName]|[itemDesc],...
${objectDict} Create Dictionary
... objectType=url
... isValid=${1}

7
02-Keyword/tsg_common/ManageObjectBody.robot
View File

@@ -43,8 +43,11 @@ ObjectParamsOpertion
Run Keyword If "${return}"!="FAIL" and "${objectDesc}"!="${EMPTY}" Set To Dictionary ${returnDict} objectDesc=${objectDesc}
... ELSE Set To Dictionary ${returnDict} objectDesc=${Default_ObjectDesc}
${return} ${subObjectIds} Run Keyword And Ignore Error Set Variable ${objectList}[subObjectIds]
Run Keyword If "${return}"!="FAIL" and "${subObjectIds}"!="${EMPTY}" Set To Dictionary ${returnDict} subObjectIds=${subObjectIds}
... ELSE Set To Dictionary ${returnDict} subObjectIds=${emptyList}
${subObjectIdsV} Run Keyword If "${return}"!="FAIL" and "${subObjectIds}"!="${EMPTY}" and "${subObjectIds}"!="${None}" Evaluate list(map(int, re.split('[,]', '${subObjectIds}'))) re
... ELSE Set Variable ${emptyList}
Set To Dictionary ${returnDict} subObjectIds=${subObjectIdsV}
# 处理AddItemList
ManageAddItemList ${objectList} ${returnDict}

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

@@ -184,8 +184,8 @@ ManageReferenceObject
# 处理引用对象字符串
[Arguments] ${policyList}
${emptyList} Create List
${clientHostObj} Run Keyword If '${addTestClentIPFlag}'=='1' ManageClientObject
Run Keyword If "${clientHostObj}"!="${None}" Append To List ${emptyList} ${clientHostObj}
Run Keyword If '${addTestClentIPFlag}'=='1' ManageClientObject ${emptyList}
# Run Keyword If "${clientHostObj}"!="${None}" Append To List ${emptyList} ${clientHostObj}
${defaultObj} Create Dictionary
${return} ${referenceObject} Run Keyword And Ignore Error Set Variable ${policyList}[referenceObject]
@@ -200,10 +200,14 @@ ManageReferenceObject
Set To Dictionary ${policyList} referenceObject=${emptyList}
ManageClientObject
[Arguments] ${emptyList}
# 增加引用测试终端IP策略对象
${emptyList} Create List TSG_SECURITY_SOURCE_ADDR
${obj} Create Dictionary objectId=${testClentID} protocolFields=${emptyList}
[Return] ${obj}
${list1} Create List TSG_SECURITY_SOURCE_ADDR
${obj1} Create Dictionary objectId=${testClentID} protocolFields=${list1}
Append To List ${emptyList} ${obj1}
# ${list2} Create List null
# ${obj2} Create Dictionary objectId=${testClentSubID} protocolFields=${list2}
# Append To List ${emptyList} ${obj2}
AnalysisReferenceObject