From 71dbf9d98f2bc37ec9ca0d413bf370cfd2f0ce18 Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@zdjizhi.com>
Date: Wed, 27 Jan 2021 10:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3AddObjects=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=A4=84=E7=90=86=EF=BC=8C=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=A0=E9=99=A4=E6=A0=BC=E5=BC=8F=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=92=8Cids=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../policy_object/4961PolicyTests.robot       | 20 +++++++++++--------
 .../policy_object/ProcessPolicyBody.robot     |  4 ++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/01-TestCase/tsg_bfapi/policy_object/4961PolicyTests.robot b/01-TestCase/tsg_bfapi/policy_object/4961PolicyTests.robot
index 262a9d9..aea0289 100644
--- a/01-TestCase/tsg_bfapi/policy_object/4961PolicyTests.robot
+++ b/01-TestCase/tsg_bfapi/policy_object/4961PolicyTests.robot
@@ -19,14 +19,14 @@ Policy-DefaultDenyDropRST-00001
     ${policy}    Create Dictionary    policyName=default policy    policyType=tsg_security
     ...    policyDesc=update-autotest deny drop    policyId=0
     ...    action=deny    
-    ...    userRegion={"method":"drop","protocol":""}
+    ...    userRegion={"method":"drop"}
     ...    isValid=${1}
     ${rescode}   UpdatePolicies    1    ${policy}    v2    update
     
     ${policy}    Create Dictionary    policyName=default policy    policyType=tsg_security
     ...    policyDesc=update-autotest deny rst    policyId=0
     ...    action=deny    
-    ...    userRegion={"method":"rst","protocol":""}
+    ...    userRegion={"method":"rst"}
     ...    isValid=${1}
     ${rescode}   UpdatePolicies    1    ${policy}    v2    update
     
@@ -43,7 +43,7 @@ Policy-DefaultMonitor-00002
     ${policy}    Create Dictionary    policyName=default policy    policyType=tsg_security
     ...    policyDesc=update-autotest monitor    policyId=0
     ...    action=monitor     
-    ...    userRegion={"protocol":""}
+    ...    userRegion={}
     ...    isValid=${1}
     ${rescode}   UpdatePolicies    1    ${policy}    v2    update    
    
@@ -51,7 +51,7 @@ Policy-DefaultMonitor-00002
     ${policy}    Create Dictionary    policyName=default policy    policyType=tsg_security
     ...    policyDesc=update-autotest    policyId=0
     ...    action=allow    
-    ...    userRegion={"protocol":""}
+    ...    userRegion={}
     ...    isValid=${1}
     ${rescode}   UpdatePolicies    1    ${policy}    v2    update
     
@@ -60,14 +60,14 @@ Policy-DefaultIntercept-00002
     ${policy}    Create Dictionary    policyName=default policy    policyType=tsg_security
     ...    policyDesc=update-autotest intercept    policyId=0
     ...    action=intercept    
-    ...    userRegion={"protocol":""}
+    ...    userRegion={}
     ...    isValid=${1}
     ${rescode}   UpdatePolicies    1    ${policy}    v2    update
     #恢复
     ${policy}    Create Dictionary    policyName=default policy    policyType=tsg_security
     ...    policyDesc=update-autotest    policyId=0
     ...    action=allow    
-    ...    userRegion={"protocol":""}
+    ...    userRegion={}
     ...    isValid=${1}
     ${rescode}   UpdatePolicies    1    ${policy}    v2    update
         
@@ -117,8 +117,10 @@ Policy-AllowURL+IP-00003
     ...    filterList=${objectId4}|TSG_FIELD_HTTP_URL
     ...    isValid=${1}
     ...    appIdObjects=${HTTP_ID}
-    ${rescode}    ${policyIds}   AddPolicies    1    ${policy}    v2    
+    ${rescode}    ${policyIds}   AddPolicies    1    ${policy}    v2      
     Log    ${rescode}
+    log   ${policyIds}    
+    ${ids}    Get-Pids    ${policyIds}
     
 Policy-AllowURL-00004
     [Tags]    xj	xzw
@@ -354,4 +356,6 @@ Policy-MonitorOnlySDA-00009
     ...    appIdObjects=${HTTP_ID},${DNS_ID},${SSL_ID}
     @{policyList}    Create List    ${policy}    ${policy1}    ${policy2}    ${policy3}    ${policy4}    
     ${rescode}    ${policyIds}    AddPolicies    1    ${policyList}    v2   
-    Log    ${rescode} ${policyIds} ${objectIds}
\ No newline at end of file
+    Log    ${rescode} ${policyIds} ${objectIds}
+    log   ${policyIds}    
+    ${ids}    Get-Pids    ${policyIds}
\ No newline at end of file
diff --git a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot
index c6997a8..32e4903 100644
--- a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot
+++ b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot
@@ -337,6 +337,8 @@ ManageFilter
 Get-PolicyIds
     [Arguments]    ${value}
     [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
     FOR    ${policy}    IN    @{value['data']['policyList']}
         ${policyIdList}    Create List    ${policy['policyId']}
@@ -352,6 +354,8 @@ Get-PolicyIds
 Get-Pids
     [Arguments]    ${policyIds}
     [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
     ${len}    Get Length    ${policyIds} 
     FOR    ${var}    IN RANGE    ${len}