From 92a2fe52d2195cd5c70c2877e22de883b8b214c4 Mon Sep 17 00:00:00 2001
From: hebingning <hebingning@geedgenetworks.com>
Date: Thu, 11 Mar 2021 11:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E8=8C=83=E5=9B=B4=E4=B8=BACity=20A,=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?VOIP=E7=94=A8=E4=BE=8B=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot | 2 +-
 01-TestCase/tsg_adc/multi_step/c_Allow_Rtp_Tests.robot | 2 +-
 01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot | 4 ++--
 01-TestCase/tsg_adc/multi_step/c_Deny_Rtp_Tests.robot  | 2 +-
 03-Variable/PolicyObjectDefault.txt                    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot
index be9657f..f7df04b 100644
--- a/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Sip_Tests.robot
@@ -318,7 +318,7 @@ SecurityPolicy-Allow-SIP-000016
     insert_policyId_to_file1    allow_sip_objectId27    ${object_Account_Id4}
     insert_policyId_to_file1    allow_sip_objectId28    ${object_Account_Id5}
     insert_policyId_to_file1    allow_sip_objectId29    ${object_Account_Id6}
-    insert_policyId_to_file1    allow_sip_policyId10    ${policyId}
+    insert_policyId_to_file1    allow_sip_policyId15    ${policyId}
     
     
 
diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Rtp_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Rtp_Tests.robot
index 00ddfb5..bade9fd 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Allow_Rtp_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Rtp_Tests.robot
@@ -60,7 +60,7 @@ SecurityPolicy-Allow-Rtp-00009
 SecurityPolicy-Allow-Rtp-000010
     #删除对象
     ${objectids}    set Variable    ${allow_rtp_objectId7}
-    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId8}]}
+    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId9}]}
     ${s}    Convert to String    ${allow_rtp_policyId9}
 
 
diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot
index cc2c0e6..0e9845c 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Sip_Tests.robot
@@ -111,6 +111,6 @@ SecurityPolicy-Allow-Sip-000016
     ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${allow_sip_objectId28}
     ${objectids}    Catenate    SEPARATOR=,    ${objectids}    ${allow_sip_objectId29}
     #删除策略
-    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_sip_policyId13}]}
-    ${s}    Convert to String    ${allow_sip_policyId13}
+    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${allow_sip_policyId15}]}
+    ${s}    Convert to String    ${allow_sip_policyId15}
 
diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Rtp_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Rtp_Tests.robot
index 4f7703b..a5efd27 100644
--- a/01-TestCase/tsg_adc/multi_step/c_Deny_Rtp_Tests.robot
+++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Rtp_Tests.robot
@@ -60,7 +60,7 @@ SecurityPolicy-Deny-Rtp-00009
 SecurityPolicy-Deny-Rtp-000010
     #删除对象
     ${objectids}    set Variable    ${deny_rtp_objectId7}
-    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId8}]}
+    ${policyIds}    Create List    {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId9}]}
     ${s}    Convert to String    ${deny_rtp_policyId9}
 
 
diff --git a/03-Variable/PolicyObjectDefault.txt b/03-Variable/PolicyObjectDefault.txt
index 67f1834..ea2ae0e 100644
--- a/03-Variable/PolicyObjectDefault.txt
+++ b/03-Variable/PolicyObjectDefault.txt
@@ -8,7 +8,7 @@ ${Default_PolicyType}          tsg_security
 ${Default_PolicyDesc}          autotest        
 ${Default_Action}              deny    
 ${Default_PolicySubAction}     drop
-${Default_EffectiveRange}      Nursurtan|Transtelecom&Astel,|Astel&Transtelecom
+${Default_EffectiveRange}      City A      
 ${Default_UserRegion}          method:rst
 ${Default_ReferenceObject}     ${EMPTY}
 ${Default_AppObjectIdArray}    []