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} []