diff --git a/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot index 894d978..6aa387f 100644 --- a/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/a_Allow_Http_Tests.robot @@ -10,42 +10,60 @@ Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Allow-Http-00001 - [Tags] fqdn右匹配 + [Tags] fqdn右匹配 url完全匹配 update policy: ip geo,fqdn完全匹配,url子串匹配 Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*clintonairport.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建url + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=$clintonairport.com/airlines-flights/covid/ + ${rescode} ${objectId1} 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} ${objectId2} AddObjects ${1} ${objectDict} + Comment 创建fqdn2 + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.66rpg.com + ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} + Comment 创建url2 + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=66rpg + ${rescode} ${objectId4} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Http-00001 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Http-00001 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] insert_policyId_to_file1 allow_http_objectId ${objectId} + insert_policyId_to_file1 allow_http_objectId2 ${objectId1} + insert_policyId_to_file1 allow_http_objectId3 ${objectId2} + insert_policyId_to_file1 allow_http_objectId4 ${objectId3} + insert_policyId_to_file1 allow_http_objectId5 ${objectId4} insert_policyId_to_file1 allow_http_policyId ${policyId} SecurityPolicy-Allow-Http-00002 - [Tags] cat + [Tags] cat,fqdn 完全匹配,url左匹配 update policy:url右匹配 Comment 创建fqdn - # ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$www.airpano.com - # ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$scoutbahamas.org + ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建url + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=scoutbah* + ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} + Comment 创建fqdn2 + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*ang5.com + ${rescode} ${objectId2} AddObject2 ${1} ${objectDict} + Comment 创建url2 + ${objectDict} Create Dictionary objectType=url isValid=${1} addItemList=*w.xiang5.com/ + ${rescode} ${objectId3} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Http-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=109|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Http-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=109|TSG_FIELD_HTTP_HOST,${objectId}|TSG_FIELD_HTTP_HOST,${objectId1}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyId} Get-Pids ${policyId} ${policyId} Set Variable ${policyId}[0] - #insert_policyId_to_file1 allow_http_objectId1 ${objectId} + insert_policyId_to_file1 allow_http_objectId1 ${objectId} + insert_policyId_to_file1 allow_http_objectId6 ${objectId1} + insert_policyId_to_file1 allow_http_objectId7 ${objectId2} + insert_policyId_to_file1 allow_http_objectId8 ${objectId3} insert_policyId_to_file1 allow_http_policyId1 ${policyId} - -#SecurityPolicy-Allow-Http-00003 -# [Tags] cat完整匹配 -# Comment 创建fqdn -# ${objectDict} Create Dictionary objectType=fqdn_category isValid=${1} addItemList=$192.168.40.120 -# ${rescode} ${objectId} AddObject2 ${1} ${objectDict} -# Comment 创建安全策略 -# ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Http-00003 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${SSL_ID} -# log ${policyDict} -# ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 -# insert_policyId_to_file1 allow_http_objectId2 ${objectId} -# insert_policyId_to_file1 allow_http_policyId2 ${policyId} 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 0e9c02e..a199191 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 @@ -11,10 +11,15 @@ Resource ../../../03-Variable/ApplicationID.txt *** Test Cases *** SecurityPolicy-Allow-Ssl-00001 - [Tags] fqdn完整匹配 + [Tags] fqdn完整匹配 update policy:ip geo Comment 创建fqdn ${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"} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} log ${policyDict} @@ -22,18 +27,23 @@ SecurityPolicy-Allow-Ssl-00001 ${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} SecurityPolicy-Allow-Ssl-00002 - [Tags] cat右匹配 + [Tags] cat右匹配 update policy:fqdn Comment 创建fqdn ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=*protonmail.com ${rescode} ${objectId} AddObject2 ${1} ${objectDict} + Comment 创建fqdn2 + ${objectDict} Create Dictionary objectType=fqdn isValid=${1} addItemList=$xinyue.qq.com + ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} Comment 创建安全策略 - ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Ssl-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SSL"} filterList=168|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + ${policyDict} Create Dictionary policyName=SecurityPolicy-Allow-Ssl-00002 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SSL"} filterList=168|TSG_FIELD_SSL_SNI,${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_objectId1 ${objectId} + insert_policyId_to_file1 allow_ssl_objectId3 ${objectId1} insert_policyId_to_file1 allow_ssl_policyId1 ${policyId} diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot index ac3907c..360c15e 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Http_Tests.robot @@ -5,6 +5,9 @@ Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot +Resource ../../../03-Variable/ApplicationID.txt +Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** SecurityPolicy-Allow-Http-00001 @@ -14,11 +17,33 @@ SecurityPolicy-Allow-Http-00001 ${stringlist} run keyword if '${systemType}'=='Windows' Create List COVID ... ELSE Create List COVID ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 改变allow策略 + ${policyDict} Create Dictionary policyId=${allow_http_policyId} source=${allow_http_objectId3}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Allow-Http-00001-1 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=${allow_http_objectId4}|TSG_FIELD_HTTP_HOST,${allow_http_objectId5}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 5 + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_HTTP_00001_1.bat + ... ELSE set variable curl -L http://www.66rpg.com/index + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 首页 - 橙光 + ... ELSE Create List 首页 - 橙光 + ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Allow-Http-00002 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_HTTP_00002.bat ... ELSE set variable curl http://scoutbahamas.org/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List President - ... ELSE Create List President + ${stringlist} run keyword if '${systemType}'=='Windows' Create List ScoutBahamas.org + ... ELSE Create List ScoutBahamas.org ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 改变allow策略 + ${policyDict} Create Dictionary policyId=${allow_http_policyId1} policyName=SecurityPolicy-Allow-Http-00002-1 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"HTTP"} filterList=${allow_http_objectId7}|TSG_FIELD_HTTP_HOST,${allow_http_objectId8}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 5 + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_HTTP_00002_1.bat + ... ELSE set variable curl http://www.xiang5.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 女生小说-香网小说网 + ... ELSE Create List 女生小说-香网小说网 + ${rescode} SystemCommands ${commandstr} ${stringlist} diff --git a/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot index b4a20c0..4f0d9f6 100644 --- a/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/b_Allow_Ssl_Tests.robot @@ -5,20 +5,45 @@ Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../../02-Keyword/tsg_adc/FileOperation.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot +Resource ../../../03-Variable/ApplicationID.txt +Resource ../../../05-Other/AllFlowCaseVariable.txt *** Test Cases *** SecurityPolicy-Allow-Ssl-00001 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00001.bat ... ELSE set variable curl https://homebank.kz/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Виртуальная - ... ELSE Create List Виртуальная + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Виртуальная + ... ELSE Create List Виртуальная + ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 改变Allow策略 + ${policyDict} Create Dictionary policyId=${allow_ssl_policyId} source=${allow_ssl_objectId2}|TSG_SECURITY_SOURCE_LOCATION policyName=SecurityPolicy-Allow-Ssl-00001 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SSL"} filterList=${allow_ssl_objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 5 + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00001.bat + ... ELSE set variable curl https://homebank.kz/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Виртуальная + ... ELSE Create List Виртуальная ${rescode} SystemCommands ${commandstr} ${stringlist} SecurityPolicy-Allow-Ssl-00002 Comment 功能端验证HTTP验证 ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00002.bat ... ELSE set variable curl -kv https://protonmail.com/ - ${stringlist} run keyword if '${systemType}'=='Windows' Create List Tango Secure Secure email + ${stringlist} run keyword if '${systemType}'=='Windows' Create List Secure email ... ELSE Create List Secure email ${rescode} SystemCommands ${commandstr} ${stringlist} + Comment 改变Allow策略 + ${policyDict} Create Dictionary policyId=${allow_ssl_policyId1} policyName=SecurityPolicy-Allow-Ssl-00002-1 policyType=tsg_security policyDesc=autotest action=allow userRegion={"protocol":"SSL"} filterList=${allow_ssl_objectId3}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + log ${policyDict} + ${rescode} UpdatePolicies 1 ${policyDict} v2 update + sleep 5 + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Allow_SSL_00002_1.bat + ... ELSE set variable curl -kv https://xinyue.qq.com/#/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List 心悦 + ... ELSE Create List 心悦 + ${rescode} SystemCommands ${commandstr} ${stringlist} diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot index b8f5ba6..b3a6b5a 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Http_Tests.robot @@ -17,21 +17,27 @@ ${objectids} ${EMPTY} SecurityPolicy-Allow-Http-00001 #删除对象 ${objectids} set Variable ${allow_http_objectId} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId2} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId3} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId4} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId5} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId}]} ${s} Convert to String ${allow_http_policyId} GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host clintonairport.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.66rpg.com SecurityPolicy-Allow-Http-00002 #删除对象 - #${objectids} set Variable ${allow_http_objectId1} + ${objectids} set Variable ${allow_http_objectId1} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId6} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId7} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId8} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId1}]} ${s} Convert to String ${allow_http_policyId1} GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host scoutbahamas + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} http_host www.xiang5.com + + -# SecurityPolicy-Allow-Http-00003 - #删除对象 - # ${objectids} set Variable ${allow_http_objectId2} - #删除策略 - #${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId2}]} diff --git a/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot index 6914975..a2a9ba5 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Allow_Ssl_Tests.robot @@ -17,15 +17,18 @@ ${objectids} ${EMPTY} SecurityPolicy-Allow-Ssl-00001 #删除对象 ${objectids} set Variable ${allow_ssl_objectId} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_ssl_objectId2} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId}]} ${s} Convert to String ${allow_ssl_policyId} GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni homebank.kz SecurityPolicy-Allow-Ssl-00002 - #删除对象 + #删除对象 ${objectids} set Variable ${allow_ssl_objectId1} + ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_ssl_objectId3} #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId1}]} ${s} Convert to String ${allow_ssl_policyId1} GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni protonmail.com + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni xinyue.qq.com diff --git a/01-TestCase/tsg_adc/multi_step/c_Deny_Ftp_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Deny_Ftp_Tests.robot index d44928f..a09cc2b 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Deny_Ftp_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Deny_Ftp_Tests.robot @@ -26,7 +26,7 @@ SecurityPolicy-Deny-ftp-00001 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId}]} ${s} Convert to String ${deny_ftp_policyId} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftp_user + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser SecurityPolicy-Deny-ftp-00002 #删除对象 @@ -36,7 +36,7 @@ SecurityPolicy-Deny-ftp-00002 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId1}]} ${s} Convert to String ${deny_ftp_policyId1} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftp_user + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser SecurityPolicy-Deny-ftp-00003 #删除对象 @@ -46,7 +46,7 @@ SecurityPolicy-Deny-ftp-00003 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId2}]} ${s} Convert to String ${deny_ftp_policyId2} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftp_user + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser SecurityPolicy-Deny-ftp-00004 #删除对象 @@ -56,4 +56,4 @@ SecurityPolicy-Deny-ftp-00004 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId3}]} ${s} Convert to String ${deny_ftp_policyId3} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftp_user + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser diff --git a/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot b/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot index 43216be..a936c12 100644 --- a/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot +++ b/01-TestCase/tsg_adc/multi_step/c_Monitor_Mail_Tests.robot @@ -22,7 +22,7 @@ SecurityPolicy-Monitor-Mail-00001 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId}]} ${s} Convert to String ${monitor_mail_policyId} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00002 #删除对象 @@ -31,7 +31,7 @@ SecurityPolicy-Monitor-Mail-00002 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId1}]} ${s} Convert to String ${monitor_mail_policyId1} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00003 #删除对象 @@ -42,7 +42,7 @@ SecurityPolicy-Monitor-Mail-00003 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId2}]} ${s} Convert to String ${monitor_mail_policyId2} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00004 #删除对象 @@ -51,7 +51,7 @@ SecurityPolicy-Monitor-Mail-00004 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId3}]} ${s} Convert to String ${monitor_mail_policyId3} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00005 #删除对象 @@ -60,7 +60,7 @@ SecurityPolicy-Monitor-Mail-00005 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId4}]} ${s} Convert to String ${monitor_mail_policyId4} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00006 #删除对象 @@ -69,7 +69,7 @@ SecurityPolicy-Monitor-Mail-00006 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId5}]} ${s} Convert to String ${monitor_mail_policyId5} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00007 #删除对象 @@ -78,7 +78,7 @@ SecurityPolicy-Monitor-Mail-00007 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId6}]} ${s} Convert to String ${monitor_mail_policyId6} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00008 #删除对象 @@ -88,7 +88,7 @@ SecurityPolicy-Monitor-Mail-00008 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId7}]} ${s} Convert to String ${monitor_mail_policyId7} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00009 #删除对象 @@ -97,7 +97,7 @@ SecurityPolicy-Monitor-Mail-00009 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId8}]} ${s} Convert to String ${monitor_mail_policyId8} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00010 #删除对象 @@ -106,7 +106,7 @@ SecurityPolicy-Monitor-Mail-00010 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId9}]} ${s} Convert to String ${monitor_mail_policyId9} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00011 #删除对象 @@ -115,7 +115,7 @@ SecurityPolicy-Monitor-Mail-00011 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId10}]} ${s} Convert to String ${monitor_mail_policyId10} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00012 #删除对象 @@ -124,7 +124,7 @@ SecurityPolicy-Monitor-Mail-00012 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId11}]} ${s} Convert to String ${monitor_mail_policyId11} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00013 #删除对象 @@ -133,7 +133,7 @@ SecurityPolicy-Monitor-Mail-00013 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId12}]} ${s} Convert to String ${monitor_mail_policyId12} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00014 #删除对象 @@ -142,7 +142,7 @@ SecurityPolicy-Monitor-Mail-00014 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId13}]} ${s} Convert to String ${monitor_mail_policyId13} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} SecurityPolicy-Monitor-Mail-00015 #删除对象 @@ -155,4 +155,4 @@ SecurityPolicy-Monitor-Mail-00015 #删除策略 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId14}]} ${s} Convert to String ${monitor_mail_policyId14} - GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} + GetLogList security_event_log ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount}