diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Rtp_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Rtp_Tests.robot index be2feeb..b252b11 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Rtp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Rtp_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Force Tags tsg_adc_wp adc_api security_policy +Force Tags tsg_adc_wp adc_api security_policy Trusted_Certificate_Authorities Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot @@ -12,7 +12,7 @@ Resource ../../../03-Variable/ApplicationID.txt SecurityPolicy-Allow-Rtp-00001 [Tags] calling ip source Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00001 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} isValid=${0} appIdObjects=${RTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00001 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} isValid=${1} appIdObjects=${RTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -22,12 +22,12 @@ SecurityPolicy-Allow-Rtp-00001 SecurityPolicy-Allow-Rtp-00002 [Tags] calling ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.60-192.168.50.60 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR isValid=${0} appIdObjects=${RTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR isValid=${1} appIdObjects=${RTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -38,7 +38,7 @@ SecurityPolicy-Allow-Rtp-00002 SecurityPolicy-Allow-Rtp-00003 [Tags] calling subid source Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00003 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} defaultClient=clientsubid isValid=${0} appIdObjects=${RTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00003 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} defaultClient=clientsubid isValid=${1} appIdObjects=${RTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -64,12 +64,12 @@ SecurityPolicy-Allow-Rtp-00004 SecurityPolicy-Allow-Rtp-00005 [Tags] called domain ip source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00005 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR isValid=${0} appIdObjects=${RTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00005 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR isValid=${1} appIdObjects=${RTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -80,12 +80,12 @@ SecurityPolicy-Allow-Rtp-00005 SecurityPolicy-Allow-Rtp-00006 [Tags] called domain ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00006 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR isValid=${0} appIdObjects=${RTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00006 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR isValid=${1} appIdObjects=${RTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -112,12 +112,12 @@ SecurityPolicy-Allow-Rtp-00007 SecurityPolicy-Allow-Rtp-00008 [Tags] called domain ip des Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00005 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR isValid=${0} appIdObjects=${RTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00008 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR isValid=${0} appIdObjects=${RTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -128,12 +128,12 @@ SecurityPolicy-Allow-Rtp-00008 SecurityPolicy-Allow-Rtp-00009 [Tags] called domain ip port des Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00006 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR isValid=${0} appIdObjects=${RTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00009 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR isValid=${1} appIdObjects=${RTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -149,7 +149,7 @@ SecurityPolicy-Allow-Rtp-000010 ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-00007 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} destination=${objectId}|TSG_SECURITY_DESTINATION_LOCATION isValid=${0} appIdObjects=${RTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Rtp-000010 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"RTP"} destination=${objectId}|TSG_SECURITY_DESTINATION_LOCATION isValid=${0} appIdObjects=${RTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} 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 f7df04b..ecb1611 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 @@ -101,7 +101,7 @@ SecurityPolicy-Allow-SIP-00004 SecurityPolicy-Allow-SIP-00005 [Tags] called domain ip source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-65535 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -117,7 +117,7 @@ SecurityPolicy-Allow-SIP-00005 SecurityPolicy-Allow-SIP-00006 [Tags] called domain ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -149,7 +149,7 @@ SecurityPolicy-Allow-SIP-00007 SecurityPolicy-Allow-SIP-00008 [Tags] called domain ip source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-65535 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -165,7 +165,7 @@ SecurityPolicy-Allow-SIP-00008 SecurityPolicy-Allow-SIP-00009 [Tags] called domain ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -225,7 +225,7 @@ SecurityPolicy-Allow-SIP-000012 SecurityPolicy-Allow-SIP-000013 [Tags] calling ip source,called domain ip dest,from account,to account ,allow , monitor and deny Comment 创建被叫方域名IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-65535 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -249,12 +249,12 @@ SecurityPolicy-Allow-SIP-000013 SecurityPolicy-Allow-SIP-000014 [Tags] called ip dest,called domain ip source,from account,to account ,allow , monitor and deny Comment 创建被叫方域名IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-65535 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建被叫方IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.3-192.168.50.3 port=0-65535 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP3} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Ssl_Tests.robot index 5f8f456..8e1789d 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Ssl_Tests.robot @@ -58,24 +58,4 @@ SecurityPolicy-Allow-Ssl-00003 ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 allow_ssl_policyId2 ${policyId} -SecurityPolicy-Allow-Ssl-00001-test - [Tags] fqdn完整匹配 update policy:ip geo - Comment 创建fqdn - ${addTestClentIPFlag} Set Variable 0 - ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$homebank.kz - ${rescode} ${objectId} AddObject2 ${1} ${objectDict} - Comment 创建ip geo - ${addItemList1} Create Dictionary keywordArray=XXG地区.* - ${addItemLists} Create list ${addItemList1} - ${objectDict} Create Dictionary objectType=ip objectSubType=geo_location isValid=${1} addItemList=${addItemLists} - ${rescode} ${objectId1} AddObjects ${1} ${objectDict} - Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Ssl-00001 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SSL"} source=${objectId1}|TSG_SECURITY_SOURCE_LOCATION filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} - log ${policyDict} - ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - ${policyId} Get-Pids ${policyId} - ${policyId} Set Variable ${policyId}[0] - insert_policyId_to_file1 allow_ssl_objectId ${objectId} - insert_policyId_to_file1 allow_ssl_objectId2 ${objectId1} - insert_policyId_to_file1 allow_ssl_policyId ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Rtp_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Rtp_Tests.robot index ec39780..d680624 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Rtp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Rtp_Tests.robot @@ -1,5 +1,5 @@ *** Settings *** -Force Tags adc_api security_policy +Force Tags tsg_adc_wp adc_api security_policy Trusted_Certificate_Authorities Library OperatingSystem Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot @@ -22,7 +22,7 @@ SecurityPolicy-Deny-Rtp-00001 SecurityPolicy-Deny-Rtp-00002 [Tags] calling ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.60-192.168.50.60 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -64,7 +64,7 @@ SecurityPolicy-Deny-Rtp-00004 SecurityPolicy-Deny-Rtp-00005 [Tags] called domain ip source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -80,7 +80,7 @@ SecurityPolicy-Deny-Rtp-00005 SecurityPolicy-Deny-Rtp-00006 [Tags] called domain ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -112,7 +112,7 @@ SecurityPolicy-Deny-Rtp-00007 SecurityPolicy-Deny-Rtp-00008 [Tags] called domain ip des Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -128,7 +128,7 @@ SecurityPolicy-Deny-Rtp-00008 SecurityPolicy-Deny-Rtp-00009 [Tags] called domain ip port des Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} diff --git a/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot index ab8e0b7..2497b43 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Deny_Sip_Tests.robot @@ -22,7 +22,7 @@ SecurityPolicy-Deny-SIP-00001 SecurityPolicy-Deny-SIP-00002 [Tags] calling ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.60-192.168.50.60 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -64,7 +64,7 @@ SecurityPolicy-Deny-SIP-00004 SecurityPolicy-Deny-SIP-00005 [Tags] called domain ip source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -80,7 +80,7 @@ SecurityPolicy-Deny-SIP-00005 SecurityPolicy-Deny-SIP-00006 [Tags] called domain ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -112,7 +112,7 @@ SecurityPolicy-Deny-SIP-00007 SecurityPolicy-Deny-SIP-00008 [Tags] called domain ip dest Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -128,7 +128,7 @@ SecurityPolicy-Deny-SIP-00008 SecurityPolicy-Deny-SIP-00009 [Tags] called domain ip port dest Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -160,7 +160,7 @@ SecurityPolicy-Deny-SIP-000010 SecurityPolicy-Deny-SIP-000011 [Tags] calling ip source,from account ,deny drop,若测试无源和目的的情况可以将/03-Variable/BifangApiVariable.txt中addTestClentIPFlag置为0 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000011 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"drop"} filterList=${object_Account_Id}|TSG_FIELD_SIP_FROM isValid=${0} appIdObjects=${SIP_ID} @@ -174,7 +174,7 @@ SecurityPolicy-Deny-SIP-000011 SecurityPolicy-Deny-SIP-000012 [Tags] calling ip source,from account ,deny block 480,若测试无源和目的的情况可以将/03-Variable/BifangApiVariable.txt中addTestClentIPFlag置为0 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000012 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"480"} filterList=${object_Account_Id}|TSG_FIELD_SIP_FROM isValid=${0} appIdObjects=${SIP_ID} @@ -188,7 +188,7 @@ SecurityPolicy-Deny-SIP-000012 SecurityPolicy-Deny-SIP-000013 [Tags] calling ip source,from account ,deny block 500,若测试无源和目的的情况可以将/03-Variable/BifangApiVariable.txt中addTestClentIPFlag置为0 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000013 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"500"} filterList=${object_Account_Id}|TSG_FIELD_SIP_FROM isValid=${0} appIdObjects=${SIP_ID} @@ -202,7 +202,7 @@ SecurityPolicy-Deny-SIP-000013 SecurityPolicy-Deny-SIP-000014 [Tags] calling ip source,to account ,deny drop Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000014 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"drop"} filterList=${object_Account_Id}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -216,7 +216,7 @@ SecurityPolicy-Deny-SIP-000014 SecurityPolicy-Deny-SIP-000015 [Tags] calling ip source,to account ,deny block 480 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000015 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"480"} filterList=${object_Account_Id}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -230,7 +230,7 @@ SecurityPolicy-Deny-SIP-000015 SecurityPolicy-Deny-SIP-000016 [Tags] calling ip source,to account ,deny block 500 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000016 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"500"} filterList=${object_Account_Id}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -244,18 +244,18 @@ SecurityPolicy-Deny-SIP-000016 SecurityPolicy-Deny-SIP-000017 [Tags] calling ip source,called domain ip dest,from account,to account ,allow , monitor and deny drop Comment 创建domain ip dest - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$wx7051406391,wx705*,51406,*51406391 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount1} ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000017 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"drop"} destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000017 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"drop"} destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -268,15 +268,15 @@ SecurityPolicy-Deny-SIP-000017 SecurityPolicy-Deny-SIP-000018 [Tags] calling ip source,called domain ip dest,from account,to account ,allow , monitor and deny block 480 Comment 创建domain ip dest - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$wx7051406391,wx705*,51406,*51406391 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount1} ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000018 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"480"} destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -292,15 +292,15 @@ SecurityPolicy-Deny-SIP-000018 SecurityPolicy-Deny-SIP-000019 [Tags] calling ip source,called domain ip dest,from account,to account ,allow , monitor and deny block 500 Comment 创建domain ip dest - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$wx7051406391,wx705*,51406,*51406391 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount1} ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000019 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"500"} destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -317,20 +317,20 @@ SecurityPolicy-Deny-SIP-000019 SecurityPolicy-Deny-SIP-000020 [Tags] called ip dest,called domain ip source,from account,to account ,allow , monitor and deny Comment 创建被叫方域名IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建被叫方IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.3-192.168.50.3 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP3} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$wx7051406391,wx705*,51406,*51406391 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount1} ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000020 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"drop"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR destination=${objectId1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -347,20 +347,20 @@ SecurityPolicy-Deny-SIP-000020 SecurityPolicy-Deny-SIP-000021 [Tags] called ip dest,called domain ip source,from account,to account ,allow , monitor and deny Comment 创建被叫方域名IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建被叫方IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.3-192.168.50.3 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP3} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$wx7051406391,wx705*,51406,*51406391 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount1} ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000021 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"480"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR destination=${objectId1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -377,20 +377,20 @@ SecurityPolicy-Deny-SIP-000021 SecurityPolicy-Deny-SIP-000022 [Tags] called ip dest,called domain ip source,from account,to account ,allow , monitor and deny Comment 创建被叫方域名IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建被叫方IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.3-192.168.50.3 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP3} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$wx7051406391,wx705*,51406,*51406391 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount1} ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000022 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"500"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR destination=${objectId1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -435,7 +435,7 @@ SecurityPolicy-Deny-SIP-000024 ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*12voi ${rescode} ${object_Account_Id6} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000022 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"drop"} filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO,${object_Account_Id3}|TSG_FIELD_SIP_FROM,${object_Account_Id4}|TSG_FIELD_SIP_TO,${object_Account_Id5}|TSG_FIELD_SIP_FROM,${object_Account_Id6}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000022 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"drop"} filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO,${object_Account_Id3}|TSG_FIELD_SIP_FROM,${object_Account_Id4}|TSG_FIELD_SIP_TO,${object_Account_Id5}|TSG_FIELD_SIP_FROM,${object_Account_Id6}|TSG_FIELD_SIP_TO isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} @@ -448,72 +448,7 @@ SecurityPolicy-Deny-SIP-000024 insert_policyId_to_file1 deny_sip_objectId37 ${object_Account_Id6} insert_policyId_to_file1 deny_sip_policyId23 ${policyId} -SecurityPolicy-Deny-SIP-000025 - [Tags] The largest combination2 deny block 480,,all conditions from - Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} - Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=zdjzy* - ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} - Comment 创建Account3 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=yq12v - ${rescode} ${object_Account_Id3} AddObject2 ${1} ${objectDict} - Comment 创建Account4 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*12voip - ${rescode} ${object_Account_Id4} AddObject2 ${1} ${objectDict} - Comment 创建Account5 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voi - ${rescode} ${object_Account_Id5} AddObject2 ${1} ${objectDict} - Comment 创建Account6 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*12voi - ${rescode} ${object_Account_Id6} AddObject2 ${1} ${objectDict} - Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000022 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"480"} filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_FROM,${object_Account_Id3}|TSG_FIELD_SIP_FROM,${object_Account_Id4}|TSG_FIELD_SIP_FROM,${object_Account_Id5}|TSG_FIELD_SIP_FROM,${object_Account_Id6}|TSG_FIELD_SIP_FROM isValid=${0} appIdObjects=${SIP_ID} - log ${policyDict} - ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - ${policyId} Get-Pids ${policyId} - ${policyId} Set Variable ${policyId}[0] - insert_policyId_to_file1 deny_sip_objectId38 ${object_Account_Id1} - insert_policyId_to_file1 deny_sip_objectId39 ${object_Account_Id2} - insert_policyId_to_file1 deny_sip_objectId40 ${object_Account_Id3} - insert_policyId_to_file1 deny_sip_objectId41 ${object_Account_Id4} - insert_policyId_to_file1 deny_sip_objectId42 ${object_Account_Id5} - insert_policyId_to_file1 deny_sip_objectId43 ${object_Account_Id6} - insert_policyId_to_file1 deny_sip_policyId24 ${policyId} -SecurityPolicy-Deny-SIP-000026 - [Tags] The largest combination3 deny block 500,,all conditions to - Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip - ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} - Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=zdjzy* - ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} - Comment 创建Account3 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=yq12v - ${rescode} ${object_Account_Id3} AddObject2 ${1} ${objectDict} - Comment 创建Account4 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*12voip - ${rescode} ${object_Account_Id4} AddObject2 ${1} ${objectDict} - Comment 创建Account5 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voi - ${rescode} ${object_Account_Id5} AddObject2 ${1} ${objectDict} - Comment 创建Account6 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=*12voi - ${rescode} ${object_Account_Id6} AddObject2 ${1} ${objectDict} - Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Deny-SIP-000022 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"SIP","method":"block","code":"500"} filterList=${object_Account_Id1}|TSG_FIELD_SIP_TO,${object_Account_Id2}|TSG_FIELD_SIP_TO,${object_Account_Id3}|TSG_FIELD_SIP_TO,${object_Account_Id4}|TSG_FIELD_SIP_TO,${object_Account_Id5}|TSG_FIELD_SIP_TO,${object_Account_Id6}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} - log ${policyDict} - ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - ${policyId} Get-Pids ${policyId} - ${policyId} Set Variable ${policyId}[0] - insert_policyId_to_file1 deny_sip_objectId44 ${object_Account_Id1} - insert_policyId_to_file1 deny_sip_objectId45 ${object_Account_Id2} - insert_policyId_to_file1 deny_sip_objectId46 ${object_Account_Id3} - insert_policyId_to_file1 deny_sip_objectId47 ${object_Account_Id4} - insert_policyId_to_file1 deny_sip_objectId48 ${object_Account_Id5} - insert_policyId_to_file1 deny_sip_objectId49 ${object_Account_Id6} - insert_policyId_to_file1 deny_sip_policyId25 ${policyId} + diff --git a/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot index 12ceff6..0c174dc 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Monitor_Sip_Tests.robot @@ -22,7 +22,7 @@ SecurityPolicy-Monitor-SIP-00001 SecurityPolicy-Monitor-SIP-00002 [Tags] calling ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.60-192.168.50.60 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -64,7 +64,7 @@ SecurityPolicy-Monitor-SIP-00004 SecurityPolicy-Monitor-SIP-00005 [Tags] called domain ip source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -80,7 +80,7 @@ SecurityPolicy-Monitor-SIP-00005 SecurityPolicy-Monitor-SIP-00006 [Tags] called domain ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -112,7 +112,7 @@ SecurityPolicy-Monitor-SIP-00007 SecurityPolicy-Monitor-SIP-00008 [Tags] called domain ip source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -128,7 +128,7 @@ SecurityPolicy-Monitor-SIP-00008 SecurityPolicy-Monitor-SIP-00009 [Tags] called domain ip port source Comment 创建第二个源IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-22222 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-22222 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} @@ -160,7 +160,7 @@ SecurityPolicy-Monitor-SIP-000010 SecurityPolicy-Monitor-SIP-000011 [Tags] calling ip source,from account ,monitor and monitor,若测试无源和目的的情况可以将/03-Variable/BifangApiVariable.txt中addTestClentIPFlag置为0 Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-000011 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SIP"} filterList=${object_Account_Id}|TSG_FIELD_SIP_FROM isValid=${0} appIdObjects=${SIP_ID} @@ -174,7 +174,7 @@ SecurityPolicy-Monitor-SIP-000011 SecurityPolicy-Monitor-SIP-000012 [Tags] calling ip source,to account ,monitor and monitor Comment 创建Account - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-000012 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SIP"} filterList=${object_Account_Id}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -188,15 +188,15 @@ SecurityPolicy-Monitor-SIP-000012 SecurityPolicy-Monitor-SIP-000013 [Tags] calling ip source,called domain ip dest,from account,to account ,monitor , monitor and deny Comment 创建被叫方域名IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$wx7051406391,wx705*,51406,*51406391 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount1} ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} Comment 创建安全策略 ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-000013 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SIP"} destination=${objectId}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} @@ -212,23 +212,23 @@ SecurityPolicy-Monitor-SIP-000013 SecurityPolicy-Monitor-SIP-000014 [Tags] called ip dest,called domain ip source,from account,to account ,monitor , monitor and deny Comment 创建被叫方域名IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.2-192.168.50.2 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP2} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId} AddObjects ${1} ${objectDict} Comment 创建被叫方IP - ${addItemList1} Create Dictionary isSession=endpoint ip=192.168.50.3-192.168.50.3 port=0-0 direction=0 protocol=0 isInitialize=0 + ${addItemList1} Create Dictionary isSession=endpoint ip=${testClentIP3} port=0-65535 direction=0 protocol=0 isInitialize=0 ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=ip objectSubType=endpoint isValid=${1} addItemList=${addItemLists} ${rescode} ${objectId1} AddObjects ${1} ${objectDict} Comment 创建Account1 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$zdjzyq12voip,zdjzy*,yq12v,*12voip + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount} ${rescode} ${object_Account_Id1} AddObject2 ${1} ${objectDict} Comment 创建Account2 - ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=$wx7051406391,wx705*,51406,*51406391 + ${objectDict} Create Dictionary objectType=account isValid=${1} addItemList=${sipAccount1} ${rescode} ${object_Account_Id2} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-000014 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SIP"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR destination=${objectId1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${0} appIdObjects=${SIP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Monitor-SIP-000014 policyType=tsg_security policyDesc=autotest action=monitor userRegion={"protocol":"SIP"} source=${objectId}|TSG_SECURITY_SOURCE_ADDR destination=${objectId1}|TSG_SECURITY_DESTINATION_ADDR filterList=${object_Account_Id1}|TSG_FIELD_SIP_FROM,${object_Account_Id2}|TSG_FIELD_SIP_TO isValid=${1} appIdObjects=${SIP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot index c19d0af..1d05ac9 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Insert_Tests.robot @@ -36,7 +36,7 @@ Proxy-Policy-insert-00002 ${profiledId} set Variable ${insert_profileId1} #删除对象 ${objectids} set Variable ${insert_objectId1} - ${objectids} set Variable ${insert_objectId40} + ${objectids} Catenate SEPARATOR=, ${insert_objectId40} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId1}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId1}]} @@ -49,7 +49,7 @@ Proxy-Policy-insert-00003 ${profiledId} set Variable ${insert_profileId2} #删除对象 ${objectids} set Variable ${insert_objectId2} - ${objectids} set Variable ${insert_objectId3} + ${objectids} Catenate SEPARATOR=, ${insert_objectId3} #删除策略 ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId2}]} ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId2}]}