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

策略新增接口AddObjects返回参数格式处理，适应获取删除格式字符串和ids，添加备注信息

Browse Source
This commit is contained in:
dongxiaoyan
2021-01-27 10:26:51 +08:00
parent ea537b29d1
commit 71dbf9d98f
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
01-TestCase/tsg_bfapi/policy_object/4961PolicyTests.robot
View File

@@ -19,14 +19,14 @@ Policy-DefaultDenyDropRST-00001
${policy} Create Dictionary policyName=default policy policyType=tsg_security ${policy} Create Dictionary policyName=default policy policyType=tsg_security
... policyDesc=update-autotest deny drop policyId=0 ... policyDesc=update-autotest deny drop policyId=0
... action=deny ... action=deny
... userRegion={"method":"drop","protocol":""} ... userRegion={"method":"drop"}
... isValid=${1} ... isValid=${1}
${rescode} UpdatePolicies 1 ${policy} v2 update ${rescode} UpdatePolicies 1 ${policy} v2 update
${policy} Create Dictionary policyName=default policy policyType=tsg_security ${policy} Create Dictionary policyName=default policy policyType=tsg_security
... policyDesc=update-autotest deny rst policyId=0 ... policyDesc=update-autotest deny rst policyId=0
... action=deny ... action=deny
... userRegion={"method":"rst","protocol":""} ... userRegion={"method":"rst"}
... isValid=${1} ... isValid=${1}
${rescode} UpdatePolicies 1 ${policy} v2 update ${rescode} UpdatePolicies 1 ${policy} v2 update
@@ -43,7 +43,7 @@ Policy-DefaultMonitor-00002
${policy} Create Dictionary policyName=default policy policyType=tsg_security ${policy} Create Dictionary policyName=default policy policyType=tsg_security
... policyDesc=update-autotest monitor policyId=0 ... policyDesc=update-autotest monitor policyId=0
... action=monitor ... action=monitor
... userRegion={"protocol":""} ... userRegion={}
... isValid=${1} ... isValid=${1}
${rescode} UpdatePolicies 1 ${policy} v2 update ${rescode} UpdatePolicies 1 ${policy} v2 update
@@ -51,7 +51,7 @@ Policy-DefaultMonitor-00002
${policy} Create Dictionary policyName=default policy policyType=tsg_security ${policy} Create Dictionary policyName=default policy policyType=tsg_security
... policyDesc=update-autotest policyId=0 ... policyDesc=update-autotest policyId=0
... action=allow ... action=allow
... userRegion={"protocol":""} ... userRegion={}
... isValid=${1} ... isValid=${1}
${rescode} UpdatePolicies 1 ${policy} v2 update ${rescode} UpdatePolicies 1 ${policy} v2 update
@@ -60,14 +60,14 @@ Policy-DefaultIntercept-00002
${policy} Create Dictionary policyName=default policy policyType=tsg_security ${policy} Create Dictionary policyName=default policy policyType=tsg_security
... policyDesc=update-autotest intercept policyId=0 ... policyDesc=update-autotest intercept policyId=0
... action=intercept ... action=intercept
... userRegion={"protocol":""} ... userRegion={}
... isValid=${1} ... isValid=${1}
${rescode} UpdatePolicies 1 ${policy} v2 update ${rescode} UpdatePolicies 1 ${policy} v2 update
#恢复 #恢复
${policy} Create Dictionary policyName=default policy policyType=tsg_security ${policy} Create Dictionary policyName=default policy policyType=tsg_security
... policyDesc=update-autotest policyId=0 ... policyDesc=update-autotest policyId=0
... action=allow ... action=allow
... userRegion={"protocol":""} ... userRegion={}
... isValid=${1} ... isValid=${1}
${rescode} UpdatePolicies 1 ${policy} v2 update ${rescode} UpdatePolicies 1 ${policy} v2 update
@@ -117,8 +117,10 @@ Policy-AllowURL+IP-00003
... filterList=${objectId4}|TSG_FIELD_HTTP_URL ... filterList=${objectId4}|TSG_FIELD_HTTP_URL
... isValid=${1} ... isValid=${1}
... appIdObjects=${HTTP_ID} ... appIdObjects=${HTTP_ID}
${rescode} ${policyIds} AddPolicies 1 ${policy} v2 ${rescode} ${policyIds} AddPolicies 1 ${policy} v2
Log ${rescode} Log ${rescode}
log ${policyIds}
${ids} Get-Pids ${policyIds}
Policy-AllowURL-00004 Policy-AllowURL-00004
[Tags] xj xzw [Tags] xj xzw
@@ -354,4 +356,6 @@ Policy-MonitorOnlySDA-00009
... appIdObjects=${HTTP_ID},${DNS_ID},${SSL_ID} ... appIdObjects=${HTTP_ID},${DNS_ID},${SSL_ID}
@{policyList} Create List ${policy} ${policy1} ${policy2} ${policy3} ${policy4} @{policyList} Create List ${policy} ${policy1} ${policy2} ${policy3} ${policy4}
${rescode} ${policyIds} AddPolicies 1 ${policyList} v2 ${rescode} ${policyIds} AddPolicies 1 ${policyList} v2
Log ${rescode} ${policyIds} ${objectIds} Log ${rescode} ${policyIds} ${objectIds}
log ${policyIds}
${ids} Get-Pids ${policyIds}

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

@@ -337,6 +337,8 @@ ManageFilter
Get-PolicyIds Get-PolicyIds
[Arguments] ${value} [Arguments] ${value}
[Documentation] 获取结果中的策略类型及ID [Documentation] 获取结果中的策略类型及ID
... 策略接口返回json串
... 返回结果格式：[{'policyType': 'tsg_security', 'policyIds': [108480]}, {'policyType': 'tsg_security', 'policyIds': [108481]}, {'policyType': 'tsg_security', 'policyIds': [108482]}, {'policyType': 'tsg_security', 'policyIds': [108483]}, {'policyType': 'tsg_security', 'policyIds': [108484]}]
${policyIds} Create List ${policyIds} Create List
FOR ${policy} IN @{value['data']['policyList']} FOR ${policy} IN @{value['data']['policyList']}
${policyIdList} Create List ${policy['policyId']} ${policyIdList} Create List ${policy['policyId']}
@@ -352,6 +354,8 @@ Get-PolicyIds
Get-Pids Get-Pids
[Arguments] ${policyIds} [Arguments] ${policyIds}
[Documentation] 获取结果中的策略ID [Documentation] 获取结果中的策略ID
... 入参格式：[{'policyType': 'tsg_security', 'policyIds': [108480]}, {'policyType': 'tsg_security', 'policyIds': [108481]}, {'policyType': 'tsg_security', 'policyIds': [108482]}, {'policyType': 'tsg_security', 'policyIds': [108483]}, {'policyType': 'tsg_security', 'policyIds': [108484]}]
... 返回结果格式 [108480, 108481, 108482, 108483, 108484]
${ids} Create List ${ids} Create List
${len} Get Length ${policyIds} ${len} Get Length ${policyIds}
FOR ${var} IN RANGE ${len} FOR ${var} IN RANGE ${len}