diff options
| author | hebingning <[email protected]> | 2022-09-09 17:10:22 +0800 |
|---|---|---|
| committer | hebingning <[email protected]> | 2022-09-09 17:10:22 +0800 |
| commit | 03d98e2b2387235f77dbb43106034f383434c86c (patch) | |
| tree | 265bd8dd424a33fa4561746dad241f5f33b31d07 | |
| parent | 33dc5c2d07adad29be95950b4ba059e2f545fb3d (diff) | |
9月8日git提交问题后补提当前case
171 files changed, 3959 insertions, 2489 deletions
diff --git a/case/batch_url/batch_url.robot b/case/batch_url/batch_url.robot index a5c3dab..d2a5774 100644 --- a/case/batch_url/batch_url.robot +++ b/case/batch_url/batch_url.robot @@ -2,8 +2,8 @@ Force Tags tsg_adc_wp security_policy batch_verify Library OperatingSystem Library yaml -Resource ../../keyword/common/systemcommand.robot -Resource ../../variable/common_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/variable/common_variable.txt *** Test Cases *** diff --git a/case/batch_url/batch_url_tests.robot b/case/batch_url/batch_url_tests.robot new file mode 100644 index 0000000..0d4bd3f --- /dev/null +++ b/case/batch_url/batch_url_tests.robot @@ -0,0 +1,58 @@ +*** Settings *** +Force Tags tsg_adc_wp security_policy batch_verify +Library OperatingSystem +Library yaml +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/variable/common_variable.txt + + +*** Test Cases *** +security_policy_deny_http_batch1 + [Documentation] + ... 安全策略deny动作（已下发策略的情况下），验证杨永强抓取的网址是否可用，标注为各个子动作 + Comment drop + ${yamlMode}= OperatingSystem.Get File ${path}/data/url_http2.yaml + ${loadedMode}= yaml.Safe Load ${yamlMode} + ${curlList} Get From Dictionary ${loadedMode} urlHttp + ${trueCounter} ${falseCounter} BatchUrlVerify timed out ${curlList} + +security_policy_deny_http_batch2 + Comment rst + ${yamlMode}= OperatingSystem.Get File ${path}/data/url_http2.yaml + ${loadedMode}= yaml.Safe Load ${yamlMode} + ${curlList} Get From Dictionary ${loadedMode} urlHttp + ${trueCounter} ${falseCounter} BatchUrlVerify Connection was reset ${curlList} + +security_policy_deny_http_batch3 + Comment block code:403 + ${yamlMode}= OperatingSystem.Get File ${path}/data/url_http2.yaml + ${loadedMode}= yaml.Safe Load ${yamlMode} + ${curlList} Get From Dictionary ${loadedMode} urlHttp + ${trueCounter} ${falseCounter} BatchUrlVerify 403 ${curlList} +security_policy_deny_http_batch4 + Comment block code:404 + ${yamlMode}= OperatingSystem.Get File ${path}/data/url_http2.yaml + ${loadedMode}= yaml.Safe Load ${yamlMode} + ${curlList} Get From Dictionary ${loadedMode} urlHttp + ${trueCounter} ${falseCounter} BatchUrlVerify 404 ${curlList} + +security_policy_deny_http_batch5 + Comment alert code:200 + ${yamlMode}= OperatingSystem.Get File ${path}/data/url_http2.yaml + ${loadedMode}= yaml.Safe Load ${yamlMode} + ${curlList} Get From Dictionary ${loadedMode} urlHttp + ${trueCounter} ${falseCounter} BatchUrlVerify 200 ${curlList} + +security_policy_deny_http_batch6 + Comment alert code:204 + ${yamlMode}= OperatingSystem.Get File ${path}/data/url_http2.yaml + ${loadedMode}= yaml.Safe Load ${yamlMode} + ${curlList} Get From Dictionary ${loadedMode} urlHttp + ${trueCounter} ${falseCounter} BatchUrlVerify 204 ${curlList} + +security_policy_deny_http_batch7 + Comment redirect + ${yamlMode}= OperatingSystem.Get File ${path}/data/url_http2.yaml + ${loadedMode}= yaml.Safe Load ${yamlMode} + ${curlList} Get From Dictionary ${loadedMode} urlHttp + ${trueCounter} ${falseCounter} BatchUrlVerify youtube.com ${curlList} diff --git a/case/multi_step/a_allow_http_tests.robot b/case/multi_step/a_allow_http_tests.robot index 2d82023..603e8b4 100644 --- a/case/multi_step/a_allow_http_tests.robot +++ b/case/multi_step/a_allow_http_tests.robot @@ -1,11 +1,9 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -# Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** security_policy_allow_http_00001 [Tags] fqdn right match,whole world match,ip geo,url geography diff --git a/case/multi_step/a_allow_https_tests.robot b/case/multi_step/a_allow_https_tests.robot index 2e2c179..f0e30d3 100644 --- a/case/multi_step/a_allow_https_tests.robot +++ b/case/multi_step/a_allow_https_tests.robot @@ -1,10 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_allow_rtp_tests.robot b/case/multi_step/a_allow_rtp_tests.robot index 84333ee..2a4d147 100644 --- a/case/multi_step/a_allow_rtp_tests.robot +++ b/case/multi_step/a_allow_rtp_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_allow_sip_tests.robot b/case/multi_step/a_allow_sip_tests.robot index 7c24e2d..e5f64b5 100644 --- a/case/multi_step/a_allow_sip_tests.robot +++ b/case/multi_step/a_allow_sip_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot diff --git a/case/multi_step/a_allow_ssh_tests.robot b/case/multi_step/a_allow_ssh_tests.robot index 35cec2d..0525a7c 100644 --- a/case/multi_step/a_allow_ssh_tests.robot +++ b/case/multi_step/a_allow_ssh_tests.robot @@ -1,10 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_allow_ssl_tests.robot b/case/multi_step/a_allow_ssl_tests.robot index f0f7c50..8b1a4ba 100644 --- a/case/multi_step/a_allow_ssl_tests.robot +++ b/case/multi_step/a_allow_ssl_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot diff --git a/case/multi_step/a_allow_tests.robot b/case/multi_step/a_allow_tests.robot index f6c0fba..0934dc3 100644 --- a/case/multi_step/a_allow_tests.robot +++ b/case/multi_step/a_allow_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_deny_dns_tests.robot b/case/multi_step/a_deny_dns_tests.robot index 77a6878..086fbbf 100644 --- a/case/multi_step/a_deny_dns_tests.robot +++ b/case/multi_step/a_deny_dns_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_deny_ftp_tests.robot b/case/multi_step/a_deny_ftp_tests.robot index 063d2c8..5553f5c 100644 --- a/case/multi_step/a_deny_ftp_tests.robot +++ b/case/multi_step/a_deny_ftp_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot diff --git a/case/multi_step/a_deny_http_tests.robot b/case/multi_step/a_deny_http_tests.robot index a92ac2b..fad6261 100644 --- a/case/multi_step/a_deny_http_tests.robot +++ b/case/multi_step/a_deny_http_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot Library yaml *** Variables *** @@ -315,7 +314,7 @@ security_policy_deny_http_00012 # ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} # ${rescode} ${objectId1} AddObjects ${1} ${objectDict} # Comment 创建安全策略 - # ${policyDict} Create Dictionary policyName=security_policy_deny_http_00013 policyType=tsg_security doLog=1 policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${objectId1}|TSG_FIELD_HTTP_RES_HDR,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} + # ${policyDict} Create Dictionary policyName=security_policy_deny_http_00013 policyType=tsg_security doLog=1 policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"reset"} filterList=${objectId1}|TSG_FIELD_HTTP_RES_HDR,${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} # log ${policyDict} # ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 # ${policyId} GetPids ${policyId} @@ -397,7 +396,7 @@ security_policy_deny_http_00016 ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} ${rescode} ${object_yd_Id} AddObjects ${1} ${objectDict} Comment 创建请求体 - ${addItemList1} Create Dictionary keywordArray=DenyHttp0016 isHexbin=${0} + ${addItemList1} Create Dictionary keywordArray=DenyHttp0016 isHexbin=${0} ${addItemLists} Create list ${addItemList1} ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} ${rescode} ${object_body_Id} AddObjects ${1} ${objectDict} @@ -485,39 +484,39 @@ security_policy_deny_http_00016 # ${policyId} Set Variable ${policyId}[0] # InsertObjectIdToFile deny_http_policyId18 ${policyId} -# security_policy_deny_http_00020 - # [Tags] substring - # Comment 创建url - # ${addItemList1} Create Dictionary keywordArray=$www.xinhuanet.com/ isHexbin=${0} - # ${addItemLists} Create list ${addItemList1} - # ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} - # ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} - # Comment cookie8个子串,创建请求头 - # ${addItemList1} Create Dictionary keywordArray=7764,636964,756964,77646c617374,363964,3666653461,3462326663,38346463633835 isHexbin=${1} district=Cookie - # ${addItemLists} Create list ${addItemList1} - # ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} - # ${rescode} ${object_ck_Id} AddObjects ${1} ${objectDict} - # Comment user-agent8个子串,创建请求头 - # ${addItemList1} Create Dictionary keywordArray=4d6f7a696c6c612f352e30,57696e646f7773,57696e3634,783634,4170706c65,65624b6974,4b48544d4c,6c696b65 isHexbin=${1} district=User-Agent - # ${addItemLists} Create list ${addItemList1} - # ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} - # ${rescode} ${object_ua_Id} AddObjects ${1} ${objectDict} - # Comment cont-Type8个子串,创建应答头:text/html - # ${addItemList1} Create Dictionary keywordArray=7465,7874,746578,657874,74657874,6874,6d6c,68746d isHexbin=${1} district=Content-Type - # ${addItemLists} Create list ${addItemList1} - # ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} - # ${rescode} ${object_ct_Id} AddObjects ${1} ${objectDict} - # Comment 创建安全策略 - # ${policyDict} Create Dictionary policyName=security_policy_deny_http_00020 policyType=tsg_security doLog=1 policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} filterList=${object_url_Id}|TSG_FIELD_HTTP_URL,${object_ck_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_ct_Id}|TSG_FIELD_HTTP_RES_HDR,${object_ua_Id}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=${HTTP_ID} - # log ${policyDict} - # ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - # ${policyId} GetPids ${policyId} - # ${policyId} Set Variable ${policyId}[0] - # InsertObjectIdToFile deny_http_objectId42 ${object_url_Id} - # InsertObjectIdToFile deny_http_objectId43 ${object_ck_Id} - # InsertObjectIdToFile deny_http_objectId44 ${object_ua_Id} - # InsertObjectIdToFile deny_http_objectId45 ${object_ct_Id} - # InsertObjectIdToFile deny_http_policyId19 ${policyId} +security_policy_deny_http_00020 + [Tags] substring + Comment 创建url + ${addItemList1} Create Dictionary keywordArray=$www.xinhuanet.com/ isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=url objectSubType=url isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_url_Id} AddObjects ${1} ${objectDict} + Comment cookie8个子串,创建请求头 + ${addItemList1} Create Dictionary keywordArray=7764,636964,756964,77646c617374,363964,3666653461,3462326663,38346463633835 isHexbin=${1} district=Cookie + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ck_Id} AddObjects ${1} ${objectDict} + Comment user-agent8个子串,创建请求头 + ${addItemList1} Create Dictionary keywordArray=4d6f7a696c6c612f352e30,57696e646f7773,57696e3634,783634,4170706c65,65624b6974,4b48544d4c,6c696b65 isHexbin=${1} district=User-Agent + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ua_Id} AddObjects ${1} ${objectDict} + Comment cont-Type8个子串,创建应答头:text/html + ${addItemList1} Create Dictionary keywordArray=7465,7874,746578,657874,74657874,6874,6d6c,68746d isHexbin=${1} district=Content-Type + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=http_signature objectSubType=http_signature isValid=${1} addItemList=${addItemLists} + ${rescode} ${object_ct_Id} AddObjects ${1} ${objectDict} + Comment 创建安全策略 + ${policyDict} Create Dictionary policyName=security_policy_deny_http_00020 policyType=tsg_security doLog=1 policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"reset"} filterList=${object_url_Id}|TSG_FIELD_HTTP_URL,${object_ck_Id}|TSG_FIELD_HTTP_REQ_HDR,${object_ct_Id}|TSG_FIELD_HTTP_RES_HDR,${object_ua_Id}|TSG_FIELD_HTTP_REQ_HDR isValid=${1} appIdObjects=${HTTP_ID} + log ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} GetPids ${policyId} + ${policyId} Set Variable ${policyId}[0] + InsertObjectIdToFile deny_http_objectId42 ${object_url_Id} + InsertObjectIdToFile deny_http_objectId43 ${object_ck_Id} + InsertObjectIdToFile deny_http_objectId44 ${object_ua_Id} + InsertObjectIdToFile deny_http_objectId45 ${object_ct_Id} + InsertObjectIdToFile deny_http_policyId19 ${policyId} # security_policy_deny_http_00021 # [Tags] gre http diff --git a/case/multi_step/a_deny_https_tests.robot b/case/multi_step/a_deny_https_tests.robot index a0cf1a2..612eeab 100644 --- a/case/multi_step/a_deny_https_tests.robot +++ b/case/multi_step/a_deny_https_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_deny_mail_tests.robot b/case/multi_step/a_deny_mail_tests.robot index d6143f7..7cef806 100644 --- a/case/multi_step/a_deny_mail_tests.robot +++ b/case/multi_step/a_deny_mail_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot @@ -28,7 +27,7 @@ Resource ../../keyword/policys/policy.robot # ${objectDict} Create Dictionary objectType=keywords objectSubType=keywords isValid=${1} addItemList=${addItemLists} # ${rescode} ${object_Content_Id1} AddObjects ${1} ${objectDict} # Comment 创建安全策略 - # ${policyDict} Create Dictionary policyName=security_policy_deny_mail_00001 policyType=tsg_security doLog=1 policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"drop"} filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT isValid=${1} appIdObjects=${MAIL_ID} + # ${policyDict} Create Dictionary policyName=security_policy_deny_mail_00001 policyType=tsg_security doLog=1 policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"reset"} filterList=${object_Content_Id}|TSG_FIELD_MAIL_CONTENT isValid=${1} appIdObjects=${MAIL_ID} # #userRegion={"protocol":"MAIL","method":"block","code":550} # ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 # ${policyId} GetPids ${policyId} diff --git a/case/multi_step/a_deny_rtp_tests.robot b/case/multi_step/a_deny_rtp_tests.robot index cafee7d..22107e2 100644 --- a/case/multi_step/a_deny_rtp_tests.robot +++ b/case/multi_step/a_deny_rtp_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_deny_sip_tests.robot b/case/multi_step/a_deny_sip_tests.robot index 78fa81c..1d540eb 100644 --- a/case/multi_step/a_deny_sip_tests.robot +++ b/case/multi_step/a_deny_sip_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_deny_ssh_tests.robot b/case/multi_step/a_deny_ssh_tests.robot index deff254..6133fd6 100644 --- a/case/multi_step/a_deny_ssh_tests.robot +++ b/case/multi_step/a_deny_ssh_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_deny_ssl_tests.robot b/case/multi_step/a_deny_ssl_tests.robot index 9df13b4..0fdb7cd 100644 --- a/case/multi_step/a_deny_ssl_tests.robot +++ b/case/multi_step/a_deny_ssl_tests.robot @@ -1,10 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** @@ -61,21 +61,21 @@ security_policy_deny_ssl_00002 InsertObjectIdToFile deny_ssl_objectId1 ${objectId} InsertObjectIdToFile deny_ssl_policyId1 ${policyId} -# security_policy_deny_ssl_00003 - # [Tags] san - # Comment 创建fqdn - # ${addItemList1} Create Dictionary keywordArray=*austinama.org isHexbin=${0} - # ${addItemLists} Create list ${addItemList1} - # ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} - # ${rescode} ${objectId} AddObjects ${1} ${objectDict} - # Comment 创建安全策略 - # ${policyDict} Create Dictionary policyName=security_policy_deny_ssl_00003 policyType=tsg_security policyDesc=autotest doLog=1 action=deny userRegion={"protocol":"SSL","method":"drop"} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} - # log ${policyDict} - # ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 - # ${policyId} GetPids ${policyId} - # ${policyId} Set Variable ${policyId}[0] - # InsertObjectIdToFile deny_ssl_objectId2 ${objectId} - # InsertObjectIdToFile deny_ssl_policyId2 ${policyId} +security_policy_deny_ssl_00003 + [Tags] san + Comment 创建fqdn + ${addItemList1} Create Dictionary keywordArray=*austinama.org isHexbin=${0} + ${addItemLists} Create list ${addItemList1} + ${objectDict} Create Dictionary objectType=fqdn objectSubType=fqdn isValid=${1} addItemList=${addItemLists} + ${rescode} ${objectId} AddObjects ${1} ${objectDict} + Comment 创建安全策略 + ${policyDict} Create Dictionary policyName=security_policy_deny_ssl_00003 policyType=tsg_security policyDesc=autotest doLog=1 action=deny userRegion={"protocol":"SSL","method":"tamper"} filterList=${objectId}|TSG_FIELD_SSL_SNI isValid=${1} appIdObjects=${SSL_ID} + log ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} GetPids ${policyId} + ${policyId} Set Variable ${policyId}[0] + InsertObjectIdToFile deny_ssl_objectId2 ${objectId} + InsertObjectIdToFile deny_ssl_policyId2 ${policyId} # security_policy_deny_ssl_00004 # [Tags] 最大组合 update policy:fqdn_sni,fqdn_san,fqdn_cn diff --git a/case/multi_step/a_deny_tests.robot b/case/multi_step/a_deny_tests.robot index df006c4..d8bd844 100644 --- a/case/multi_step/a_deny_tests.robot +++ b/case/multi_step/a_deny_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot diff --git a/case/multi_step/a_hijack_tests.robot b/case/multi_step/a_hijack_tests.robot index 179b902..27e6927 100644 --- a/case/multi_step/a_hijack_tests.robot +++ b/case/multi_step/a_hijack_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_insert_tests.robot b/case/multi_step/a_insert_tests.robot index 7aadaa4..64c0e4a 100644 --- a/case/multi_step/a_insert_tests.robot +++ b/case/multi_step/a_insert_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_intercept_http_tests.robot b/case/multi_step/a_intercept_http_tests.robot index 0cb501c..adbeb0c 100644 --- a/case/multi_step/a_intercept_http_tests.robot +++ b/case/multi_step/a_intercept_http_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot diff --git a/case/multi_step/a_intercept_ssl_Tests.robot b/case/multi_step/a_intercept_ssl_Tests.robot index 6b8ad01..7259479 100644 --- a/case/multi_step/a_intercept_ssl_Tests.robot +++ b/case/multi_step/a_intercept_ssl_Tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_monitor_dns_tests.robot b/case/multi_step/a_monitor_dns_tests.robot index 5ef0eea..a9bf7eb 100644 --- a/case/multi_step/a_monitor_dns_tests.robot +++ b/case/multi_step/a_monitor_dns_tests.robot @@ -1,10 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_monitor_ftp_tests.robot b/case/multi_step/a_monitor_ftp_tests.robot index 34dead4..e3fc3c6 100644 --- a/case/multi_step/a_monitor_ftp_tests.robot +++ b/case/multi_step/a_monitor_ftp_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_monitor_http_tests.robot b/case/multi_step/a_monitor_http_tests.robot index 648efea..8774c93 100644 --- a/case/multi_step/a_monitor_http_tests.robot +++ b/case/multi_step/a_monitor_http_tests.robot @@ -1,10 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_monitor_https_tests.robot b/case/multi_step/a_monitor_https_tests.robot index db11579..b51bce7 100644 --- a/case/multi_step/a_monitor_https_tests.robot +++ b/case/multi_step/a_monitor_https_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_monitor_mail_tests.robot b/case/multi_step/a_monitor_mail_tests.robot index 72a578d..593d867 100644 --- a/case/multi_step/a_monitor_mail_tests.robot +++ b/case/multi_step/a_monitor_mail_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_monitor_rtp_tests.robot b/case/multi_step/a_monitor_rtp_tests.robot index 1f18e29..63eeb0b 100644 --- a/case/multi_step/a_monitor_rtp_tests.robot +++ b/case/multi_step/a_monitor_rtp_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_monitor_sip_tests.robot b/case/multi_step/a_monitor_sip_tests.robot index 34703d6..0fa3107 100644 --- a/case/multi_step/a_monitor_sip_tests.robot +++ b/case/multi_step/a_monitor_sip_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_monitor_smtps_tests.robot b/case/multi_step/a_monitor_smtps_tests.robot new file mode 100644 index 0000000..b4d5da0 --- /dev/null +++ b/case/multi_step/a_monitor_smtps_tests.robot @@ -0,0 +1,23 @@ +*** Settings *** +Force Tags tsg_adc_wp adc_api security_policy +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot + + +*** Test Cases *** +security_policy_monitor_smtps_00001 + [Tags] calling ip source + Comment 创建安全策略 + ${policyDict} Create Dictionary policyName=security_policy_monitor_smtps_00001 policyType=tsg_security policyDesc=autotest action=monitor userRegion={} isValid=${1} appIdObjects=${SMTPS_ID} + log ${policyDict} + ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 + ${policyId} GetPids ${policyId} + ${policyId} Set Variable ${policyId}[0] + InsertObjectIdToFile monitor_smtps_policyId ${policyId} + + + + diff --git a/case/multi_step/a_monitor_ssh_tests.robot b/case/multi_step/a_monitor_ssh_tests.robot index f1a34fb..8d9b244 100644 --- a/case/multi_step/a_monitor_ssh_tests.robot +++ b/case/multi_step/a_monitor_ssh_tests.robot @@ -1,10 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_monitor_ssl_tests.robot b/case/multi_step/a_monitor_ssl_tests.robot index ec5cf56..68676c6 100644 --- a/case/multi_step/a_monitor_ssl_tests.robot +++ b/case/multi_step/a_monitor_ssl_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** security_policy_monitor_ssl_00001 diff --git a/case/multi_step/a_monitor_tests.robot b/case/multi_step/a_monitor_tests.robot index 0ff7d4a..0e76729 100644 --- a/case/multi_step/a_monitor_tests.robot +++ b/case/multi_step/a_monitor_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Variables *** diff --git a/case/multi_step/a_redirect_tests.robot b/case/multi_step/a_redirect_tests.robot index d01a0a3..3d16859 100644 --- a/case/multi_step/a_redirect_tests.robot +++ b/case/multi_step/a_redirect_tests.robot @@ -1,10 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/a_replace_tests.robot b/case/multi_step/a_replace_tests.robot index a5d28ca..3f98fa1 100644 --- a/case/multi_step/a_replace_tests.robot +++ b/case/multi_step/a_replace_tests.robot @@ -1,11 +1,10 @@ *** Settings *** Force Tags tsg_adc_wp adc_api proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot *** Test Cases *** diff --git a/case/multi_step/b_a_starttime.robot b/case/multi_step/b_a_starttime.robot index 64513bd..377ce50 100644 --- a/case/multi_step/b_a_starttime.robot +++ b/case/multi_step/b_a_starttime.robot @@ -2,13 +2,16 @@ Force Tags tsg_adc_wp starttime Library OperatingSystem Library DateTime -Resource ../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot *** Test Cases *** starttime Sleep ${policyVerificationSleepSeconds}s - ${starttime} Get Current Date UTC exclude_millis=True + # ${starttime} Get Current Date UTC exclude_millis=True + # ${starttime} Get Time + ${isUTC} Evaluate ${tsgVersion}>=22.03 + ${starttime} Run Keyword If "${isUTC}"=="True" Get Current Date UTC exclude_millis=True + ... ELSE Get Time InsertStartTimeToFile starttime ${starttime} diff --git a/case/multi_step/b_allow_http_tests.robot b/case/multi_step/b_allow_http_tests.robot index f7b8a4d..5e06b7f 100644 --- a/case/multi_step/b_allow_http_tests.robot +++ b/case/multi_step/b_allow_http_tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** diff --git a/case/multi_step/b_allow_https_tests.robot b/case/multi_step/b_allow_https_tests.robot index d5aa8b2..f7f2828 100644 --- a/case/multi_step/b_allow_https_tests.robot +++ b/case/multi_step/b_allow_https_tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** security_policy_allow_https_00001 diff --git a/case/multi_step/b_allow_rtp.robot b/case/multi_step/b_allow_rtp.robot index 318f378..0fc6772 100644 --- a/case/multi_step/b_allow_rtp.robot +++ b/case/multi_step/b_allow_rtp.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library Custometest Library SSHLibrary diff --git a/case/multi_step/b_allow_sip.robot b/case/multi_step/b_allow_sip.robot index 328416b..0c331df 100644 --- a/case/multi_step/b_allow_sip.robot +++ b/case/multi_step/b_allow_sip.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library Custometest Library SSHLibrary diff --git a/case/multi_step/b_allow_ssh_tests.robot b/case/multi_step/b_allow_ssh_tests.robot index cf5af5c..f5b1d00 100644 --- a/case/multi_step/b_allow_ssh_tests.robot +++ b/case/multi_step/b_allow_ssh_tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** diff --git a/case/multi_step/b_allow_ssl_tests.robot b/case/multi_step/b_allow_ssl_tests.robot index 3201db2..6b2d2c8 100644 --- a/case/multi_step/b_allow_ssl_tests.robot +++ b/case/multi_step/b_allow_ssl_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** diff --git a/case/multi_step/b_allow_tests.robot b/case/multi_step/b_allow_tests.robot index 40a9e21..d34e7ff 100644 --- a/case/multi_step/b_allow_tests.robot +++ b/case/multi_step/b_allow_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp proxy_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** proxy_policy_allow_00001 diff --git a/case/multi_step/b_ballow_http_tests_verify.robot b/case/multi_step/b_ballow_http_tests_verify.robot index 0dd8072..fa4d0ce 100644 --- a/case/multi_step/b_ballow_http_tests_verify.robot +++ b/case/multi_step/b_ballow_http_tests_verify.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -33,7 +33,7 @@ security_policy_allow_http-00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${qname_fqdn_id} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${qname_fqdn_id} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -62,7 +62,7 @@ security_policy_allow_http-00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${qname_fqdn_id} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${qname_fqdn_id} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} diff --git a/case/multi_step/b_ballow_ssl_tests_verify.robot b/case/multi_step/b_ballow_ssl_tests_verify.robot index 037ba68..b490816 100644 --- a/case/multi_step/b_ballow_ssl_tests_verify.robot +++ b/case/multi_step/b_ballow_ssl_tests_verify.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} diff --git a/case/multi_step/b_ballow_tests_verify.robot b/case/multi_step/b_ballow_tests_verify.robot index 2043cc6..f090425 100644 --- a/case/multi_step/b_ballow_tests_verify.robot +++ b/case/multi_step/b_ballow_tests_verify.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -31,7 +31,7 @@ proxy_policy_allow_00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -40,7 +40,7 @@ proxy_policy_allow_00001 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId39} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId39} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -62,7 +62,7 @@ proxy_policy_allow_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -71,7 +71,7 @@ proxy_policy_allow_00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId1} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId1} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -100,8 +100,8 @@ proxy_policy_allow_00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} - ... ${url1} ${url2} ${url3} ${url4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} + ... ${url1} ${url2} ${url3} ${url4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -110,7 +110,7 @@ proxy_policy_allow_00003 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId2} ${allow_objectId3} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId2} ${allow_objectId3} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -133,7 +133,7 @@ proxy_policy_allow_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -142,7 +142,7 @@ proxy_policy_allow_00004 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId40} ${allow_objectId41} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId40} ${allow_objectId41} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -166,7 +166,7 @@ proxy_policy_allow_00005 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -175,7 +175,7 @@ proxy_policy_allow_00005 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId7} ${allow_objectId8} ${allow_objectId9} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId7} ${allow_objectId8} ${allow_objectId9} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -199,7 +199,7 @@ proxy_policy_allow_00006 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -209,7 +209,6 @@ proxy_policy_allow_00006 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId10} ${allow_objectId11} ${allow_objectId12} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -233,7 +232,7 @@ proxy_policy_allow_00007 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -267,7 +266,7 @@ proxy_policy_allow_00008 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -276,7 +275,7 @@ proxy_policy_allow_00008 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId16} ${allow_objectId17} ${allow_objectId18} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId16} ${allow_objectId17} ${allow_objectId18} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -300,7 +299,7 @@ proxy_policy_allow_00009 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -310,7 +309,6 @@ proxy_policy_allow_00009 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId19} ${allow_objectId20} ${allow_objectId21} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -334,7 +332,7 @@ proxy_policy_allow_000010 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -343,7 +341,7 @@ proxy_policy_allow_000010 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId22} ${allow_objectId23} ${allow_objectId24} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId22} ${allow_objectId23} ${allow_objectId24} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -366,7 +364,7 @@ proxy_policy_allow_000011 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -375,7 +373,7 @@ proxy_policy_allow_000011 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId26} ${allow_objectId42} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId26} ${allow_objectId42} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -409,8 +407,8 @@ proxy_policy_allow_000012 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} - ... ${req_hdr_ck1} ${req_hdr_ck2} ${req_hdr_ck3} ${req_hdr_ck4} ${req_hdr_ck5} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} + ... ${req_hdr_ck1} ${req_hdr_ck2} ${req_hdr_ck3} ${req_hdr_ck4} ${req_hdr_ck5} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -419,7 +417,7 @@ proxy_policy_allow_000012 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId28} ${allow_objectId29} ${allow_objectId30} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId28} ${allow_objectId29} ${allow_objectId30} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -448,8 +446,8 @@ proxy_policy_allow_000013 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} - ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} + ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -458,7 +456,7 @@ proxy_policy_allow_000013 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId31} ${allow_objectId32} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId31} ${allow_objectId32} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -485,8 +483,8 @@ proxy_policy_allow_000014 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${req_hdr_ua} ${req_hdr_ck} - ... ${res_hdr_sc} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${req_hdr_ua} ${req_hdr_ck} + ... ${res_hdr_sc} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -496,7 +494,7 @@ proxy_policy_allow_000014 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${allow_objectId33} ${allow_objectId34} ${allow_objectId35} ${allow_objectId36} - ... ${allow_objectId37} ${allow_objectId38} ${testImsiId} ${testPhoneNumId} ${testApnId} + ... ${allow_objectId37} ${allow_objectId38} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_deny_dns_tests.robot b/case/multi_step/b_deny_dns_tests.robot index c379fda..06e938f 100644 --- a/case/multi_step/b_deny_dns_tests.robot +++ b/case/multi_step/b_deny_dns_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** security_policy_deny_dns_00001 @@ -23,7 +23,7 @@ security_policy_deny_dns_00001 ... ELSE Create List timed out ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变阻断策略 - ${policyDict} Create Dictionary policyId=${deny_dns_policyId} policyName=security_policy_deny_dns_00001_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"drop"} source=${deny_dns_objectId4}|TSG_SECURITY_SOURCE_LOCATION filterList=${deny_dns_objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} + ${policyDict} Create Dictionary policyId=${deny_dns_policyId} policyName=security_policy_deny_dns_00001_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"DNS","method":"drop","packet_capture":{"enable":1,"capture_depth":2000}} source=${deny_dns_objectId4}|TSG_SECURITY_SOURCE_LOCATION filterList=${deny_dns_objectId}|TSG_FIELD_DNS_QNAME isValid=${1} appIdObjects=${DNS_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update Comment 功能端验证HTTP验证 diff --git a/case/multi_step/b_deny_ftp_tests.robot b/case/multi_step/b_deny_ftp_tests.robot index 0ec2d3d..9d0fdd6 100644 --- a/case/multi_step/b_deny_ftp_tests.robot +++ b/case/multi_step/b_deny_ftp_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library Custometest *** Test Cases *** diff --git a/case/multi_step/b_deny_http_tests.robot b/case/multi_step/b_deny_http_tests.robot index fec7f0a..835e3fc 100644 --- a/case/multi_step/b_deny_http_tests.robot +++ b/case/multi_step/b_deny_http_tests.robot @@ -120,7 +120,7 @@ security_policy_deny_http_00008 ... ELSE Create List timed out ${rescode} SystemCommands ${commandstr} ${stringlist} Comment 改变阻断策略 - ${policyDict} Create Dictionary policyId=${deny_http_policyId7} policyName=security_policy_deny_http_00008_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"reset"} filterList=${deny_http_objectId39}|TSG_FIELD_HTTP_RES_HDR,${deny_http_objectId11}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} + ${policyDict} Create Dictionary policyId=${deny_http_policyId7} policyName=security_policy_deny_http_00008_1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"tamper"} filterList=${deny_http_objectId39}|TSG_FIELD_HTTP_RES_HDR,${deny_http_objectId11}|TSG_FIELD_HTTP_URL isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update sleep 5 @@ -300,13 +300,13 @@ security_policy_deny_http_00016 # sleep ${policyModifySleepSeconds} -# security_policy_deny_http_00020 - # Comment 功能端验证HTTP验证 - # ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00020.bat - # ... ELSE set variable curl -kv --cookie "wdcid=69d512097f7e021c; uid=6fe4a07479b44464b2fc6aaea84dcc85; wdlast=1618453760" --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36" --referer 'https://www.baidu.com/' \ http://www.xinhuanet.com/ - # ${stringlist} run keyword if '${systemType}'=='Windows' Create List timed out - # ... ELSE Create List timed out - # ${rescode} SystemCommands ${commandstr} ${stringlist} +security_policy_deny_http_00020 + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_HTTP_00020.bat + ... ELSE set variable curl -kv --cookie "wdcid=69d512097f7e021c; uid=6fe4a07479b44464b2fc6aaea84dcc85; wdlast=1618453760" --user-agent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36" --referer 'https://www.baidu.com/' \ http://www.xinhuanet.com/ + ${stringlist} run keyword if '${systemType}'=='Windows' Create List timed out + ... ELSE Create List timed out + ${rescode} SystemCommands ${commandstr} ${stringlist} # security_policy_deny_http_00021 # Comment 开启阻断策略 diff --git a/case/multi_step/b_deny_https_tests.robot b/case/multi_step/b_deny_https_tests.robot index e25e83b..115c5e7 100644 --- a/case/multi_step/b_deny_https_tests.robot +++ b/case/multi_step/b_deny_https_tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** security_policy_deny_https_00001 diff --git a/case/multi_step/b_deny_mail_tests.robot b/case/multi_step/b_deny_mail_tests.robot index 9314d9f..d27ddc0 100644 --- a/case/multi_step/b_deny_mail_tests.robot +++ b/case/multi_step/b_deny_mail_tests.robot @@ -1,13 +1,13 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/stmp_handle.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/stmp_handle.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** # security_policy_deny_mail_00001 @@ -112,7 +112,7 @@ security_policy_deny_mail_00003 run keyword if '${systemType}'=='Windows' should contain ${发送邮件返回结果} mail_fail ... ELSE should contain ${发送邮件返回结果} fail Comment 改变监控策略 - ${policyDict} Create Dictionary policyId=${deny_mail_policyId2} policyName=security_policy_deny_mail_00003-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"reset"} filterList=${deny_mail_objectId36}|TSG_FIELD_MAIL_FROM,${deny_mail_objectId35}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} + ${policyDict} Create Dictionary policyId=${deny_mail_policyId2} policyName=security_policy_deny_mail_00003-1 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"MAIL","method":"tamper"} filterList=${deny_mail_objectId36}|TSG_FIELD_MAIL_FROM,${deny_mail_objectId35}|TSG_FIELD_MAIL_SUBJECT isValid=${1} appIdObjects=${MAIL_ID} log ${policyDict} ${rescode} UpdatePolicies 1 ${policyDict} v2 update Comment 功能端验证 diff --git a/case/multi_step/b_deny_sip_Tests.robot b/case/multi_step/b_deny_sip_Tests.robot index 5c0e5c1..b180662 100644 --- a/case/multi_step/b_deny_sip_Tests.robot +++ b/case/multi_step/b_deny_sip_Tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library Custometest Library SSHLibrary diff --git a/case/multi_step/b_deny_ssh_tests.robot b/case/multi_step/b_deny_ssh_tests.robot index 6b29f27..e2f8187 100644 --- a/case/multi_step/b_deny_ssh_tests.robot +++ b/case/multi_step/b_deny_ssh_tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** diff --git a/case/multi_step/b_deny_ssl_tests.robot b/case/multi_step/b_deny_ssl_tests.robot index d0b9150..9ba9143 100644 --- a/case/multi_step/b_deny_ssl_tests.robot +++ b/case/multi_step/b_deny_ssl_tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** @@ -51,13 +51,13 @@ security_policy_deny_ssl_00002 ... ELSE Create List OpenSSL SSL_connect ${rescode} SystemCommands ${commandstr} ${stringlist} -# security_policy_deny_ssl_00003 - # Comment 功能端验证HTTP验证 - # ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003.bat - # ... ELSE set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003_L.bat - # ${stringlist} run keyword if '${systemType}'=='Windows' Create List timed out - # ... ELSE Create List timed out - # ${rescode} SystemCommands ${commandstr} ${stringlist} +security_policy_deny_ssl_00003 + Comment 功能端验证HTTP验证 + ${commandstr} run keyword if '${systemType}'=='Windows' set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003.bat + ... ELSE set variable ${curlbatpath}/command/SecurityPolicy_Deny_SSL_00003_L.bat + ${stringlist} run keyword if '${systemType}'=='Windows' Create List timed out + ... ELSE Create List timed out + ${rescode} SystemCommands ${commandstr} ${stringlist} # security_policy_deny_ssl_00004 # Comment 功能端验证HTTP验证 diff --git a/case/multi_step/b_deny_tests.robot b/case/multi_step/b_deny_tests.robot index fe191ea..876fea3 100644 --- a/case/multi_step/b_deny_tests.robot +++ b/case/multi_step/b_deny_tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp proxy_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** proxy_policy-deny_00001 diff --git a/case/multi_step/b_edeny_dns_tests_verify.robot b/case/multi_step/b_edeny_dns_tests_verify.robot index 09d6cb7..adb9999 100644 --- a/case/multi_step/b_edeny_dns_tests_verify.robot +++ b/case/multi_step/b_edeny_dns_tests_verify.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} diff --git a/case/multi_step/b_edeny_ftp_tests_verify.robot b/case/multi_step/b_edeny_ftp_tests_verify.robot index 699867a..bbaee3c 100644 --- a/case/multi_step/b_edeny_ftp_tests_verify.robot +++ b/case/multi_step/b_edeny_ftp_tests_verify.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -33,14 +33,14 @@ ${objectids} ${EMPTY} # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.90.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # # 合成attributes字典集 - # ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # ${rescode} ${resData} VerifyPolicies ${verifyList} # # 打印检查结果 # # 将 策略id 加入对象 id # ${objectid_verify} set variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${deny_ftp_objectId13} ${deny_ftp_objectId14} ${deny_ftp_objectId15} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${deny_ftp_objectId13} ${deny_ftp_objectId14} ${deny_ftp_objectId15} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # ${ok} VerifyProxy ${resData} ${objectid_verify} # Should Be Equal As Strings ${ok} true @@ -58,7 +58,7 @@ ${objectids} ${EMPTY} # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.90.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # # 合成attributes字典集 - # ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -67,7 +67,7 @@ ${objectids} ${EMPTY} # # 打印检查结果 # # 将 策略id 加入对象 id # ${objectid_verify} set variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${deny_ftp_objectId3} ${deny_ftp_objectId4} ${deny_ftp_objectId5} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${deny_ftp_objectId3} ${deny_ftp_objectId4} ${deny_ftp_objectId5} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # ${ok} VerifyProxy ${resData} ${objectid_verify} # # # ${ok} VerifyProxy ${objectids} ${resData} @@ -86,7 +86,7 @@ security_policy_deny_ftp_00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.90.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 - ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -95,7 +95,7 @@ security_policy_deny_ftp_00003 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${deny_ftp_objectId6} ${deny_ftp_objectId7} ${deny_ftp_objectId8} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${deny_ftp_objectId6} ${deny_ftp_objectId7} ${deny_ftp_objectId8} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -114,7 +114,7 @@ security_policy_deny_ftp_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.90.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 - ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -123,7 +123,7 @@ security_policy_deny_ftp_00004 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${deny_ftp_objectId9} ${deny_ftp_objectId10} ${deny_ftp_objectId11} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${deny_ftp_objectId9} ${deny_ftp_objectId10} ${deny_ftp_objectId11} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} diff --git a/case/multi_step/b_edeny_http_tests_verify.robot b/case/multi_step/b_edeny_http_tests_verify.robot index e130df5..c19941b 100644 --- a/case/multi_step/b_edeny_http_tests_verify.robot +++ b/case/multi_step/b_edeny_http_tests_verify.robot @@ -5,15 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/library/verify_policy.py -# Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/library/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -33,14 +32,14 @@ ${objectids} ${EMPTY} # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # # 合成attributes字典集 - # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # log ${verifyList} # ${rescode} ${resData} VerifyPolicies ${verifyList} # # 打印检查结果 # ${objectid_verify} Set Variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId36} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId36} # # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # log ${objectid_verify} # ${testType} Evaluate type($objectid_verify) @@ -61,7 +60,7 @@ security_policy_deny_http_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -70,7 +69,7 @@ security_policy_deny_http_00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId1} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId1} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -92,7 +91,7 @@ security_policy_deny_http_00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url1} ${url2} ${url3} ${url4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url1} ${url2} ${url3} ${url4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -101,7 +100,7 @@ security_policy_deny_http_00003 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId2} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId2} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -123,7 +122,7 @@ security_policy_deny_http_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -132,7 +131,7 @@ security_policy_deny_http_00004 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId37} ${deny_http_objectId38} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId37} ${deny_http_objectId38} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -154,7 +153,7 @@ security_policy_deny_http_00005 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -163,7 +162,7 @@ security_policy_deny_http_00005 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId5} ${deny_http_objectId6} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId5} ${deny_http_objectId6} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -185,7 +184,7 @@ security_policy_deny_http_00006 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -194,7 +193,7 @@ security_policy_deny_http_00006 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId7} ${deny_http_objectId8} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId7} ${deny_http_objectId8} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -216,7 +215,7 @@ security_policy_deny_http_00007 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -225,7 +224,7 @@ security_policy_deny_http_00007 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId9} ${deny_http_objectId10} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId9} ${deny_http_objectId10} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -247,7 +246,7 @@ security_policy_deny_http_00008 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -256,7 +255,7 @@ security_policy_deny_http_00008 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId11} ${deny_http_objectId39} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId11} ${deny_http_objectId39} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -278,7 +277,7 @@ security_policy_deny_http_00008 # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # # 合成attributes字典集 - # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # log ${verifyList} @@ -287,7 +286,7 @@ security_policy_deny_http_00008 # Should Be Equal As Strings ${state} True # # 打印检查结果 # ${objectid_verify} Set Variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId13} ${deny_http_objectId14} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId13} ${deny_http_objectId14} # # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # log ${objectid_verify} # ${testType} Evaluate type($objectid_verify) @@ -309,7 +308,7 @@ security_policy_deny_http_00008 # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # # 合成attributes字典集 - # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # log ${verifyList} @@ -318,7 +317,7 @@ security_policy_deny_http_00008 # Should Be Equal As Strings ${state} True # # 打印检查结果 # ${objectid_verify} Set Variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId17} ${deny_http_objectId18} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId17} ${deny_http_objectId18} # # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # log ${objectid_verify} # ${testType} Evaluate type($objectid_verify) @@ -340,7 +339,7 @@ security_policy_deny_http_00008 # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # # 合成attributes字典集 - # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${res_body} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${res_body} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # log ${verifyList} @@ -349,7 +348,7 @@ security_policy_deny_http_00008 # Should Be Equal As Strings ${state} True # # 打印检查结果 # ${objectid_verify} Set Variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId41} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId41} # # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # log ${objectid_verify} # ${testType} Evaluate type($objectid_verify) @@ -374,7 +373,7 @@ security_policy_deny_http_00008 # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # # 合成attributes字典集 - # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${res_body} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${res_body} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # log ${verifyList} @@ -384,7 +383,7 @@ security_policy_deny_http_00008 # # 打印检查结果 # ${objectid_verify} Set Variable ${testClentIpId} # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId28} ${deny_http_objectId29} ${deny_http_objectId30} - # ... ${deny_http_objectId31} ${deny_http_objectId32} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ... ${deny_http_objectId31} ${deny_http_objectId32} # # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # log ${objectid_verify} # ${testType} Evaluate type($objectid_verify) @@ -405,7 +404,7 @@ security_policy_deny_http_00008 # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"192.168.50.18","port":"100","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # # 合成attributes字典集 - # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # log ${verifyList} @@ -414,7 +413,7 @@ security_policy_deny_http_00008 # Should Be Equal As Strings ${state} True # # 打印检查结果 # ${objectid_verify} Set Variable ${deny_http_objectId33} - # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId34} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_http_objectId34} # # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # log ${objectid_verify} # ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_edeny_mail_tests.robot b/case/multi_step/b_edeny_mail_tests.robot index 8a6ccf2..a02970b 100644 --- a/case/multi_step/b_edeny_mail_tests.robot +++ b/case/multi_step/b_edeny_mail_tests.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Test Cases *** # security_policy_deny_mail_00001 @@ -29,14 +29,14 @@ Library ../../customlib/verify_policy.py # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # # 合成attributes字典集 - # ${attributes} Create List ${content_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${content_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # ${rescode} ${resData} VerifyPolicies ${verifyList} # # 打印检查结果 # # 将 策略id 加入对象 id # ${objectid_verify} set variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId33} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId33} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # ${ok} VerifyProxy ${resData} ${objectid_verify} # # # ${ok} VerifyProxy ${objectids} ${resData} @@ -55,7 +55,7 @@ Library ../../customlib/verify_policy.py # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # # 合成attributes字典集 - # ${attributes} Create List ${att_content_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${subject_id} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${att_content_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${subject_id} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -65,7 +65,7 @@ Library ../../customlib/verify_policy.py # # 打印检查结果 # # 将 策略id 加入对象 id # ${objectid_verify} set variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId34} ${deny_mail_objectId39} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId34} ${deny_mail_objectId39} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # ${ok} VerifyProxy ${resData} ${objectid_verify} # # # ${ok} VerifyProxy ${objectids} ${resData} @@ -84,7 +84,7 @@ security_policy_deny_mail_00003 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -93,7 +93,7 @@ security_policy_deny_mail_00003 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId35} ${deny_mail_objectId36} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId35} ${deny_mail_objectId36} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -112,7 +112,7 @@ security_policy_deny_mail_00004 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -121,7 +121,7 @@ security_policy_deny_mail_00004 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId4} ${deny_mail_objectId5} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId4} ${deny_mail_objectId5} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -140,7 +140,7 @@ security_policy_deny_mail_00005 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -149,7 +149,7 @@ security_policy_deny_mail_00005 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId6} ${deny_mail_objectId7} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId6} ${deny_mail_objectId7} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -168,7 +168,7 @@ security_policy_deny_mail_00006 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -177,7 +177,7 @@ security_policy_deny_mail_00006 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId8} ${deny_mail_objectId9} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId8} ${deny_mail_objectId9} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -196,7 +196,7 @@ security_policy_deny_mail_00007 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -205,7 +205,7 @@ security_policy_deny_mail_00007 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId10} ${deny_mail_objectId11} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId10} ${deny_mail_objectId11} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -224,7 +224,7 @@ security_policy_deny_mail_00008 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -233,7 +233,7 @@ security_policy_deny_mail_00008 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId12} ${deny_mail_objectId13} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId12} ${deny_mail_objectId13} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -252,7 +252,7 @@ security_policy_deny_mail_00009 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -261,7 +261,7 @@ security_policy_deny_mail_00009 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId14} ${deny_mail_objectId15} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId14} ${deny_mail_objectId15} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -280,7 +280,7 @@ security_policy_deny_mail_00010 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -289,7 +289,7 @@ security_policy_deny_mail_00010 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId16} ${deny_mail_objectId17} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId16} ${deny_mail_objectId17} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -308,7 +308,7 @@ security_policy_deny_mail_00011 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -317,7 +317,7 @@ security_policy_deny_mail_00011 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId18} ${deny_mail_objectId19} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId18} ${deny_mail_objectId19} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -336,7 +336,7 @@ security_policy_deny_mail_00012 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -364,7 +364,7 @@ security_policy_deny_mail_00013 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -373,7 +373,7 @@ security_policy_deny_mail_00013 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId22} ${deny_mail_objectId23} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId22} ${deny_mail_objectId23} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -393,7 +393,7 @@ security_policy_deny_mail_00014 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -402,7 +402,7 @@ security_policy_deny_mail_00014 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId24} ${deny_mail_objectId25} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId24} ${deny_mail_objectId25} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -426,7 +426,7 @@ security_policy_deny_mail_00015 ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${content_id} ${att_content_id} ${from_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} - ... ${subscriberid} ${account_id} ${imsi_id} ${phone_number_id} ${apn_id} + ... ${account_id} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -436,7 +436,7 @@ security_policy_deny_mail_00015 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_mail_objectId26} ${deny_mail_objectId27} ${deny_mail_objectId28} ${deny_mail_objectId29} ${deny_mail_objectId30} - ... ${deny_mail_objectId31} ${testImsiId} ${testPhoneNumId} ${testApnId} + ... ${deny_mail_objectId31} # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} diff --git a/case/multi_step/b_edeny_ssl_tests.robot b/case/multi_step/b_edeny_ssl_tests.robot index ca12ea0..372ca94 100644 --- a/case/multi_step/b_edeny_ssl_tests.robot +++ b/case/multi_step/b_edeny_ssl_tests.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Test Cases *** security_policy_deny_ssl_00001 @@ -28,14 +28,14 @@ security_policy_deny_ssl_00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${sni} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_ssl_objectId4} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_ssl_objectId4} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -57,7 +57,7 @@ security_policy_deny_ssl_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni2} ${sni1} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${sni2} ${sni1} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -66,7 +66,7 @@ security_policy_deny_ssl_00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -87,7 +87,7 @@ security_policy_deny_ssl_00002 # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # # 合成attributes字典集 - # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni1} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${sni1} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # log ${verifyList} @@ -96,7 +96,7 @@ security_policy_deny_ssl_00002 # Should Be Equal As Strings ${state} True # # 打印检查结果 # ${objectid_verify} Set Variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_ssl_objectId2} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_ssl_objectId2} # # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # log ${objectid_verify} # ${testType} Evaluate type($objectid_verify) @@ -119,7 +119,7 @@ security_policy_deny_ssl_00002 # ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} # ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # # 合成attributes字典集 - # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni} ${cn} ${san} ${imsi_id} ${phone_number_id} ${apn_id} + # ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni} ${cn} ${san} # ${verifySession} Create Dictionary attributes=${attributes} # ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} # log ${verifyList} @@ -128,7 +128,7 @@ security_policy_deny_ssl_00002 # Should Be Equal As Strings ${state} True # # 打印检查结果 # ${objectid_verify} Set Variable ${testClentIpId} - # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_ssl_objectId3} ${deny_ssl_objectId6} ${testImsiId} ${testPhoneNumId} ${testApnId} + # ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_ssl_objectId3} ${deny_ssl_objectId6} # # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 # log ${objectid_verify} # ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_edeny_tests_verify.robot b/case/multi_step/b_edeny_tests_verify.robot index 0d20d9e..4064a43 100644 --- a/case/multi_step/b_edeny_tests_verify.robot +++ b/case/multi_step/b_edeny_tests_verify.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -31,7 +31,7 @@ proxy_policy-deny_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -40,7 +40,7 @@ proxy_policy-deny_00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId1} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId1} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -69,8 +69,8 @@ proxy_policy-deny_00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} - ... ${url1} ${url2} ${url3} ${url4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} + ... ${url1} ${url2} ${url3} ${url4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -79,7 +79,7 @@ proxy_policy-deny_00003 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId2} ${deny_objectId3} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId2} ${deny_objectId3} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -103,7 +103,7 @@ proxy_policy-deny_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -112,7 +112,7 @@ proxy_policy-deny_00004 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId48} ${deny_objectId49} ${deny_objectId50} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId48} ${deny_objectId49} ${deny_objectId50} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -136,7 +136,7 @@ proxy_policy-deny_00005 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -145,7 +145,7 @@ proxy_policy-deny_00005 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId7} ${deny_objectId8} ${deny_objectId9} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId7} ${deny_objectId8} ${deny_objectId9} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -169,7 +169,7 @@ proxy_policy-deny_00006 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -178,7 +178,7 @@ proxy_policy-deny_00006 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId10} ${deny_objectId11} ${deny_objectId12} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId10} ${deny_objectId11} ${deny_objectId12} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -202,7 +202,7 @@ proxy_policy-deny_00007 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -211,7 +211,7 @@ proxy_policy-deny_00007 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId13} ${deny_objectId14} ${deny_objectId15} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId13} ${deny_objectId14} ${deny_objectId15} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -235,7 +235,7 @@ proxy_policy-deny_00008 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -244,7 +244,7 @@ proxy_policy-deny_00008 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId51} ${deny_objectId52} ${deny_objectId53} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId51} ${deny_objectId52} ${deny_objectId53} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -268,7 +268,7 @@ proxy_policy-deny_00009 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -277,7 +277,7 @@ proxy_policy-deny_00009 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId20} ${deny_objectId21} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId20} ${deny_objectId21} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -301,7 +301,7 @@ proxy_policy-deny_000010 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -310,7 +310,7 @@ proxy_policy-deny_000010 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId22} ${deny_objectId23} ${deny_objectId24} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId22} ${deny_objectId23} ${deny_objectId24} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -334,7 +334,7 @@ proxy_policy-deny_000011 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -343,7 +343,7 @@ proxy_policy-deny_000011 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId25} ${deny_objectId26} ${deny_objectId27} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId25} ${deny_objectId26} ${deny_objectId27} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -367,7 +367,7 @@ proxy_policy-deny_000012 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -376,7 +376,7 @@ proxy_policy-deny_000012 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId28} ${deny_objectId29} ${deny_objectId30} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId28} ${deny_objectId29} ${deny_objectId30} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -409,15 +409,15 @@ proxy_policy-deny_000013 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} - ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} + ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId31} ${deny_objectId32} ${deny_objectId46} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId31} ${deny_objectId32} ${deny_objectId46} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -440,7 +440,7 @@ proxy_policy-deny_000014 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${req_body} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${req_body} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -449,7 +449,7 @@ proxy_policy-deny_000014 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId54} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId54} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -473,7 +473,7 @@ proxy_policy-deny_000016 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -482,7 +482,7 @@ proxy_policy-deny_000016 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId58} ${deny_objectId47} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId58} ${deny_objectId47} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -508,7 +508,7 @@ proxy_policy-deny_000018 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${res_body} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${res_body} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -517,7 +517,7 @@ proxy_policy-deny_000018 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId41} ${deny_objectId42} ${deny_objectId43} ${deny_objectId44} ${deny_objectId45} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${deny_objectId41} ${deny_objectId42} ${deny_objectId43} ${deny_objectId44} ${deny_objectId45} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_hijack_tests.robot b/case/multi_step/b_hijack_tests.robot index eefb1b6..1dcc967 100644 --- a/case/multi_step/b_hijack_tests.robot +++ b/case/multi_step/b_hijack_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp proxy_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** proxy_policy_hijack_00001 diff --git a/case/multi_step/b_ihijack_tests_verify.robot b/case/multi_step/b_ihijack_tests_verify.robot index abb626d..4d6d7b4 100644 --- a/case/multi_step/b_ihijack_tests_verify.robot +++ b/case/multi_step/b_ihijack_tests_verify.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -33,7 +33,7 @@ proxy_policy_hijack_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -42,7 +42,7 @@ proxy_policy_hijack_00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId1} ${hijack_objectId40} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId1} ${hijack_objectId40} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -70,8 +70,8 @@ proxy_policy_hijack_00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} - ... ${url2} ${url3} ${url4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} + ... ${url2} ${url3} ${url4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -80,7 +80,7 @@ proxy_policy_hijack_00003 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId2} ${hijack_objectId3} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId2} ${hijack_objectId3} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -102,7 +102,7 @@ proxy_policy_hijack_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -111,7 +111,7 @@ proxy_policy_hijack_00004 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId44} ${hijack_objectId45} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId44} ${hijack_objectId45} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -134,7 +134,7 @@ proxy_policy_hijack_00005 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -143,7 +143,7 @@ proxy_policy_hijack_00005 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId7} ${hijack_objectId8} ${hijack_objectId9} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId7} ${hijack_objectId8} ${hijack_objectId9} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -167,7 +167,7 @@ proxy_policy_hijack_00006 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -176,7 +176,7 @@ proxy_policy_hijack_00006 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId10} ${hijack_objectId11} ${hijack_objectId12} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId10} ${hijack_objectId11} ${hijack_objectId12} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -203,7 +203,7 @@ proxy_policy_hijack_00007 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -212,7 +212,7 @@ proxy_policy_hijack_00007 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId13} ${hijack_objectId14} ${hijack_objectId15} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId13} ${hijack_objectId14} ${hijack_objectId15} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -235,7 +235,7 @@ proxy_policy_hijack_00008 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -244,7 +244,7 @@ proxy_policy_hijack_00008 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId17} ${hijack_objectId46} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId17} ${hijack_objectId46} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -268,7 +268,7 @@ proxy_policy_hijack_00009 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -277,7 +277,7 @@ proxy_policy_hijack_00009 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId19} ${hijack_objectId20} ${hijack_objectId21} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId19} ${hijack_objectId20} ${hijack_objectId21} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -301,7 +301,7 @@ proxy_policy_hijack_000010 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -310,7 +310,7 @@ proxy_policy_hijack_000010 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId22} ${hijack_objectId23} ${hijack_objectId24} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId22} ${hijack_objectId23} ${hijack_objectId24} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -335,7 +335,7 @@ proxy_policy_hijack_000012 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -344,7 +344,7 @@ proxy_policy_hijack_000012 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId28} ${hijack_objectId29} ${hijack_objectId30} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId28} ${hijack_objectId29} ${hijack_objectId30} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -377,8 +377,8 @@ proxy_policy_hijack_000013 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} - ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} + ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -387,7 +387,7 @@ proxy_policy_hijack_000013 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId31} ${hijack_objectId32} ${hijack_objectId41} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId31} ${hijack_objectId32} ${hijack_objectId41} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -415,7 +415,7 @@ proxy_policy_hijack_000014 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${res_hdr_ct} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${res_hdr_ct} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -424,7 +424,7 @@ proxy_policy_hijack_000014 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId33} ${hijack_objectId34} ${hijack_objectId35} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${hijack_objectId33} ${hijack_objectId34} ${hijack_objectId35} ... ${hijack_objectId36} ${hijack_objectId37} ${hijack_objectId38} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} diff --git a/case/multi_step/b_insert_tests.robot b/case/multi_step/b_insert_tests.robot index 728c5dd..621d06b 100644 --- a/case/multi_step/b_insert_tests.robot +++ b/case/multi_step/b_insert_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp proxy_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** proxy_policy_insert_00001 diff --git a/case/multi_step/b_intercept_http_tests.robot b/case/multi_step/b_intercept_http_tests.robot index 8ac27e7..656adb8 100644 --- a/case/multi_step/b_intercept_http_tests.robot +++ b/case/multi_step/b_intercept_http_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** diff --git a/case/multi_step/b_intercept_ssl_tests.robot b/case/multi_step/b_intercept_ssl_tests.robot index c083999..c95881c 100644 --- a/case/multi_step/b_intercept_ssl_tests.robot +++ b/case/multi_step/b_intercept_ssl_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** diff --git a/case/multi_step/b_jinsert_tests.robot b/case/multi_step/b_jinsert_tests.robot index db26eb1..c898222 100644 --- a/case/multi_step/b_jinsert_tests.robot +++ b/case/multi_step/b_jinsert_tests.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -32,7 +32,7 @@ proxy_policy_insert_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -41,7 +41,7 @@ proxy_policy_insert_00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId40} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId40} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -70,7 +70,7 @@ proxy_policy_insert_00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -79,7 +79,7 @@ proxy_policy_insert_00003 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId2} ${insert_objectId3} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId2} ${insert_objectId3} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -102,7 +102,7 @@ proxy_policy_insert_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -111,7 +111,7 @@ proxy_policy_insert_00004 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId43} ${insert_objectId44} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId43} ${insert_objectId44} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -135,7 +135,7 @@ proxy_policy_insert_00005 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -144,7 +144,7 @@ proxy_policy_insert_00005 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId7} ${insert_objectId8} ${insert_objectId9} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId7} ${insert_objectId8} ${insert_objectId9} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -168,7 +168,7 @@ proxy_policy_insert_00006 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -177,7 +177,7 @@ proxy_policy_insert_00006 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId10} ${insert_objectId11} ${insert_objectId12} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId10} ${insert_objectId11} ${insert_objectId12} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -201,7 +201,7 @@ proxy_policy_insert_00007 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -210,7 +210,7 @@ proxy_policy_insert_00007 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId13} ${insert_objectId14} ${insert_objectId15} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId13} ${insert_objectId14} ${insert_objectId15} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -233,7 +233,7 @@ proxy_policy_insert_00008 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -242,7 +242,7 @@ proxy_policy_insert_00008 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId17} ${insert_objectId45} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId17} ${insert_objectId45} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -266,7 +266,7 @@ proxy_policy_insert_00009 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -275,7 +275,7 @@ proxy_policy_insert_00009 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId19} ${insert_objectId20} ${insert_objectId21} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId19} ${insert_objectId20} ${insert_objectId21} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -299,7 +299,7 @@ proxy_policy_insert_00010 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -308,7 +308,7 @@ proxy_policy_insert_00010 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId22} ${insert_objectId23} ${insert_objectId24} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId22} ${insert_objectId23} ${insert_objectId24} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -332,7 +332,7 @@ proxy_policy_insert_00011 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -341,7 +341,7 @@ proxy_policy_insert_00011 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId25} ${insert_objectId26} ${insert_objectId27} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId25} ${insert_objectId26} ${insert_objectId27} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -365,7 +365,7 @@ proxy_policy_insert_00012 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -374,7 +374,7 @@ proxy_policy_insert_00012 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId28} ${insert_objectId29} ${insert_objectId30} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId28} ${insert_objectId29} ${insert_objectId30} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -401,7 +401,7 @@ proxy_policy_insert_00013 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ... ${res_hdr_ct} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} @@ -412,7 +412,7 @@ proxy_policy_insert_00013 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${insert_objectId33} ${insert_objectId34} ${insert_objectId35} ${insert_objectId36} - ... ${insert_objectId37} ${testImsiId} ${testPhoneNumId} ${testApnId} + ... ${insert_objectId37} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_jintercept_http_tests.robot b/case/multi_step/b_jintercept_http_tests.robot index 61f665c..6b2b19a 100644 --- a/case/multi_step/b_jintercept_http_tests.robot +++ b/case/multi_step/b_jintercept_http_tests.robot @@ -5,13 +5,13 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Test Cases *** security_policy_intercept_http_00001 @@ -26,14 +26,14 @@ security_policy_intercept_http_00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${intercept_http_objectId1} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${intercept_http_objectId1} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -55,7 +55,7 @@ security_policy_intercept_http_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -64,7 +64,7 @@ security_policy_intercept_http_00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${intercept_http_catInitId1} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${intercept_http_catInitId1} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_jintercept_ssl_tests.robot b/case/multi_step/b_jintercept_ssl_tests.robot index 5e2fa3d..872b277 100644 --- a/case/multi_step/b_jintercept_ssl_tests.robot +++ b/case/multi_step/b_jintercept_ssl_tests.robot @@ -5,13 +5,13 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Test Cases *** @@ -27,7 +27,7 @@ security_policy_intercept_ssl_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${sni} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -36,7 +36,7 @@ security_policy_intercept_ssl_00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${intercept_ssl_objectId2} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${intercept_ssl_objectId2} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_monitor_dns_tests.robot b/case/multi_step/b_monitor_dns_tests.robot index d610139..8ac8425 100644 --- a/case/multi_step/b_monitor_dns_tests.robot +++ b/case/multi_step/b_monitor_dns_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** security_policy_monitor_dns_00001 diff --git a/case/multi_step/b_monitor_ftp_Tests.robot b/case/multi_step/b_monitor_ftp_Tests.robot index b103859..169b6d4 100644 --- a/case/multi_step/b_monitor_ftp_Tests.robot +++ b/case/multi_step/b_monitor_ftp_Tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library Custometest *** Test Cases *** diff --git a/case/multi_step/b_monitor_http_tests.robot b/case/multi_step/b_monitor_http_tests.robot index 3e9d643..60c28b9 100644 --- a/case/multi_step/b_monitor_http_tests.robot +++ b/case/multi_step/b_monitor_http_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** diff --git a/case/multi_step/b_monitor_https_tests.robot b/case/multi_step/b_monitor_https_tests.robot index 0fc5365..01c64ac 100644 --- a/case/multi_step/b_monitor_https_tests.robot +++ b/case/multi_step/b_monitor_https_tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** security_policy_monitor_https_00001 diff --git a/case/multi_step/b_monitor_mail_tests.robot b/case/multi_step/b_monitor_mail_tests.robot index e17fed6..a7202d2 100644 --- a/case/multi_step/b_monitor_mail_tests.robot +++ b/case/multi_step/b_monitor_mail_tests.robot @@ -1,13 +1,13 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/common/stmp_handle.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/stmp_handle.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** security_policy-monitor_mail_00001 @@ -148,7 +148,7 @@ security_policy-monitor_mail_00004 Log ${发送邮件返回结果} run keyword if '${systemType}'=='Windows' should contain ${发送邮件返回结果} mail_success ... ELSE should contain ${发送邮件返回结果} success - sleep 45 + # sleep 45 security_policy-monitor_mail_00005 Comment 功能端验证 diff --git a/case/multi_step/b_monitor_rtp.robot b/case/multi_step/b_monitor_rtp.robot index 1d0a4fa..7adf6f4 100644 --- a/case/multi_step/b_monitor_rtp.robot +++ b/case/multi_step/b_monitor_rtp.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** security_policy_monitor_rtp_00005-1 diff --git a/case/multi_step/b_monitor_sip.robot b/case/multi_step/b_monitor_sip.robot index 14af791..72adf57 100644 --- a/case/multi_step/b_monitor_sip.robot +++ b/case/multi_step/b_monitor_sip.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** diff --git a/case/multi_step/b_monitor_smtps_tests.robot b/case/multi_step/b_monitor_smtps_tests.robot new file mode 100644 index 0000000..40d31d4 --- /dev/null +++ b/case/multi_step/b_monitor_smtps_tests.robot @@ -0,0 +1,34 @@ +*** Settings *** +Force Tags tsg_adc_wp security_policy adc_verify +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/stmp_handle.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt + + +*** Test Cases *** +security_policy_monitor_smtps_00001 + Comment 功能端验证 + ${Smtp服务器} Set Variable smtp.163.com + ${Smtp服务器端口} Set Variable 465 + ${邮箱账号} Set Variable ${mailAccount} + ${邮箱密码} Set Variable ${mailPasswd} + ${邮件主题} Set Variable 123123132 + ${发送者} Set Variable ${mailAccount} + ${附件} Set Variable ["${mailpath}/朱明明测试文件.txt"] + ${接收者} Set Variable ["${mailAccountGeedge}"] + ${抄送者} Set Variable ["${mailAccountGeedge}"] + ${密送者} Set Variable ["${mailAccountGeedge}"] + ${邮件正文} Set Variable Простопорно + ${发送邮件返回结果} EmailSendSSL ${Smtp服务器} ${Smtp服务器端口} ${邮箱账号} ${邮箱密码} ${邮件主题} ${发送者} ${接收者} ${抄送者} ${密送者} ${邮件正文} ${附件} + Log ${发送邮件返回结果} + run keyword if '${systemType}'=='Windows' should contain ${发送邮件返回结果} mail_success + ... ELSE should contain ${发送邮件返回结果} success + + + + + diff --git a/case/multi_step/b_monitor_ssh_tests.robot b/case/multi_step/b_monitor_ssh_tests.robot index 2edaabd..5c123ac 100644 --- a/case/multi_step/b_monitor_ssh_tests.robot +++ b/case/multi_step/b_monitor_ssh_tests.robot @@ -1,11 +1,11 @@ *** Settings *** Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Variables *** diff --git a/case/multi_step/b_monitor_ssl_tests.robot b/case/multi_step/b_monitor_ssl_tests.robot index 0fe8653..5e98d77 100644 --- a/case/multi_step/b_monitor_ssl_tests.robot +++ b/case/multi_step/b_monitor_ssl_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp security_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt Library SSHLibrary *** Test Cases *** diff --git a/case/multi_step/b_monitor_tests.robot b/case/multi_step/b_monitor_tests.robot index 1976776..1f1d7fb 100644 --- a/case/multi_step/b_monitor_tests.robot +++ b/case/multi_step/b_monitor_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp proxy_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** proxy-policy-monitor_00001 diff --git a/case/multi_step/b_nmonitor_ftp_tests.robot b/case/multi_step/b_nmonitor_ftp_tests.robot index 8b599b2..3d87d1e 100644 --- a/case/multi_step/b_nmonitor_ftp_tests.robot +++ b/case/multi_step/b_nmonitor_ftp_tests.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Test Cases *** security_policy_monitor_ftp_00001 @@ -28,7 +28,7 @@ security_policy_monitor_ftp_00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.90.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 - ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -36,7 +36,7 @@ security_policy_monitor_ftp_00001 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${monitor_ftp_objectId13} ${monitor_ftp_objectId14} ${monitor_ftp_objectId15} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} + # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} # # ${ok} VerifyProxy ${objectids} ${resData} @@ -55,7 +55,7 @@ security_policy_monitor_ftp_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.90.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 - ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -85,7 +85,7 @@ security_policy_monitor_ftp_00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.90.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 - ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -114,7 +114,7 @@ security_policy_monitor_ftp_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip": "${testClentIP}","port": "80","tableName": "TSG_SECURITY_SOURCE_ADDR","addrType": 4,"protocol": "6"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip": "192.168.90.158","port": "80","tableName": "TSG_SECURITY_DESTINATION_ADDR","addrType": 4,"protocol": "6"} # 合成attributes字典集 - ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${url} ${Content} ${Account} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} diff --git a/case/multi_step/b_nmonitor_http_tests.robot b/case/multi_step/b_nmonitor_http_tests.robot index af56347..4ab8168 100644 --- a/case/multi_step/b_nmonitor_http_tests.robot +++ b/case/multi_step/b_nmonitor_http_tests.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -31,14 +31,14 @@ security_policy_monitor_http_00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId33} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId33} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -60,14 +60,14 @@ security_policy_monitor_http_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -90,14 +90,14 @@ security_policy_monitor_http_00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url1} ${url2} ${url3} ${url4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url1} ${url2} ${url3} ${url4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId2} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId2} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -120,14 +120,14 @@ security_policy_monitor_http_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId35} ${monitor_http_objectId36} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId35} ${monitor_http_objectId36} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -150,14 +150,14 @@ security_policy_monitor_http_00005 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId5} ${monitor_http_objectId6} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId5} ${monitor_http_objectId6} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -180,14 +180,14 @@ security_policy_monitor_http_00006 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId7} ${monitor_http_objectId8} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId7} ${monitor_http_objectId8} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -210,14 +210,14 @@ security_policy_monitor_http_00007 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId9} ${monitor_http_objectId10} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId9} ${monitor_http_objectId10} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -240,14 +240,14 @@ security_policy_monitor_http_00008 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId11} ${monitor_http_objectId37} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId11} ${monitor_http_objectId37} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -270,14 +270,14 @@ security_policy_monitor_http_00009 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId13} ${monitor_http_objectId14} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId13} ${monitor_http_objectId14} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -300,14 +300,14 @@ security_policy_monitor_http_00010 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId15} ${monitor_http_objectId16} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId15} ${monitor_http_objectId16} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -330,14 +330,14 @@ security_policy_monitor_http_00011 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId17} ${monitor_http_objectId18} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId17} ${monitor_http_objectId18} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -359,14 +359,14 @@ security_policy_monitor_http_00012 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${req_hdr_ck} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${req_hdr_ck} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId19} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId19} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -389,14 +389,14 @@ security_policy_monitor_http_00013 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId20} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId20} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -418,14 +418,14 @@ security_policy_monitor_http_00015 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${res_body} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${res_body} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId39} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId39} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -452,7 +452,7 @@ security_policy_monitor_http_00017 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${res_body} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${res_body} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -463,7 +463,7 @@ security_policy_monitor_http_00017 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_http_objectId28} ${monitor_http_objectId29} ${monitor_http_objectId30} - ... ${monitor_http_objectId31} ${monitor_http_objectId32} ${testImsiId} ${testPhoneNumId} ${testApnId} + ... ${monitor_http_objectId31} ${monitor_http_objectId32} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_nmonitor_mail_tests.robot b/case/multi_step/b_nmonitor_mail_tests.robot index 2c4a057..6b374e7 100644 --- a/case/multi_step/b_nmonitor_mail_tests.robot +++ b/case/multi_step/b_nmonitor_mail_tests.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Test Cases *** security_policy-monitor_mail_00001 @@ -28,14 +28,14 @@ security_policy-monitor_mail_00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${content_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${content_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId33} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId33} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -54,7 +54,7 @@ security_policy-monitor_mail_00002 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${att_content_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${att_content_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -63,7 +63,7 @@ security_policy-monitor_mail_00002 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId34} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId34} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -83,7 +83,7 @@ security_policy-monitor_mail_00003 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -92,7 +92,7 @@ security_policy-monitor_mail_00003 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId35} ${monitor_mail_objectId36} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId35} ${monitor_mail_objectId36} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -112,7 +112,7 @@ security_policy-monitor_mail_00004 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -121,7 +121,7 @@ security_policy-monitor_mail_00004 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId4} ${monitor_mail_objectId5} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId4} ${monitor_mail_objectId5} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -141,7 +141,7 @@ security_policy-monitor_mail_00005 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -150,7 +150,7 @@ security_policy-monitor_mail_00005 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId6} ${monitor_mail_objectId7} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId6} ${monitor_mail_objectId7} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -170,7 +170,7 @@ security_policy-monitor_mail_00006 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${from_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -179,7 +179,7 @@ security_policy-monitor_mail_00006 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId8} ${monitor_mail_objectId9} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId8} ${monitor_mail_objectId9} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -199,7 +199,7 @@ security_policy-monitor_mail_00007 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -208,7 +208,7 @@ security_policy-monitor_mail_00007 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId10} ${monitor_mail_objectId11} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId10} ${monitor_mail_objectId11} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -228,7 +228,7 @@ security_policy-monitor_mail_00008 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -237,7 +237,7 @@ security_policy-monitor_mail_00008 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId12} ${monitor_mail_objectId37} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId12} ${monitor_mail_objectId37} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -257,7 +257,7 @@ security_policy-monitor_mail_00009 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -266,7 +266,7 @@ security_policy-monitor_mail_00009 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId14} ${monitor_mail_objectId15} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId14} ${monitor_mail_objectId15} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -286,7 +286,7 @@ security_policy-monitor_mail_00010 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -295,7 +295,7 @@ security_policy-monitor_mail_00010 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId16} ${monitor_mail_objectId17} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId16} ${monitor_mail_objectId17} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -315,7 +315,7 @@ security_policy-monitor_mail_00011 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -324,7 +324,7 @@ security_policy-monitor_mail_00011 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId18} ${monitor_mail_objectId19} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId18} ${monitor_mail_objectId19} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -344,7 +344,7 @@ security_policy-monitor_mail_00012 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -353,7 +353,7 @@ security_policy-monitor_mail_00012 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId20} ${monitor_mail_objectId21} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId20} ${monitor_mail_objectId21} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -373,7 +373,7 @@ security_policy-monitor_mail_00013 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -382,7 +382,7 @@ security_policy-monitor_mail_00013 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId22} ${monitor_mail_objectId23} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId22} ${monitor_mail_objectId23} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -402,7 +402,7 @@ security_policy-monitor_mail_00014 ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 - ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${subscriberid} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${subject_id} ${account_id} ${app_id} ${ipsource} ${ipdestination} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -411,7 +411,7 @@ security_policy-monitor_mail_00014 # 打印检查结果 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId24} ${monitor_mail_objectId25} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId24} ${monitor_mail_objectId25} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} @@ -436,7 +436,7 @@ security_policy-monitor_mail_00015 ${app_id} Create Dictionary attributeType=string attributeName=app_id protocol=mail attributeValue={"string": "${MAIL_VID}"} # 合成attributes字典集 ${attributes} Create List ${subject_id} ${content_id} ${att_content_id} ${from_id} ${to_id} ${app_id} ${ipsource} ${ipdestination} - ... ${subscriberid} ${account_id} ${imsi_id} ${phone_number_id} ${apn_id} + ... ${account_id} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -446,7 +446,7 @@ security_policy-monitor_mail_00015 # 将 策略id 加入对象 id ${objectid_verify} set variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${monitor_mail_objectId26} ${monitor_mail_objectId27} ${monitor_mail_objectId28} - ... ${monitor_mail_objectId29} ${monitor_mail_objectId30} ${monitor_mail_objectId31} ${testImsiId} ${testPhoneNumId} ${testApnId} + ... ${monitor_mail_objectId29} ${monitor_mail_objectId30} ${monitor_mail_objectId31} #sleep 5 # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 ${ok} VerifyProxy ${resData} ${objectid_verify} diff --git a/case/multi_step/b_nmonitor_ssl_tests.robot b/case/multi_step/b_nmonitor_ssl_tests.robot index 76509bd..ff6b590 100644 --- a/case/multi_step/b_nmonitor_ssl_tests.robot +++ b/case/multi_step/b_nmonitor_ssl_tests.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -31,14 +31,14 @@ security_policy_monitor_ssl_00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${sni} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_ssl_objectId4} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_ssl_objectId4} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -61,14 +61,14 @@ security_policy_monitor_ssl_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni} ${cn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${sni} ${cn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_ssl_objectId7} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_ssl_objectId7} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -91,7 +91,7 @@ security_policy_monitor_ssl_00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni2} ${sni1} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${sni2} ${sni1} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} @@ -99,7 +99,7 @@ security_policy_monitor_ssl_00003 ${state} GetVerifyState ${resData} ${monitor_ssl_policyId2} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -123,14 +123,14 @@ security_policy_monitor_ssl_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${sni} ${cn} ${san} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${sni} ${cn} ${san} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_ssl_objectId6} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_ssl_objectId6} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_nmonitor_tests.robot b/case/multi_step/b_nmonitor_tests.robot index ab64d9e..66f1d1f 100644 --- a/case/multi_step/b_nmonitor_tests.robot +++ b/case/multi_step/b_nmonitor_tests.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Test Cases *** proxy-policy-monitor_00001 @@ -27,14 +27,14 @@ proxy-policy-monitor_00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} ${rescode} ${resData} VerifyPolicies ${verifyList} # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId47} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId47} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -56,7 +56,7 @@ proxy-policy-monitor_00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -65,7 +65,7 @@ proxy-policy-monitor_00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId1} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId1} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -90,7 +90,7 @@ proxy-policy-monitor_00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -99,7 +99,7 @@ proxy-policy-monitor_00004 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId48} ${monitor_objectId49} ${monitor_objectId50} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId48} ${monitor_objectId49} ${monitor_objectId50} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -123,7 +123,7 @@ proxy-policy-monitor_00005 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -132,7 +132,7 @@ proxy-policy-monitor_00005 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId7} ${monitor_objectId8} ${monitor_objectId9} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId7} ${monitor_objectId8} ${monitor_objectId9} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -156,7 +156,7 @@ proxy-policy-monitor_00006 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -165,7 +165,7 @@ proxy-policy-monitor_00006 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId11} ${monitor_objectId12} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId11} ${monitor_objectId12} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -189,7 +189,7 @@ proxy-policy-monitor_00007 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -198,7 +198,7 @@ proxy-policy-monitor_00007 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId14} ${monitor_objectId15} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId14} ${monitor_objectId15} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -222,7 +222,7 @@ proxy-policy-monitor_00008 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -231,7 +231,7 @@ proxy-policy-monitor_00008 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId52} ${monitor_objectId53} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId52} ${monitor_objectId53} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -255,7 +255,7 @@ proxy-policy-monitor_00009 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -264,7 +264,7 @@ proxy-policy-monitor_00009 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId19} ${monitor_objectId20} ${monitor_objectId21} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId19} ${monitor_objectId20} ${monitor_objectId21} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -288,7 +288,7 @@ proxy-policy-monitor_00010 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -297,7 +297,7 @@ proxy-policy-monitor_00010 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId22} ${monitor_objectId23} ${monitor_objectId24} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId22} ${monitor_objectId23} ${monitor_objectId24} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -321,7 +321,7 @@ proxy-policy-monitor_00011 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -330,7 +330,7 @@ proxy-policy-monitor_00011 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId25} ${monitor_objectId26} ${monitor_objectId27} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${monitor_objectId25} ${monitor_objectId26} ${monitor_objectId27} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_redirect_tests.robot b/case/multi_step/b_redirect_tests.robot index 7d38fba..5139e75 100644 --- a/case/multi_step/b_redirect_tests.robot +++ b/case/multi_step/b_redirect_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp proxy_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** proxy_policy_redirect_00001 diff --git a/case/multi_step/b_replace_tests.robot b/case/multi_step/b_replace_tests.robot index 3b9fd01..4adb15b 100644 --- a/case/multi_step/b_replace_tests.robot +++ b/case/multi_step/b_replace_tests.robot @@ -1,12 +1,12 @@ *** Settings *** Force Tags tsg_adc_wp proxy_policy adc_verify Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt *** Test Cases *** proxy_policy_replace_00001 diff --git a/case/multi_step/b_sip_verify_tests.robot b/case/multi_step/b_sip_verify_tests.robot index 9993e3d..32652a9 100644 --- a/case/multi_step/b_sip_verify_tests.robot +++ b/case/multi_step/b_sip_verify_tests.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../keyword/common/customlibrary/Library/VerifyPolicy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/keyword/common/customlibrary/Library/VerifyPolicy.py *** Variables *** ${url} /v1/policy/profile/trustedcacertobj diff --git a/case/multi_step/b_sredirect_tests_verify.robot b/case/multi_step/b_sredirect_tests_verify.robot index 13157cc..ef18864 100644 --- a/case/multi_step/b_sredirect_tests_verify.robot +++ b/case/multi_step/b_sredirect_tests_verify.robot @@ -5,14 +5,14 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} @@ -32,7 +32,7 @@ Proxy-Policy-redirect-00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -40,7 +40,7 @@ Proxy-Policy-redirect-00001 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId49} ${redirect_objectId44} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} + # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -62,7 +62,7 @@ Proxy-Policy-redirect-00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${fqdn} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${fqdn} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -71,7 +71,7 @@ Proxy-Policy-redirect-00002 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId50} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId50} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -99,8 +99,8 @@ Proxy-Policy-redirect-00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} - ... ${url1} ${url2} ${url3} ${url4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} + ... ${url1} ${url2} ${url3} ${url4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -109,7 +109,7 @@ Proxy-Policy-redirect-00003 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId2} ${redirect_objectId3} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId2} ${redirect_objectId3} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -131,7 +131,7 @@ Proxy-Policy-redirect-00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -141,7 +141,6 @@ Proxy-Policy-redirect-00004 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId5} ${redirect_objectId51} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -165,7 +164,7 @@ Proxy-Policy-redirect-00005 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -174,7 +173,7 @@ Proxy-Policy-redirect-00005 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId7} ${redirect_objectId8} ${redirect_objectId9} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId7} ${redirect_objectId8} ${redirect_objectId9} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -197,7 +196,7 @@ Proxy-Policy-redirect-00006 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -206,7 +205,7 @@ Proxy-Policy-redirect-00006 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId10} ${redirect_objectId11} ${redirect_objectId12} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId10} ${redirect_objectId11} ${redirect_objectId12} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -229,7 +228,7 @@ Proxy-Policy-redirect-00007 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -239,7 +238,7 @@ Proxy-Policy-redirect-00007 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId13} ${redirect_objectId14} ${redirect_objectId15} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} + # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -261,7 +260,7 @@ Proxy-Policy-redirect-00008 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -270,7 +269,7 @@ Proxy-Policy-redirect-00008 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId17} ${redirect_objectId52} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId17} ${redirect_objectId52} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -293,7 +292,7 @@ Proxy-Policy-redirect-00009 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -302,7 +301,7 @@ Proxy-Policy-redirect-00009 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId19} ${redirect_objectId20} ${redirect_objectId21} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId19} ${redirect_objectId20} ${redirect_objectId21} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -326,7 +325,7 @@ Proxy-Policy-redirect-00011 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -336,7 +335,7 @@ Proxy-Policy-redirect-00011 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId25} ${redirect_objectId26} ${redirect_objectId27} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} + # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -357,7 +356,7 @@ Proxy-Policy-redirect-00012 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${imsi_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${imsi_id} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -367,7 +366,6 @@ Proxy-Policy-redirect-00012 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId28} ${redirect_objectId29} ${redirect_objectId30} - ... ${testImsiId} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -399,8 +397,8 @@ Proxy-Policy-redirect-00013 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} - ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} + ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -410,7 +408,6 @@ Proxy-Policy-redirect-00013 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId31} ${redirect_objectId32} ${redirect_objectId46} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -435,7 +432,7 @@ Proxy-Policy-redirect-00016 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${imsi_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${imsi_id} ... ${phone_number_id} ${apn_id} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} @@ -446,7 +443,6 @@ Proxy-Policy-redirect-00016 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${redirect_objectId40} ${redirect_objectId41} ${redirect_objectId42} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_sreplace_tests_verify.robot b/case/multi_step/b_sreplace_tests_verify.robot index 1044934..230f0e4 100644 --- a/case/multi_step/b_sreplace_tests_verify.robot +++ b/case/multi_step/b_sreplace_tests_verify.robot @@ -5,13 +5,13 @@ Library OperatingSystem Library Collections Library json Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../keyword/policys/process_policy_body.robot -Resource ../../other/all_flow_case_variable.txt -Library ../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/policys/process_policy_body.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Library ${EXECDIR}/customlib/verify_policy.py *** Test Cases *** Proxy-Policy-replace-00001 @@ -28,7 +28,7 @@ Proxy-Policy-replace-00001 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -36,7 +36,7 @@ Proxy-Policy-replace-00001 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId39} ${replace_objectId43} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} + # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -58,7 +58,7 @@ Proxy-Policy-replace-00002 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -91,7 +91,7 @@ Proxy-Policy-replace-00003 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url1} ${url2} ${url3} ${url4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url1} ${url2} ${url3} ${url4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -100,7 +100,7 @@ Proxy-Policy-replace-00003 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId3} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId3} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -122,7 +122,7 @@ Proxy-Policy-replace-00004 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -131,7 +131,7 @@ Proxy-Policy-replace-00004 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId5} ${replace_objectId45} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId5} ${replace_objectId45} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -154,7 +154,7 @@ Proxy-Policy-replace-00005 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -163,7 +163,7 @@ Proxy-Policy-replace-00005 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId7} ${replace_objectId8} ${replace_objectId9} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId7} ${replace_objectId8} ${replace_objectId9} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -186,7 +186,7 @@ Proxy-Policy-replace-00006 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -195,7 +195,7 @@ Proxy-Policy-replace-00006 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId10} ${replace_objectId11} ${replace_objectId12} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId10} ${replace_objectId11} ${replace_objectId12} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -218,7 +218,7 @@ Proxy-Policy-replace-00007 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ua} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -227,7 +227,7 @@ Proxy-Policy-replace-00007 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId13} ${replace_objectId14} ${replace_objectId15} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId13} ${replace_objectId14} ${replace_objectId15} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -249,7 +249,7 @@ Proxy-Policy-replace-00008 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -258,7 +258,7 @@ Proxy-Policy-replace-00008 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId17} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId17} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -281,7 +281,7 @@ Proxy-Policy-replace-00009 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -291,7 +291,6 @@ Proxy-Policy-replace-00009 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId19} ${replace_objectId20} ${replace_objectId21} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -316,7 +315,7 @@ Proxy-Policy-replace-00011 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -325,7 +324,7 @@ Proxy-Policy-replace-00011 Should Be Equal As Strings ${state} True # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} - ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId26} ${replace_objectId27} ${testImsiId} ${testPhoneNumId} ${testApnId} + ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId26} ${replace_objectId27} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -348,7 +347,7 @@ Proxy-Policy-replace-00012 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -358,7 +357,6 @@ Proxy-Policy-replace-00012 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId28} ${replace_objectId29} ${replace_objectId30} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -390,8 +388,8 @@ Proxy-Policy-replace-00013 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} - ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn1} ${fqdn2} ${fqdn3} ${fqdn4} ${url1} ${url2} ${url3} ${url4} + ... ${res_hdr_sc1} ${res_hdr_sc2} ${res_hdr_sc3} ${res_hdr_sc4} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -401,7 +399,6 @@ Proxy-Policy-replace-00013 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId31} ${replace_objectId32} ${replace_objectId41} - ... ${testImsiId} ${testPhoneNumId} ${testApnId} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) @@ -427,8 +424,8 @@ Proxy-Policy-replace-00014 ${ipsource} Create Dictionary attributeType=ip attributeName=source attributeValue={"ip":"${testClentIP}","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_SOURCE_ADDR"} ${ipdestination} Create Dictionary attributeType=ip attributeName=destination attributeValue={"ip":"254.253.252.251","port":"1","addrType":4,"protocol":"6","tableName":"TSG_SECURITY_DESTINATION_ADDR"} # 合成attributes字典集 - ${attributes} Create List ${app_id} ${subscriberid} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${req_hdr_ua} - ... ${res_hdr_ct} ${imsi_id} ${phone_number_id} ${apn_id} + ${attributes} Create List ${app_id} ${ipsource} ${ipdestination} ${fqdn} ${url} ${req_hdr_ck} ${res_hdr_sc} ${req_hdr_ua} + ... ${res_hdr_ct} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=pxy_manipulation verifySession=${verifySession} log ${verifyList} @@ -438,7 +435,7 @@ Proxy-Policy-replace-00014 # 打印检查结果 ${objectid_verify} Set Variable ${testClentIpId} ${objectid_verify} Catenate SEPARATOR=, ${objectid_verify} ${replace_objectId33} ${replace_objectId34} ${replace_objectId35} ${replace_objectId36} - ... ${replace_objectId37} ${replace_objectId38} ${testImsiId} ${testPhoneNumId} ${testApnId} + ... ${replace_objectId37} ${replace_objectId38} # # 调用关键字 提取应答json获取其中所有的id值，并判断新下发的id值是否在应答json的id中 log ${objectid_verify} ${testType} Evaluate type($objectid_verify) diff --git a/case/multi_step/b_z_endtime.robot b/case/multi_step/b_z_endtime.robot index f3c3f00..aa66a25 100644 --- a/case/multi_step/b_z_endtime.robot +++ b/case/multi_step/b_z_endtime.robot @@ -2,12 +2,16 @@ Force Tags tsg_adc_wp endtime Library OperatingSystem Library DateTime -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot *** Test Cases *** endtime Sleep ${policyLogVerificationSleepSeconds}s - ${endtime} Get Current Date UTC exclude_millis=True + # ${endtime} Get Current Date UTC exclude_millis=True + # ${endtime} Get Time + ${isUTC} Evaluate ${tsgVersion}>=22.03 + ${endtime} Run Keyword If "${isUTC}"=="True" Get Current Date UTC exclude_millis=True + ... ELSE Get Time InsertStartTimeToFile endtime ${endtime} diff --git a/case/multi_step/c_allow_http_tests.robot b/case/multi_step/c_allow_http_tests.robot index b2c3039..2de47eb 100644 --- a/case/multi_step/c_allow_http_tests.robot +++ b/case/multi_step/c_allow_http_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} @@ -18,7 +18,7 @@ ${categoryIds} ${EMPTY} *** Test Cases *** security_policy_allow_http-00001 #log ${allow_http_policyId1} - #删除对象 + # 删除对象 ${objectids} set Variable ${allow_http_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId2} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId3} @@ -27,7 +27,7 @@ security_policy_allow_http-00001 #删除category ${categoryIds} set Variable ${allow_http_categoryId} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId}],"vsysId":1} ${s} Convert to String ${allow_http_policyId} log ${endtime} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.cri.cn @@ -40,14 +40,14 @@ security_policy_allow_http-00002 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId7} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId8} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId1}],"vsysId":1} ${s} Convert to String ${allow_http_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host scoutbahamas GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.xiang5.com security_policy_allow_http-00003 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId2}],"vsysId":1} ${s} Convert to String ${allow_http_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host scoutbahamas @@ -56,7 +56,7 @@ security_policy_allow_http-00004 ${objectids} set Variable ${allow_http_objectId9} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_http_objectId10} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_http_policyId3}],"vsysId":1} ${s} Convert to String ${allow_http_policyId3} GetLogList1 security_event ${starttime} ${endtime} 10.10.10.57 ${s} http_host 10.10.10.158 diff --git a/case/multi_step/c_allow_https_tests.robot b/case/multi_step/c_allow_https_tests.robot index e44ab2c..10683b9 100644 --- a/case/multi_step/c_allow_https_tests.robot +++ b/case/multi_step/c_allow_https_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -17,7 +17,7 @@ ${categoryIds} ${EMPTY} *** Test Cases *** security_policy_allow_https_00001 #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_https_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_https_policyId}],"vsysId":1} ${s} Convert to String ${allow_https_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni hongshu.com diff --git a/case/multi_step/c_allow_rtp_tests.robot b/case/multi_step/c_allow_rtp_tests.robot index d94bf96..47a3909 100644 --- a/case/multi_step/c_allow_rtp_tests.robot +++ b/case/multi_step/c_allow_rtp_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -18,53 +18,53 @@ ${objectids} ${EMPTY} security_policy_allow_rtp_00001 ${objectids} set Variable ${allow_rtp_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_rtp_objectId9} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_rtp_00002 ${objectids} set Variable ${allow_rtp_objectId} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId1}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId1} security_policy_allow_rtp_00003 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId2}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId2} security_policy_allow_rtp_00004 ${objectids} set Variable ${allow_rtp_objectId1} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId3}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId3} security_policy_allow_rtp_00005 ${objectids} set Variable ${allow_rtp_objectId2} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId4}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId4} security_policy_allow_rtp_00006 ${objectids} set Variable ${allow_rtp_objectId3} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId5}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId5} security_policy_allow_rtp_00007 ${objectids} set Variable ${allow_rtp_objectId4} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId6}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId6} security_policy_allow_rtp_00008 ${objectids} set Variable ${allow_rtp_objectId5} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId7}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId7} security_policy_allow_rtp_00009 ${objectids} set Variable ${allow_rtp_objectId6} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId8}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId8} security_policy_allow_rtp_000010 #删除对象 ${objectids} set Variable ${allow_rtp_objectId7} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId9}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_rtp_policyId9}],"vsysId":1} ${s} Convert to String ${allow_rtp_policyId9} diff --git a/case/multi_step/c_allow_sip_tests.robot b/case/multi_step/c_allow_sip_tests.robot index 261e8b4..eb08a21 100644 --- a/case/multi_step/c_allow_sip_tests.robot +++ b/case/multi_step/c_allow_sip_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -20,7 +20,7 @@ security_policy_allow_sip_00001 ${objectids} set Variable ${allow_sip_objectId} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId1} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_from test1 @@ -30,7 +30,7 @@ security_policy_allow_sip_00001-1 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId31} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId38} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId16}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId16}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId16} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_from test102 @@ -40,7 +40,7 @@ security_policy_allow_sip_00001-2 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId33} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId39} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId17}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId17}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId17} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_to test6 @@ -50,7 +50,7 @@ security_policy_allow_sip_00001-3 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId35} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId40} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId18}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId18}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId18} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_from test104 @@ -60,7 +60,7 @@ security_policy_allow_sip_00001-4 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId37} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId41} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId19}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId19}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId19} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_from test8 @@ -69,7 +69,7 @@ security_policy_allow_sip_00002 ${objectids} set Variable ${allow_sip_objectId0209} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId1201} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId11}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId11}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId11} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_to test4 @@ -80,67 +80,67 @@ security_policy_allow_sip_000012 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId22} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId23} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId1}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId1} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_00003 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId2}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId2} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_00004 ${objectids} set Variable ${allow_sip_objectId401} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId3}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId3} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_00005 ${objectids} set Variable ${allow_sip_objectId2} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId4}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId4} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_00006 ${objectids} set Variable ${allow_sip_objectId3} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId5}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId5} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_00007 ${objectids} set Variable ${allow_sip_objectId4} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId6}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId6} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_00008 ${objectids} set Variable ${allow_sip_objectId5} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId7}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId7} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_00009 ${objectids} set Variable ${allow_sip_objectId6} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId8}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId8} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_000010 ${objectids} set Variable ${allow_sip_objectId7} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId9}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId9}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId9} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_000011 ${objectids} set Variable ${allow_sip_objectId8} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId10}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId10}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId10} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_00003 ${objectids} set Variable ${allow_sip_objectId9} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId0301} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId0301}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId0301}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId0301} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} voip_calling_account test4 @@ -149,7 +149,7 @@ security_policy_allow_sip_000013 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId12} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId12}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId12}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId12} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow @@ -159,12 +159,12 @@ security_policy_allow_sip_000014 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId15} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_sip_objectId16} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId13}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId13}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId13} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow security_policy_allow_sip_000015 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId14}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId14}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId14} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow @@ -176,7 +176,7 @@ security_policy_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_policyId15}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_sip_policyId15}],"vsysId":1} ${s} Convert to String ${allow_sip_policyId15} #GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action allow diff --git a/case/multi_step/c_allow_ssh_tests.robot b/case/multi_step/c_allow_ssh_tests.robot index dee6083..f793a8c 100644 --- a/case/multi_step/c_allow_ssh_tests.robot +++ b/case/multi_step/c_allow_ssh_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -17,7 +17,7 @@ ${categoryIds} ${EMPTY} *** Test Cases *** security_policy_allow_ssh_00001 #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssh_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssh_policyId}],"vsysId":1} ${s} Convert to String ${allow_ssh_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} common_server_ip ${host} diff --git a/case/multi_step/c_allow_ssl_tests.robot b/case/multi_step/c_allow_ssl_tests.robot index 149da60..e346b94 100644 --- a/case/multi_step/c_allow_ssl_tests.robot +++ b/case/multi_step/c_allow_ssl_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -21,7 +21,7 @@ security_policy_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}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId}],"vsysId":1} ${s} Convert to String ${allow_ssl_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni homebank.kz @@ -32,13 +32,13 @@ security_policy_allow_ssl_00002 #删除category ${categoryIds} set Variable ${allow_ssl_categoryId} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId1}],"vsysId":1} ${s} Convert to String ${allow_ssl_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni protomail.com GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni xinyue.qq.com security_policy_allow_ssl_00003 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId2}],"vsysId":1} ${s} Convert to String ${allow_ssl_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni protonmail.com @@ -46,6 +46,6 @@ security_policy_allow_ssl_00004 #删除对象 ${objectids} set Variable ${allow_ssl_objectId4} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${allow_ssl_policyId3}],"vsysId":1} ${s} Convert to String ${allow_ssl_policyId3} GetLogList1 security_event ${starttime} ${endtime} 10.10.10.57 ${s} common_server_ip 10.10.10.158
\ No newline at end of file diff --git a/case/multi_step/c_allow_tests.robot b/case/multi_step/c_allow_tests.robot index 85b474e..474a555 100644 --- a/case/multi_step/c_allow_tests.robot +++ b/case/multi_step/c_allow_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -23,8 +23,8 @@ proxy_policy_allow_00001 #删除category ${categoryIds} set Variable ${allow_categoryId} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host mp.pipix.com @@ -33,8 +33,8 @@ proxy_policy_allow_00002 #删除对象 ${objectids} set Variable ${allow_objectId1} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId1}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId1}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId1}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId1}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId1} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host feishu.cn @@ -44,8 +44,8 @@ proxy_policy_allow_00003 ${objectids} set Variable ${allow_objectId2} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId3} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId2},${deny_quic_allow_policyId}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId2}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId2},${deny_quic_allow_policyId}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId2}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId2} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host csgo500 @@ -60,8 +60,8 @@ proxy_policy_allow_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId40} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId41} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId3}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId3}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId3}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId3}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId3} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host hao123 @@ -72,8 +72,8 @@ proxy_policy_allow_00005 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId9} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId4}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId4}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId4}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId4}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId4} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host boutiquehotel.me @@ -84,8 +84,8 @@ proxy_policy_allow_00006 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId12} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId5}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId5}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId5}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId5}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId5} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.choicehotels.com @@ -96,8 +96,8 @@ proxy_policy_allow_00007 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId15} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId6}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId6}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId6}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId6}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId6} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.woodsnap.com @@ -108,8 +108,8 @@ proxy_policy_allow_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId17} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId18} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId7}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId7}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId7}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId7}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId7} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host sse.com.cn @@ -120,8 +120,8 @@ proxy_policy_allow_00009 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId21} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId8}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId8}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId8}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId8}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId8} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host szse.cn @@ -132,8 +132,8 @@ proxy_policy_allow_00010 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId23} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId24} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId9}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId9}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId9}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId9}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId9} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host gf.com.cn @@ -145,8 +145,8 @@ proxy_policy_allow_00011 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId27} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId42} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId10}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId10}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId10}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId10}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId10} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host chinastock.com.cn @@ -157,8 +157,8 @@ proxy_policy_allow_00012 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId29} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId30} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId11}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId11}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId11}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId11}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId11} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.virtuoso.com @@ -171,8 +171,8 @@ proxy_policy_allow_00013 ${objectids} set Variable ${allow_objectId31} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId32} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId12}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId12}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId12}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId12}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId12} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host russia.payu.com @@ -189,8 +189,8 @@ proxy_policy_allow_00014 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId37} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId38} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId13}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId13}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId13}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId13}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId13} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.orbitz.com @@ -202,8 +202,8 @@ proxy_policy_allow_00015 ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId45} ${objectids} Catenate SEPARATOR=, ${objectids} ${allow_objectId46} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId14},${deny_quic_allow_policyId1}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId14}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_allow_policyId14},${deny_quic_allow_policyId1}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${allow_policyId14}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${allow_policyId14} # GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host csgo500 diff --git a/case/multi_step/c_deny_dns_tests.robot b/case/multi_step/c_deny_dns_tests.robot index a2f4133..4a3e3fd 100644 --- a/case/multi_step/c_deny_dns_tests.robot +++ b/case/multi_step/c_deny_dns_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -23,7 +23,7 @@ security_policy_deny_dns_00001 #删除category ${categoryIds} set Variable ${deny_dns_categoryId} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId}],"vsysId":1} ${s} Convert to String ${deny_dns_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname facebook.com GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname rutube.ru @@ -32,7 +32,7 @@ security_policy_deny_dns_00002 #删除对象 ${objectids} set Variable ${deny_dns_objectId1} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId1}],"vsysId":1} ${s} Convert to String ${deny_dns_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.arctictrucks.ru GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname wifika.ru @@ -41,7 +41,7 @@ security_policy_deny_dns_00003 #删除对象 ${objectids} set Variable ${deny_dns_objectId2} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId2}],"vsysId":1} ${s} Convert to String ${deny_dns_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname aec188.com @@ -50,7 +50,7 @@ security_policy_deny_dns_00004 ${objectids} set Variable ${deny_dns_objectId5} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_dns_objectId3} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId3}],"vsysId":1} ${s} Convert to String ${deny_dns_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.twitch.tv @@ -62,13 +62,13 @@ security_policy_deny_dns_00006 #删除对象 ${objectids} set Variable ${deny_dns_objectId6} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId5}],"vsysId":1} ${s} Convert to String ${deny_dns_policyId5} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.twitch.tv security_policy_deny_dns_00007 #删除对象 ${objectids} set Variable ${deny_dns_objectId7} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_dns_policyId6}],"vsysId":1} ${s} Convert to String ${deny_dns_policyId6} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.twitch.tv
\ No newline at end of file diff --git a/case/multi_step/c_deny_ftp_tests.robot b/case/multi_step/c_deny_ftp_tests.robot index 7716da9..854cac7 100644 --- a/case/multi_step/c_deny_ftp_tests.robot +++ b/case/multi_step/c_deny_ftp_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -45,7 +45,7 @@ security_policy_deny_ftp_00003 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId7} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId8} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId2}],"vsysId":1} ${s} Convert to String ${deny_ftp_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser @@ -55,7 +55,7 @@ security_policy_deny_ftp_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId10} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId11} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId3}],"vsysId":1} ${s} Convert to String ${deny_ftp_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser @@ -69,7 +69,7 @@ security_policy_deny_ftp_00006 ${objectids} set Variable ${deny_ftp_objectId16} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId17} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId5}],"vsysId":1} ${s} Convert to String ${deny_ftp_policyId5} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser @@ -78,7 +78,7 @@ security_policy_deny_ftp_00007 ${objectids} set Variable ${deny_ftp_objectId18} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_ftp_objectId19} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ftp_policyId6}],"vsysId":1} ${s} Convert to String ${deny_ftp_policyId6} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser diff --git a/case/multi_step/c_deny_http_tests.robot b/case/multi_step/c_deny_http_tests.robot index e91496d..3c56c33 100644 --- a/case/multi_step/c_deny_http_tests.robot +++ b/case/multi_step/c_deny_http_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -34,7 +34,7 @@ security_policy_deny_http_00002 #删除对象 ${objectids} set Variable ${deny_http_objectId1} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId1}],"vsysId":1} ${s} Convert to String ${deny_http_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host bellaircraftmuseum.org @@ -44,7 +44,7 @@ security_policy_deny_http_00003 #删除对象 ${objectids} set Variable ${deny_http_objectId2} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId2}],"vsysId":1} ${s} Convert to String ${deny_http_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.icbc.com.cn GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host ccb.com @@ -58,7 +58,7 @@ security_policy_deny_http_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId37} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId38} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId3}],"vsysId":1} ${s} Convert to String ${deny_http_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host tsutmb.ru @@ -67,7 +67,7 @@ security_policy_deny_http_00005 ${objectids} set Variable ${deny_http_objectId5} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId6} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId4}],"vsysId":1} ${s} Convert to String ${deny_http_policyId4} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host abchina.com @@ -76,7 +76,7 @@ security_policy_deny_http_00006 ${objectids} set Variable ${deny_http_objectId7} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId8} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId5}],"vsysId":1} ${s} Convert to String ${deny_http_policyId5} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host egypt.travel @@ -87,7 +87,7 @@ security_policy_deny_http_00007 ${objectids} set Variable ${deny_http_objectId9} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId10} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId6}],"vsysId":1} ${s} Convert to String ${deny_http_policyId6} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.gw.com.cn @@ -97,7 +97,7 @@ security_policy_deny_http_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId12} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId39} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId7}],"vsysId":1} ${s} Convert to String ${deny_http_policyId7} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host cmbchina.com @@ -132,7 +132,7 @@ security_policy_deny_http_00012 #删除对象 ${objectids} set Variable ${deny_http_objectId19} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId11}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId11}],"vsysId":1} ${s} Convert to String ${deny_http_policyId11} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.universalmusic.ru @@ -173,7 +173,7 @@ security_policy_deny_http_00016 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId27} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId15}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId15}],"vsysId":1} ${s} Convert to String ${deny_http_policyId15} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -204,16 +204,16 @@ security_policy_deny_http_00016 # ${s} Convert to String ${deny_http_policyId18} # GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.hebbank.com -# security_policy_deny_http_00020 - # #删除对象 - # ${objectids} set Variable ${deny_http_objectId42} - # ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId43} - # ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId44} - # ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId45} - # #删除策略 - # ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId19}]} - # ${s} Convert to String ${deny_http_policyId19} - # GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.xinhuanet.com +security_policy_deny_http_00020 + #删除对象 + ${objectids} set Variable ${deny_http_objectId42} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId43} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId44} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_http_objectId45} + #删除策略 + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId19}],"vsysId":1} + ${s} Convert to String ${deny_http_policyId19} + GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.xinhuanet.com # security_policy_deny_http_00021 # #删除对象 @@ -228,7 +228,7 @@ security_policy_deny_http_00022 #删除对象 ${objectids} set Variable ${deny_http_objectId49} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId21}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId21}],"vsysId":1} ${s} Convert to String ${deny_http_policyId21} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host v.baidu.com @@ -236,7 +236,7 @@ security_policy_deny_http_00023 #删除对象 ${objectids} set Variable ${deny_http_objectId50} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId22}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_http_policyId22}],"vsysId":1} ${s} Convert to String ${deny_http_policyId22} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host yp136.com
\ No newline at end of file diff --git a/case/multi_step/c_deny_https_tests.robot b/case/multi_step/c_deny_https_tests.robot index 77c3743..78987cb 100644 --- a/case/multi_step/c_deny_https_tests.robot +++ b/case/multi_step/c_deny_https_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -17,7 +17,7 @@ ${categoryIds} ${EMPTY} *** Test Cases *** security_policy_deny_https_00001 #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_https_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_https_policyId}],"vsysId":1} ${s} Convert to String ${deny_https_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni writer.muyewx.com diff --git a/case/multi_step/c_deny_mail_test.robot b/case/multi_step/c_deny_mail_test.robot index b2869f5..aa85aed 100644 --- a/case/multi_step/c_deny_mail_test.robot +++ b/case/multi_step/c_deny_mail_test.robot @@ -2,28 +2,25 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} *** Test Cases *** -# security_policy_deny_mail_00001 - # #删除对象 - # ${objectids} set Variable ${deny_mail_objectId} - # ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId32} - # ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId33} - # #删除策略 - # ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId}]} - # ${s} Convert to String ${deny_mail_policyId} - # GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} +security_policy_deny_mail_00001 + #删除对象 + ${objectids} set Variable ${deny_mail_objectId} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId32} + ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId33} + #删除策略 # security_policy_deny_mail_00002 # #删除对象 @@ -42,7 +39,7 @@ security_policy_deny_mail_00003 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId35} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId36} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId2}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -51,7 +48,7 @@ security_policy_deny_mail_00004 ${objectids} set Variable ${deny_mail_objectId4} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId5} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId3}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -60,7 +57,7 @@ security_policy_deny_mail_00005 ${objectids} set Variable ${deny_mail_objectId6} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId7} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId4}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId4} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -69,7 +66,7 @@ security_policy_deny_mail_00006 ${objectids} set Variable ${deny_mail_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId9} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId5}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId5} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -78,7 +75,7 @@ security_policy_deny_mail_00007 ${objectids} set Variable ${deny_mail_objectId10} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId11} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId6}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId6} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -87,7 +84,7 @@ security_policy_deny_mail_00008 ${objectids} set Variable ${deny_mail_objectId12} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId13} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId7}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId7} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -96,7 +93,7 @@ security_policy_deny_mail_00009 ${objectids} set Variable ${deny_mail_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId15} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId8}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId8} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -105,7 +102,7 @@ security_policy_deny_mail_00010 ${objectids} set Variable ${deny_mail_objectId16} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId17} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId9}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId9}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId9} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -114,7 +111,7 @@ security_policy_deny_mail_00011 ${objectids} set Variable ${deny_mail_objectId18} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId19} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId10}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId10}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId10} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -123,7 +120,7 @@ security_policy_deny_mail_00012 ${objectids} set Variable ${deny_mail_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId21} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId11}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId11}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId11} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -132,7 +129,7 @@ security_policy_deny_mail_00013 ${objectids} set Variable ${deny_mail_objectId22} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId23} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId12}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId12}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId12} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -141,7 +138,7 @@ security_policy_deny_mail_00014 ${objectids} set Variable ${deny_mail_objectId24} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId25} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId13}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId13}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId13} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -154,7 +151,7 @@ security_policy_deny_mail_00015 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId30} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId31} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId14}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId14}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId14} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -169,7 +166,7 @@ security_policy_deny_mail_00017 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId38} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId40} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId16}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId16}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId16} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -178,7 +175,7 @@ security_policy_deny_mail_00018 ${objectids} set Variable ${deny_mail_objectId41} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId42} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId17}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId17}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId17} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} @@ -187,7 +184,7 @@ security_policy_deny_mail_00019 ${objectids} set Variable ${deny_mail_objectId43} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_mail_objectId44} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId18}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_mail_policyId18}],"vsysId":1} ${s} Convert to String ${deny_mail_policyId18} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailAccount} diff --git a/case/multi_step/c_deny_rtp_tests.robot b/case/multi_step/c_deny_rtp_tests.robot index a87c506..8c9d338 100644 --- a/case/multi_step/c_deny_rtp_tests.robot +++ b/case/multi_step/c_deny_rtp_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -18,53 +18,53 @@ ${objectids} ${EMPTY} security_policy_deny_rtp_00001 ${objectids} set Variable ${deny_rtp_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_rtp_objectId9} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action deny security_policy_deny_rtp_00002 ${objectids} set Variable ${deny_rtp_objectId} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId1}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId1} security_policy_deny_rtp_00003 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId2}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId2} security_policy_deny_rtp_00004 ${objectids} set Variable ${deny_rtp_objectId1} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId3}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId3} security_policy_deny_rtp_00005 ${objectids} set Variable ${deny_rtp_objectId2} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId4}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId4} security_policy_deny_rtp_00006 ${objectids} set Variable ${deny_rtp_objectId3} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId5}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId5} security_policy_deny_rtp_00007 ${objectids} set Variable ${deny_rtp_objectId4} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId6}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId6} security_policy_deny_rtp_00008 ${objectids} set Variable ${deny_rtp_objectId5} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId7}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId7} security_policy_deny_rtp_00009 ${objectids} set Variable ${deny_rtp_objectId6} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId8}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId8} security_policy_deny_rtp_000010 #删除对象 ${objectids} set Variable ${deny_rtp_objectId7} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId9}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_rtp_policyId9}],"vsysId":1} ${s} Convert to String ${deny_rtp_policyId9} diff --git a/case/multi_step/c_deny_sip_tests.robot b/case/multi_step/c_deny_sip_tests.robot index c5c119c..e2ad53b 100644 --- a/case/multi_step/c_deny_sip_tests.robot +++ b/case/multi_step/c_deny_sip_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -18,14 +18,14 @@ ${objectids} ${EMPTY} security_policy_deny_sip_00001 ${objectids} set Variable ${deny_sip_objectId38} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId39} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_from test112 security_policy_deny_sip_00001-1 ${objectids} set Variable ${deny_sip_objectId40} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId41} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId24}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId24}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId24} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_to test16 @@ -33,7 +33,7 @@ security_policy_deny_sip_00001-2 ${objectids} set Variable ${deny_sip_objectId42} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId43} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId44} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId25}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId25}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId25} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_from test114 @@ -41,7 +41,7 @@ security_policy_deny_sip_00001-3 ${objectids} set Variable ${deny_sip_objectId45} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId46} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId47} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId26}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId26}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId26} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} sip_to test18 @@ -49,88 +49,88 @@ security_policy_deny_sip_00001-4 ${objectids} set Variable ${deny_sip_objectId48} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId49} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId50} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId27}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId27}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId27} security_policy_deny_sip_00001-5 ${objectids} set Variable ${deny_sip_objectId51} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId52} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId53} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId28}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId28}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId28} security_policy_deny_sip_00002 ${objectids} set Variable ${deny_sip_objectId} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId1}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId1} security_policy_deny_sip_00003 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId2}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId2} security_policy_deny_sip_00004 ${objectids} set Variable ${deny_sip_objectId1} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId3}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId3} security_policy_deny_sip_00005 ${objectids} set Variable ${deny_sip_objectId2} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId4}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId4} security_policy_deny_sip_00006 ${objectids} set Variable ${deny_sip_objectId3} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId5}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId5} security_policy_deny_sip_00007 ${objectids} set Variable ${deny_sip_objectId4} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId6}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId6} security_policy_deny_sip_00008 ${objectids} set Variable ${deny_sip_objectId5} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId7}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId7} security_policy_deny_sip_00009 ${objectids} set Variable ${deny_sip_objectId6} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId8}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId8} security_policy_deny_sip_000010 ${objectids} set Variable ${deny_sip_objectId7} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId9}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId9}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId9} security_policy_deny_sip_000011 ${objectids} set Variable ${deny_sip_objectId8} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId10}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId10}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId10} security_policy_deny_sip_000012 ${objectids} set Variable ${deny_sip_objectId9} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId11}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId11}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId11} security_policy_deny_sip_000013 ${objectids} set Variable ${deny_sip_objectId10} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId12}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId12}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId12} security_policy_deny_sip_000014 ${objectids} set Variable ${deny_sip_objectId11} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId13}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId13}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId13} security_policy_deny_sip_000015 ${objectids} set Variable ${deny_sip_objectId12} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId14}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId14}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId14} security_policy_deny_sip_000016 ${objectids} set Variable ${deny_sip_objectId13} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId15}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId15}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId15} security_policy_deny_sip_000017 @@ -138,7 +138,7 @@ security_policy_deny_sip_000017 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId15} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId1501} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId16}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId16}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId16} security_policy_deny_sip_000018 @@ -146,7 +146,7 @@ security_policy_deny_sip_000018 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId1601} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId17} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId17}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId17}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId17} security_policy_deny_sip_000019 @@ -154,7 +154,7 @@ security_policy_deny_sip_000019 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId1801} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId19} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId18}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId18}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId18} security_policy_deny_sip_000020 @@ -163,7 +163,7 @@ security_policy_deny_sip_000020 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId22} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId23} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId19}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId19}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId19} security_policy_deny_sip_000021 @@ -172,7 +172,7 @@ security_policy_deny_sip_000021 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId27} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId20}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId20}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId20} security_policy_deny_sip_000022 @@ -181,11 +181,11 @@ security_policy_deny_sip_000022 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId30} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId31} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId21}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId21}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId21} security_policy_deny_sip_000023 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId22}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId22}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId22} security_policy_deny_sip_000024 @@ -196,7 +196,7 @@ security_policy_deny_sip_000024 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId36} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId37} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId23}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId23}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId23} security_policy_deny_sip_000025 @@ -207,7 +207,7 @@ security_policy_deny_sip_000025 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId42} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId43} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId24}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId24}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId24} security_policy_deny_sip_000026 @@ -218,7 +218,7 @@ security_policy_deny_sip_000026 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId48} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_sip_objectId49} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId25}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_sip_policyId25}],"vsysId":1} ${s} Convert to String ${deny_sip_policyId25} diff --git a/case/multi_step/c_deny_ssh_tests.robot b/case/multi_step/c_deny_ssh_tests.robot index db88bf4..fa8938d 100644 --- a/case/multi_step/c_deny_ssh_tests.robot +++ b/case/multi_step/c_deny_ssh_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -17,7 +17,7 @@ ${categoryIds} ${EMPTY} *** Test Cases *** security_policy_deny_ssh_00001 #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssh_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssh_policyId}],"vsysId":1} ${s} Convert to String ${deny_ssh_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} common_server_ip ${host} #21.11 diff --git a/case/multi_step/c_deny_ssl_tests.robot b/case/multi_step/c_deny_ssl_tests.robot index adf71e1..957c671 100644 --- a/case/multi_step/c_deny_ssl_tests.robot +++ b/case/multi_step/c_deny_ssl_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -24,7 +24,7 @@ security_policy_deny_ssl_00001 #删除category ${categoryIds} set Variable ${deny_ssl_categoryId} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId}],"vsysId":1} ${s} Convert to String ${deny_ssl_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni freestockimages.ru GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni cxwl.com @@ -33,18 +33,18 @@ security_policy_deny_ssl_00002 #删除对象 ${objectids} set Variable ${deny_ssl_objectId1} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId1}],"vsysId":1} ${s} Convert to String ${deny_ssl_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni amesweb.info GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni rentar -# security_policy_deny_ssl_00003 - # #删除对象 - # ${objectids} set Variable ${deny_ssl_objectId2} - # #删除策略 - # ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId2}]} - # ${s} Convert to String ${deny_ssl_policyId2} - # GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni austinama.org +security_policy_deny_ssl_00003 + #删除对象 + ${objectids} set Variable ${deny_ssl_objectId2} + #删除策略 + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId2}],"vsysId":1} + ${s} Convert to String ${deny_ssl_policyId2} + GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni austinama.org # security_policy_deny_ssl_00004 # #删除对象 @@ -80,7 +80,7 @@ security_policy_deny_ssl_00008 #删除对象 ${objectids} set Variable ${deny_ssl_objectId9} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId7}],"vsysId":1} ${s} Convert to String ${deny_ssl_policyId7} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.romzhijia.net @@ -88,6 +88,6 @@ security_policy_deny_ssl_00009 #删除对象 ${objectids} set Variable ${deny_ssl_objectId10} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${deny_ssl_policyId8}],"vsysId":1} ${s} Convert to String ${deny_ssl_policyId8} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.hupu.com diff --git a/case/multi_step/c_deny_tests.robot b/case/multi_step/c_deny_tests.robot index af4971c..dd60c59 100644 --- a/case/multi_step/c_deny_tests.robot +++ b/case/multi_step/c_deny_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -26,8 +26,8 @@ proxy_policy-deny_00001 #删除category ${categoryIds} set Variable ${deny_categoryId} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host newsela.com @@ -38,8 +38,8 @@ proxy_policy-deny_00002 #删除对象 ${objectids} set Variable ${deny_objectId1} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId1}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId1}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId1}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId1}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId1} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host youku.com @@ -51,8 +51,8 @@ proxy_policy-deny_00003 ${objectids} set Variable ${deny_objectId2} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId3} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId2}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId2}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId2}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId2}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId2} # GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host myamber.ae @@ -69,8 +69,8 @@ proxy_policy-deny_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId49} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId50} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId3}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId3}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId3}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId3}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId3} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.usdebtclock.org @@ -82,8 +82,8 @@ proxy_policy-deny_00005 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId9} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId4}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId4}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId4}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId4}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId4} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host americantesol.com @@ -94,8 +94,8 @@ proxy_policy-deny_00006 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId12} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId5}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId5}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId5}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId5}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId5} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.playgroundsessions.com @@ -106,8 +106,8 @@ proxy_policy-deny_00007 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId15} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId6}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId6}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId6}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId6}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId6} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host peoplestalkradio.com @@ -123,8 +123,8 @@ proxy_policy-deny_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId52} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId53} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId7}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId7}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId7}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId7}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId7} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.6renyou.com @@ -138,8 +138,8 @@ proxy_policy-deny_00009 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId21} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId8}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId8}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId8}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId8}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId8} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.cuctv.com @@ -152,8 +152,8 @@ proxy_policy-deny_00010 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId23} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId24} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId9}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId9}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId9}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId9}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId9} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.duckduckmoose.com @@ -166,8 +166,8 @@ proxy_policy-deny_00011 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId27} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId10}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId10}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId10}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId10}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId10} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host tutcandy.com @@ -178,8 +178,8 @@ proxy_policy-deny_00012 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId29} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId30} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId11}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId11}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId11}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId11}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId11} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.oracle.com @@ -190,8 +190,8 @@ proxy_policy-deny_00013 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId32} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId46} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId12}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId12}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId12}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId12}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId12} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.nypl.org @@ -205,8 +205,8 @@ proxy_policy-deny_00014 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId34} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId54} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId13}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId13}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId13}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId13}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId13} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -216,7 +216,7 @@ proxy_policy-deny_00015 ${objectids} set Variable ${deny_objectId35} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId55} #删除策略 - ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${deny_policyId14}]} + ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${deny_policyId14}],"vsysId":1} ${s} Convert to String ${deny_policyId14} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -227,8 +227,8 @@ proxy_policy-deny_00016 ${objectids} set Variable ${deny_objectId47} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId58} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId15}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId17}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId15}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId17}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId17} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.stewart.com @@ -241,7 +241,7 @@ proxy_policy-deny_00017 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId39} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId40} #删除策略 - ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${deny_policyId15}]} + ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${deny_policyId15}],"vsysId":1} ${s} Convert to String ${deny_policyId15} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -253,8 +253,8 @@ proxy_policy-deny_00018 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId44} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId45} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId14}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId16}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId14}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId16}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId16} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.umusicpub.com @@ -267,8 +267,8 @@ proxy_policy-deny_00019 ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId63} ${objectids} Catenate SEPARATOR=, ${objectids} ${deny_objectId64} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId18}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId18}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_deny_policyId18}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${deny_policyId18}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${deny_policyId18} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.cndns.com diff --git a/case/multi_step/c_hijack_tests.robot b/case/multi_step/c_hijack_tests.robot index 572a9d1..3600961 100644 --- a/case/multi_step/c_hijack_tests.robot +++ b/case/multi_step/c_hijack_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -29,8 +29,8 @@ proxy_policy_hijack_00001 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId42} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId43} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host vator.tv @@ -42,8 +42,8 @@ proxy_policy_hijack_00002 ${objectids} set Variable ${hijack_objectId1} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId40} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId1}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId1}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId1}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId1}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId1} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.uqur.cn @@ -55,8 +55,8 @@ proxy_policy_hijack_00003 ${objectids} set Variable ${hijack_objectId2} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId3} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId2}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId2}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId2}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId2}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId2} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.lexus.ru @@ -74,8 +74,8 @@ proxy_policy_hijack_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId44} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId45} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId3}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId3}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId3}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId3}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId3} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host huoshan.com @@ -88,8 +88,8 @@ proxy_policy_hijack_00005 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId9} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId4}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId4}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId4}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId4}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId4} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.ixigua.com @@ -102,8 +102,8 @@ proxy_policy_hijack_00006 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId12} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId5}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId5}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId5}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId5}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId5} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.dcdapp.com @@ -116,8 +116,8 @@ proxy_policy_hijack_00007 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId15} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId6}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId6}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId6}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId6}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId6} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.gogokid.com.cn @@ -131,8 +131,8 @@ proxy_policy_hijack_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId18} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId46} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId7}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId7}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId7}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId7}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId7} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host mafengwo.cn @@ -145,8 +145,8 @@ proxy_policy_hijack_00009 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId21} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId8}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId8}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId8}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId8}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId8} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host quote.hexun.com @@ -159,8 +159,8 @@ proxy_policy_hijack_00010 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId23} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId24} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId9}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId9}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId9}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId9}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId9} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host chaxun.1616.net @@ -173,8 +173,8 @@ proxy_policy_hijack_00011 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId27} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId10}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId10}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId10}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId10}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId10} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.airwargame.com @@ -187,8 +187,8 @@ proxy_policy_hijack_00012 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId29} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId30} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId11}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId11}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId11}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId11}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId11} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.reval.com @@ -201,8 +201,8 @@ proxy_policy_hijack_00013 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId32} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId41} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId12}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId12}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId12}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId12}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId12} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host nsscreencast.com @@ -221,8 +221,8 @@ proxy_policy_hijack_00014 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId37} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId38} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId13}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId13}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId13}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId13}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId13} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.travelzoo.com @@ -237,8 +237,8 @@ proxy_policy_hijack_00015 ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId50} ${objectids} Catenate SEPARATOR=, ${objectids} ${hijack_objectId51} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId14}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId14}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_hijack_policyId14}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${hijack_policyId14}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${hijack_policyId14} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host tengrinews.kz diff --git a/case/multi_step/c_insert_tests.robot b/case/multi_step/c_insert_tests.robot index 653eca5..cfe67d8 100644 --- a/case/multi_step/c_insert_tests.robot +++ b/case/multi_step/c_insert_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -29,8 +29,8 @@ proxy_policy_insert_00001 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId41} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId42} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.costcotravel.com @@ -42,8 +42,8 @@ proxy_policy_insert_00002 ${objectids} set Variable ${insert_objectId1} ${objectids} Catenate SEPARATOR=, ${insert_objectId40} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId1}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId1}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId1}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId1}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId1} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host meilleurmobile @@ -55,8 +55,8 @@ proxy_policy_insert_00003 ${objectids} set Variable ${insert_objectId2} ${objectids} Catenate SEPARATOR=, ${insert_objectId3} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId2}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId2}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId2}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId2}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId2} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host scottsdalepublicart @@ -74,8 +74,8 @@ proxy_policy_insert_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId43} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId44} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId3}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId3}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId3}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId3}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId3} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host viator.com @@ -88,8 +88,8 @@ proxy_policy_insert_00005 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId9} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId4}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId4}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId4}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId4}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId4} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host matadornetwork.com @@ -102,8 +102,8 @@ proxy_policy_insert_00006 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId12} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId5}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId5}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId5}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId5}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId5} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.farecompare.com @@ -116,8 +116,8 @@ proxy_policy_insert_00007 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId15} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId6}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId6}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId6}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId6}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId6} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.tripit.com @@ -131,8 +131,8 @@ proxy_policy_insert_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId18} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId45} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId7}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId7}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId7}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId7}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId7} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host waikikibeachwalk.com @@ -145,8 +145,8 @@ proxy_policy_insert_00009 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId21} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId8}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId8}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId8}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId8}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId8} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host guides.com @@ -159,8 +159,8 @@ proxy_policy_insert_00010 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId23} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId24} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId9}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId9}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId9}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId9}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId9} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host cnstock.com @@ -173,8 +173,8 @@ proxy_policy_insert_00011 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId27} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId10}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId10}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId10}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId10}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId10} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host newone.com.cn @@ -187,8 +187,8 @@ proxy_policy_insert_00012 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId29} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId30} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId11}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId11}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId11}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId11}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId11} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host petapixel.com @@ -204,8 +204,8 @@ proxy_policy_insert_00013 ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId37} ${objectids} Catenate SEPARATOR=, ${objectids} ${insert_objectId38} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId13}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId13}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_insert_policyId13}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${insert_policyId13}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${insert_policyId13} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.intervalworld.com diff --git a/case/multi_step/c_intercept_http_tests.robot b/case/multi_step/c_intercept_http_tests.robot index a66401e..7bbff75 100644 --- a/case/multi_step/c_intercept_http_tests.robot +++ b/case/multi_step/c_intercept_http_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -23,7 +23,7 @@ security_policy_intercept_http_00001 #删除category ${categoryIds} set Variable ${intercept_http_categoryId} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId}],"vsysId":1} ${s} Convert to String ${intercept_http_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host yumi.com @@ -31,7 +31,7 @@ security_policy_intercept_http_00002 #删除对象 ${objectids} set Variable ${intercept_http_objectId6} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId1}],"vsysId":1} ${s} Convert to String ${intercept_http_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host trekkingworld.com @@ -39,7 +39,7 @@ security_policy_intercept_http_00003 #删除对象 ${objectids} set Variable ${intercept_http_objectId2} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId2}],"vsysId":1} ${s} Convert to String ${intercept_http_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -48,7 +48,7 @@ security_policy_intercept_http_00004 ${objectids} set Variable ${intercept_http_objectId4} ${objectids} Catenate SEPARATOR=, ${objectids} ${intercept_http_objectId5} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId3}],"vsysId":1} ${s} Convert to String ${intercept_http_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host zongheng.com @@ -56,5 +56,5 @@ security_policy_intercept_http_00005 #删除对象 ${objectids} set Variable ${intercept_http_objectId7} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_http_policyId4}],"vsysId":1} ${s} Convert to String ${intercept_http_policyId4}
\ No newline at end of file diff --git a/case/multi_step/c_intercept_ssl_tests.robot b/case/multi_step/c_intercept_ssl_tests.robot index 854ada3..7b568c4 100644 --- a/case/multi_step/c_intercept_ssl_tests.robot +++ b/case/multi_step/c_intercept_ssl_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -22,7 +22,7 @@ security_policy_intercept_ssl_00001 #删除category ${categoryIds} set Variable ${intercept_ssl_categoryId} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId}],"vsysId":1} ${s} Convert to String ${intercept_ssl_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.reviewpro.com @@ -30,7 +30,7 @@ security_policy_intercept_ssl_00002 #删除对象 ${objectids} set Variable ${intercept_ssl_objectId2} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId1}],"vsysId":1} ${s} Convert to String ${intercept_ssl_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni fenopy.se @@ -39,7 +39,7 @@ security_policy_intercept_ssl_00003 ${objectids} set Variable ${intercept_ssl_objectId3} ${objectids} Catenate SEPARATOR=, ${objectids} ${intercept_ssl_objectId4} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId2}],"vsysId":1} ${s} Convert to String ${intercept_ssl_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni xs8 @@ -47,7 +47,7 @@ security_policy_intercept_ssl_00004 #删除对象 ${objectids} set Variable ${intercept_ssl_objectId5} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId3}],"vsysId":1} ${s} Convert to String ${intercept_ssl_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni worldweapon.info @@ -55,6 +55,6 @@ security_policy_intercept_ssl_00005 #删除对象 ${objectids} set Variable ${intercept_ssl_objectId6} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${intercept_ssl_policyId4}],"vsysId":1} ${s} Convert to String ${intercept_ssl_policyId4} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} common_server_ip 10.10.10.158
\ No newline at end of file diff --git a/case/multi_step/c_monitor_dns_tests.robot b/case/multi_step/c_monitor_dns_tests.robot index 6b0b8dd..ac94e94 100644 --- a/case/multi_step/c_monitor_dns_tests.robot +++ b/case/multi_step/c_monitor_dns_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -21,7 +21,7 @@ security_policy_monitor_dns_00001 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_dns_objectId1} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_dns_objectId2} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId}],"vsysId":1} ${s} Convert to String ${monitor_dns_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname travelgam.com GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname flyaurora.ru @@ -32,7 +32,7 @@ security_policy_monitor_dns_00002 #删除category ${categoryIds} set Variable ${monitor_dns_categoryId} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId1}],"vsysId":1} ${s} Convert to String ${monitor_dns_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.ohotniki.ru GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.slmmm.com @@ -41,13 +41,13 @@ security_policy_monitor_dns_00003 #删除对象 ${objectids} set Variable ${monitor_dns_objectId3} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId2}],"vsysId":1} ${s} Convert to String ${monitor_dns_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname www.u17.com security_policy_monitor_dns_00004 #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_dns_policyId3}],"vsysId":1} ${s} Convert to String ${monitor_dns_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} dns_qname travelgam.com diff --git a/case/multi_step/c_monitor_ftp_tests.robot b/case/multi_step/c_monitor_ftp_tests.robot index f3c14ad..1e27e56 100644 --- a/case/multi_step/c_monitor_ftp_tests.robot +++ b/case/multi_step/c_monitor_ftp_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -25,7 +25,7 @@ security_policy_monitor_ftp_00001 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId15} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId}],"vsysId":1} ${s} Convert to String ${monitor_ftp_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser @@ -35,7 +35,7 @@ security_policy_monitor_ftp_00002 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId4} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId5} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId1}],"vsysId":1} ${s} Convert to String ${monitor_ftp_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser @@ -45,7 +45,7 @@ security_policy_monitor_ftp_00003 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId7} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId8} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId2}],"vsysId":1} ${s} Convert to String ${monitor_ftp_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser @@ -55,7 +55,7 @@ security_policy_monitor_ftp_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId10} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ftp_objectId11} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ftp_policyId3}],"vsysId":1} ${s} Convert to String ${monitor_ftp_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ftp_account ftpuser diff --git a/case/multi_step/c_monitor_http_tests.robot b/case/multi_step/c_monitor_http_tests.robot index f9b6a9c..7042a01 100644 --- a/case/multi_step/c_monitor_http_tests.robot +++ b/case/multi_step/c_monitor_http_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -23,7 +23,7 @@ security_policy_monitor_http_00001 #删除category ${categoryIds} set Variable ${monitor_http_categoryId} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.jrj.com.cn @@ -31,7 +31,7 @@ security_policy_monitor_http_00002 #删除对象 ${objectids} set Variable ${monitor_http_objectId1} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId1}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host fitzhughmedia.com @@ -39,7 +39,7 @@ security_policy_monitor_http_00003 #删除对象 ${objectids} set Variable ${monitor_http_objectId2} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId2}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host hkbchina.com GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host baby.ru @@ -53,7 +53,7 @@ security_policy_monitor_http_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId35} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId36} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId3}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host quotes.info @@ -62,7 +62,7 @@ security_policy_monitor_http_00005 ${objectids} set Variable ${monitor_http_objectId5} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId6} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId4}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId4} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host chinahr.com @@ -71,7 +71,7 @@ security_policy_monitor_http_00006 ${objectids} set Variable ${monitor_http_objectId7} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId8} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId5}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId5} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host licaike.hexun.com @@ -80,7 +80,7 @@ security_policy_monitor_http_00007 ${objectids} set Variable ${monitor_http_objectId9} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId10} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId6}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId6} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host 95195.com @@ -90,7 +90,7 @@ security_policy_monitor_http_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId12} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId37} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId7}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId7} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.tccb.com.cn @@ -99,7 +99,7 @@ security_policy_monitor_http_00009 ${objectids} set Variable ${monitor_http_objectId13} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId14} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId8}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId8} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.athinline.org @@ -108,7 +108,7 @@ security_policy_monitor_http_00010 ${objectids} set Variable ${monitor_http_objectId15} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId16} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId9}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId9}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId9} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host videogix.com @@ -117,7 +117,7 @@ security_policy_monitor_http_00011 ${objectids} set Variable ${monitor_http_objectId17} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId18} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId10}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId10}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId10} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host emi-ors.com @@ -126,7 +126,7 @@ security_policy_monitor_http_00012 ${objectids} set Variable ${monitor_http_objectId19} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId45} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId11}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId11}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId11} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.titter.com @@ -134,7 +134,7 @@ security_policy_monitor_http_00013 #删除对象 ${objectids} set Variable ${monitor_http_objectId20} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId12}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId12}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId12} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.spore.com GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.dianping.com @@ -146,7 +146,7 @@ security_policy_monitor_http_00014 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId38} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId40} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId13}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId13}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId13} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -155,7 +155,7 @@ security_policy_monitor_http_00015 ${objectids} set Variable ${monitor_http_objectId22} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId39} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId14}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId14}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId14} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.dyhjw.com @@ -167,7 +167,7 @@ security_policy_monitor_http_00016 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId27} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId15}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId15}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId15} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -179,7 +179,7 @@ security_policy_monitor_http_00017 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId31} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId32} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId16}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId16}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId16} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.airwargame.com @@ -199,7 +199,7 @@ security_policy_monitor_http_00019 ${objectids} set Variable ${monitor_http_objectId46} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_http_objectId47} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId18}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_http_policyId18}],"vsysId":1} ${s} Convert to String ${monitor_http_policyId18} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} http_host 10.10.10.158 diff --git a/case/multi_step/c_monitor_https_tests.robot b/case/multi_step/c_monitor_https_tests.robot index 4150ecf..8858d39 100644 --- a/case/multi_step/c_monitor_https_tests.robot +++ b/case/multi_step/c_monitor_https_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -17,7 +17,7 @@ ${categoryIds} ${EMPTY} *** Test Cases *** security_policy_monitor_https_00001 #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_https_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_https_policyId}],"vsysId":1} ${s} Convert to String ${monitor_https_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.php.com diff --git a/case/multi_step/c_monitor_mail_tests.robot b/case/multi_step/c_monitor_mail_tests.robot index 7cee88c..795665c 100644 --- a/case/multi_step/c_monitor_mail_tests.robot +++ b/case/multi_step/c_monitor_mail_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -21,7 +21,7 @@ security_policy-monitor_mail_00001 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId32} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId33} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -30,7 +30,7 @@ security_policy-monitor_mail_00002 ${objectids} set Variable ${monitor_mail_objectId1} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId34} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId1}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -41,7 +41,7 @@ security_policy-monitor_mail_00003 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId35} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId36} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId2}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -50,7 +50,7 @@ security_policy-monitor_mail_00004 ${objectids} set Variable ${monitor_mail_objectId4} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId5} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId3}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -59,7 +59,7 @@ security_policy-monitor_mail_00005 ${objectids} set Variable ${monitor_mail_objectId6} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId7} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId4}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId4} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -68,7 +68,7 @@ security_policy-monitor_mail_00006 ${objectids} set Variable ${monitor_mail_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId9} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId5}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId5} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -77,7 +77,7 @@ security_policy-monitor_mail_00007 ${objectids} set Variable ${monitor_mail_objectId10} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId11} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId6}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId6} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -87,7 +87,7 @@ security_policy-monitor_mail_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId13} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId37} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId7}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId7} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -96,7 +96,7 @@ security_policy-monitor_mail_00009 ${objectids} set Variable ${monitor_mail_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId15} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId8}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId8} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -105,7 +105,7 @@ security_policy-monitor_mail_00010 ${objectids} set Variable ${monitor_mail_objectId16} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId17} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId9}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId9}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId9} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -114,7 +114,7 @@ security_policy-monitor_mail_00011 ${objectids} set Variable ${monitor_mail_objectId18} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId19} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId10}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId10}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId10} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -123,7 +123,7 @@ security_policy-monitor_mail_00012 ${objectids} set Variable ${monitor_mail_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId21} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId11}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId11}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId11} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -132,7 +132,7 @@ security_policy-monitor_mail_00013 ${objectids} set Variable ${monitor_mail_objectId22} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId23} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId12}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId12}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId12} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -141,7 +141,7 @@ security_policy-monitor_mail_00014 ${objectids} set Variable ${monitor_mail_objectId24} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId25} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId13}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId13}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId13} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -154,7 +154,7 @@ security_policy-monitor_mail_00015 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId30} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId31} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId14}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId14}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId14} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} @@ -164,6 +164,6 @@ security_policy-monitor_mail_00016 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId39} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_mail_objectId40} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId15}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_mail_policyId15}],"vsysId":1} ${s} Convert to String ${monitor_mail_policyId15} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} mail_account ${mailqqAccount} diff --git a/case/multi_step/c_monitor_rtp_tests.robot b/case/multi_step/c_monitor_rtp_tests.robot index 51709cb..2814040 100644 --- a/case/multi_step/c_monitor_rtp_tests.robot +++ b/case/multi_step/c_monitor_rtp_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -18,53 +18,53 @@ ${objectids} ${EMPTY} security_policy_monitor_rtp_00001 ${objectids} set Variable ${monitor_rtp_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_rtp_objectId9} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId} GetLogList1 security_event ${starttime} ${endtime} ${voipCallIp} ${s} common_action monitor security_policy_monitor_rtp_00002 ${objectids} set Variable ${monitor_rtp_objectId} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId1}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId1} security_policy_monitor_rtp_00003 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId2}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId2} security_policy_monitor_rtp_00004 ${objectids} set Variable ${monitor_rtp_objectId1} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId3}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId3} security_policy_monitor_rtp_00005 ${objectids} set Variable ${monitor_rtp_objectId2} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId4}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId4} security_policy_monitor_rtp_00006 ${objectids} set Variable ${monitor_rtp_objectId3} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId5}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId5} security_policy_monitor_rtp_00007 ${objectids} set Variable ${monitor_rtp_objectId4} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId6}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId6} security_policy_monitor_rtp_00008 ${objectids} set Variable ${monitor_rtp_objectId5} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId7}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId7} security_policy_monitor_rtp_00009 ${objectids} set Variable ${monitor_rtp_objectId6} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId8}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId8} security_policy_monitor_rtp_000010 #删除对象 ${objectids} set Variable ${monitor_rtp_objectId7} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId9}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_rtp_policyId9}],"vsysId":1} ${s} Convert to String ${monitor_rtp_policyId9} diff --git a/case/multi_step/c_monitor_sip_tests.robot b/case/multi_step/c_monitor_sip_tests.robot index 2888c26..46c0199 100644 --- a/case/multi_step/c_monitor_sip_tests.robot +++ b/case/multi_step/c_monitor_sip_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -18,96 +18,96 @@ ${objectids} ${EMPTY} security_policy_monitor_sip_00001 ${objectids} set Variable ${monitor_sip_objectId23} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId24} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId} security_policy_monitor_sip_00001-1 ${objectids} set Variable ${monitor_sip_objectId25} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId26} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId17}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId17}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId17} security_policy_monitor_sip_00001-2 ${objectids} set Variable ${monitor_sip_objectId27} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId28} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId29} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId18}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId18}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId18} security_policy_monitor_sip_00001-3 ${objectids} set Variable ${monitor_sip_objectId31} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId30} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId32} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId19}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId19}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId19} security_policy_monitor_sip_00001-4 ${objectids} set Variable ${monitor_sip_objectId34} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId35} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId36} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId20}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId20}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId20} security_policy_monitor_sip_00001-5 ${objectids} set Variable ${monitor_sip_objectId37} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId38} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId39} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId21}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId21}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId21} security_policy_monitor_sip_00002 ${objectids} set Variable ${monitor_sip_objectId} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId1}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId1} security_policy_monitor_sip_00003 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId2}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId2} security_policy_monitor_sip_00004 ${objectids} set Variable ${monitor_sip_objectId1} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId3}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId3} security_policy_monitor_sip_00005 ${objectids} set Variable ${monitor_sip_objectId2} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId4}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId4} security_policy_monitor_sip_00006 ${objectids} set Variable ${monitor_sip_objectId3} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId5}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId5}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId5} security_policy_monitor_sip_00007 ${objectids} set Variable ${monitor_sip_objectId4} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId6}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId6}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId6} security_policy_monitor_sip_00008 ${objectids} set Variable ${monitor_sip_objectId5} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId7}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId7}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId7} security_policy_monitor_sip_00009 ${objectids} set Variable ${monitor_sip_objectId6} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId8}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId8}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId8} security_policy_monitor_sip_000010 ${objectids} set Variable ${monitor_sip_objectId7} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId9}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId9}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId9} security_policy_monitor_sip_000011 ${objectids} set Variable ${monitor_sip_objectId8} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId10}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId10}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId10} security_policy_monitor_sip_000012 ${objectids} set Variable ${monitor_sip_objectId9} - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId11}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId11}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId11} security_policy_monitor_sip_000013 @@ -115,7 +115,7 @@ security_policy_monitor_sip_000013 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId12} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId12}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId12}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId12} security_policy_monitor_sip_000014 @@ -124,11 +124,11 @@ security_policy_monitor_sip_000014 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId15} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId16} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId13}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId13}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId13} security_policy_monitor_sip_000015 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId14}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId14}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId14} security_policy_monitor_sip_000016 @@ -139,5 +139,5 @@ security_policy_monitor_sip_000016 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId21} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_sip_objectId22} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId15}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_sip_policyId15}],"vsysId":1} ${s} Convert to String ${monitor_sip_policyId15} diff --git a/case/multi_step/c_monitor_smtps_tests.robot b/case/multi_step/c_monitor_smtps_tests.robot new file mode 100644 index 0000000..bb732a0 --- /dev/null +++ b/case/multi_step/c_monitor_smtps_tests.robot @@ -0,0 +1,26 @@ +*** Settings *** +Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} +Force Tags tsg_adc_wp adc_log security_policy +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${policyIds} ${EMPTY} +${objectids} ${EMPTY} +${categoryIds} ${EMPTY} +*** Test Cases *** +security_policy_monitor_smtps_00001 + #删除策略 + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_smtps_policyId}],"vsysId":1} + ${s} Convert to String ${monitor_smtps_policyId} + GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_cn 163.com + + + + diff --git a/case/multi_step/c_monitor_ssh_tests.robot b/case/multi_step/c_monitor_ssh_tests.robot index 6ab83bf..89802b6 100644 --- a/case/multi_step/c_monitor_ssh_tests.robot +++ b/case/multi_step/c_monitor_ssh_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -17,7 +17,7 @@ ${categoryIds} ${EMPTY} *** Test Cases *** security_policy_monitor_ssh_00001 #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssh_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssh_policyId}],"vsysId":1} ${s} Convert to String ${monitor_ssh_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} common_server_ip ${host} #21.11 diff --git a/case/multi_step/c_monitor_ssl_tests.robot b/case/multi_step/c_monitor_ssl_tests.robot index 68ce27a..6ffe2e8 100644 --- a/case/multi_step/c_monitor_ssl_tests.robot +++ b/case/multi_step/c_monitor_ssl_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} Force Tags tsg_adc_wp adc_log security_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -21,7 +21,7 @@ security_policy_monitor_ssl_00001 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ssl_objectId4} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ssl_objectId5} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId}],"vsysId":1} ${s} Convert to String ${monitor_ssl_policyId} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.wego.cn GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni freecountry.com @@ -31,7 +31,7 @@ security_policy_monitor_ssl_00002 ${objectids} set Variable ${monitor_ssl_objectId1} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ssl_objectId7} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId1}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId1}],"vsysId":1} ${s} Convert to String ${monitor_ssl_policyId1} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni keysnews.com @@ -39,7 +39,7 @@ security_policy_monitor_ssl_00003 #删除对象 ${objectids} set Variable ${monitor_ssl_objectId2} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId2}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId2}],"vsysId":1} ${s} Convert to String ${monitor_ssl_policyId2} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni www.academia.org @@ -48,7 +48,7 @@ security_policy_monitor_ssl_00004 ${objectids} set Variable ${monitor_ssl_objectId3} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_ssl_objectId6} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId3}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId3}],"vsysId":1} ${s} Convert to String ${monitor_ssl_policyId3} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_sni nerdreactor.com GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} ssl_san nerdreactor.com @@ -58,6 +58,6 @@ security_policy_monitor_ssl_00005 #删除对象 ${objectids} set Variable ${monitor_ssl_objectId8} #删除策略 - ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId4}]} + ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${monitor_ssl_policyId4}],"vsysId":1} ${s} Convert to String ${monitor_ssl_policyId4} GetLogList1 security_event ${starttime} ${endtime} ${testClentIP} ${s} common_server_ip 10.10.10.158
\ No newline at end of file diff --git a/case/multi_step/c_monitor_tests.robot b/case/multi_step/c_monitor_tests.robot index a3ac75e..3024134 100644 --- a/case/multi_step/c_monitor_tests.robot +++ b/case/multi_step/c_monitor_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -23,8 +23,8 @@ proxy-policy-monitor_00001 #删除category ${categoryIds} set Variable ${monitor_categoryId} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host tv.cctv.com @@ -34,8 +34,8 @@ proxy-policy-monitor_00002 #删除对象 ${objectids} set Variable ${monitor_objectId1} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId1}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId1}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId1}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId1}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId1} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.parkpennies.com @@ -45,8 +45,8 @@ proxy-policy-monitor_00003 ${objectids} set Variable ${monitor_objectId3} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId2} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId2}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId2}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId2}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId2}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId2} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.wmtransfer.com @@ -63,8 +63,8 @@ proxy-policy-monitor_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId49} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId50} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId3}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId3}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId3}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId3}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId3} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host v.qq.com @@ -76,8 +76,8 @@ proxy-policy-monitor_00005 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId9} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId4}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId4}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId4}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId4}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId4} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.mgtv.com @@ -88,8 +88,8 @@ proxy-policy-monitor_00006 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId12} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId5}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId5}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId5}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId5}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId5} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host v.ifeng.com @@ -100,8 +100,8 @@ proxy-policy-monitor_00007 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId15} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId6}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId6}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId6}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId6}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId6} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.pptv.com @@ -115,8 +115,8 @@ proxy-policy-monitor_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId52} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId53} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId7}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId7}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId7}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId7}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId7} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.zhenai.com @@ -128,8 +128,8 @@ proxy-policy-monitor_00009 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId21} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId8}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId8}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId8}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId8}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId8} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host v.iqilu.com @@ -140,8 +140,8 @@ proxy-policy-monitor_00010 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId23} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId24} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId9}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId9}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId9}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId9}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId9} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.fun.tv @@ -152,8 +152,8 @@ proxy-policy-monitor_00011 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId27} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId10}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId10}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId10}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId10}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId10} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host hongniang.com @@ -189,8 +189,8 @@ proxy-policy-monitor_00014 ${objectids} set Variable ${monitor_objectId33} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId34} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId13}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId13}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_monitor_policyId13}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId13}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${monitor_policyId13} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -199,7 +199,7 @@ proxy-policy-monitor_00015 #删除对象 ${objectids} set Variable ${monitor_objectId35} #删除策略 - ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId14}]} + ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId14}],"vsysId":1} ${s} Convert to String ${monitor_policyId14} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -211,7 +211,7 @@ proxy-policy-monitor_00016 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId44} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId45} #删除策略 - ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId16}]} + ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId16}],"vsysId":1} ${s} Convert to String ${monitor_policyId16} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -223,7 +223,7 @@ proxy-policy-monitor_00019 ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId39} ${objectids} Catenate SEPARATOR=, ${objectids} ${monitor_objectId40} #删除策略 - ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId15}]} + ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${monitor_policyId15}],"vsysId":1} ${s} Convert to String ${monitor_policyId15} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.cndns.com diff --git a/case/multi_step/c_redirect_tests.robot b/case/multi_step/c_redirect_tests.robot index e8d0150..e6c3643 100644 --- a/case/multi_step/c_redirect_tests.robot +++ b/case/multi_step/c_redirect_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -24,8 +24,8 @@ proxy_policy_redirect_00001 #删除category ${categoryIds} set Variable ${redirect_categoryId} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host tudou.com @@ -36,8 +36,8 @@ proxy_policy_redirect_00002 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId45} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId50} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId1}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId1}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId1}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId1}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId1} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host glazok.kz @@ -47,8 +47,8 @@ proxy_policy_redirect_00003 ${objectids} set Variable ${redirect_objectId2} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId3} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId2}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId2}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId2}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId2}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId2} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.deepin.org @@ -63,8 +63,8 @@ proxy_policy_redirect_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId6} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId51} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId3}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId3}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId3}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId3}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId3} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.merrilledge.com @@ -75,8 +75,8 @@ proxy_policy_redirect_00005 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId9} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId4}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId4}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId4}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId4}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId4} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.marketscreener.com @@ -87,8 +87,8 @@ proxy_policy_redirect_00006 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId12} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId5}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId5}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId5}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId5}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId5} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.dota2.com @@ -99,8 +99,8 @@ proxy_policy_redirect_00007 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId15} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId6}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId6}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId6}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId6}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId6} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.ufcu.org @@ -111,8 +111,8 @@ proxy_policy_redirect_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId17} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId18} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId7}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId7}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId7}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId7}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId7} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.essence.com.cn @@ -123,8 +123,8 @@ proxy_policy_redirect_00009 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId21} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId8}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId8}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId8}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId8}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId8} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.west95582.com @@ -135,8 +135,8 @@ proxy_policy_redirect_00010 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId23} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId24} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId9}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId9}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId9}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId9}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId9} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.chinahr.com @@ -147,8 +147,8 @@ proxy_policy_redirect_00011 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId27} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId10}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId10}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId10}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId10}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId10} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.cs.ecitic.com @@ -159,8 +159,8 @@ proxy_policy_redirect_00012 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId29} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId30} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId11}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId11}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId11}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId11}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId11} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.investors-trust.com @@ -171,8 +171,8 @@ proxy_policy_redirect_00013 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId32} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId46} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId12}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId12}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId12}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId12}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId12} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.monticello.org @@ -187,8 +187,8 @@ proxy_policy_redirect_00014 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId53} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId54} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId13}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId13}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId13}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId13}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId13} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -201,7 +201,7 @@ proxy_policy_redirect_00015 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId38} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId39} #删除策略 - ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId14}]} + ${policyIds} Create List {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId14}],"vsysId":1} ${s} Convert to String ${redirect_policyId14} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -212,8 +212,8 @@ proxy_policy_redirect_00016 ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId42} ${objectids} Catenate SEPARATOR=, ${objectids} ${redirect_objectId43} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId14}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId15}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_redirect_policyId14}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${redirect_policyId15}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${redirect_policyId15} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.equifax.com diff --git a/case/multi_step/c_replace_tests.robot b/case/multi_step/c_replace_tests.robot index be3e9cc..570e414 100644 --- a/case/multi_step/c_replace_tests.robot +++ b/case/multi_step/c_replace_tests.robot @@ -2,14 +2,14 @@ Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_log proxy_policy Library OperatingSystem -Resource ../../keyword/common/systemcommand.robot -Resource ../../keyword/common/log_variable.robot -Resource ../../keyword/common/file_operation.robot -Resource ../../keyword/objects/object.robot -Resource ../../keyword/policys/policy.robot -Resource ../../other/all_flow_case_variable.txt -Resource ../../other/all_flow_case_variable1.txt -Resource ../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/log_variable.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/other/all_flow_case_variable.txt +Resource ${EXECDIR}/other/all_flow_case_variable1.txt +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${policyIds} ${EMPTY} ${objectids} ${EMPTY} @@ -23,8 +23,8 @@ proxy_policy_replace_00001 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId42} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId43} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host destidotcom.wordpress.com @@ -37,8 +37,8 @@ proxy_policy_replace_00002 #删除category ${categoryIds} set Variable ${replace_categoryId} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId1}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId1}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId1}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId1}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId1} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host airastana.com @@ -48,8 +48,8 @@ proxy_policy_replace_00003 ${objectids} set Variable ${replace_objectId2} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId3} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId2}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId2}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId2}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId2}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId2} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.pjpugliese.com @@ -63,8 +63,8 @@ proxy_policy_replace_00004 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId6} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId45} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId3}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId3}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId3}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId3}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId3} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.ino.com @@ -75,8 +75,8 @@ proxy_policy_replace_00005 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId8} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId9} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId4}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId4}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId4}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId4}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId4} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.bestwestern.com @@ -87,8 +87,8 @@ proxy_policy_replace_00006 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId11} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId12} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId5}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId5}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId5}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId5}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId5} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.quickenloans.com @@ -99,8 +99,8 @@ proxy_policy_replace_00007 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId14} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId15} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId6}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId6}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId6}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId6}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId6} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.gobank.com @@ -112,8 +112,8 @@ proxy_policy_replace_00008 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId18} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId46} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId7}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId7}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId7}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId7}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId7} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.ghzq.com.cn @@ -124,8 +124,8 @@ proxy_policy_replace_00009 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId20} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId21} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId8}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId8}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId8}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId8}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId8} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.zcool.com.cn @@ -136,8 +136,8 @@ proxy_policy_replace_00010 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId23} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId47} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId9}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId9}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId9}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId9}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId9} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host open.node.com @@ -148,8 +148,8 @@ proxy_policy_replace_00011 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId26} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId27} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId10}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId10}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId10}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId10}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId10} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.shfe.com.cn @@ -160,8 +160,8 @@ proxy_policy_replace_00012 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId29} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId30} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId11}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId11}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId11}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId11}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId11} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.national-park.com @@ -172,8 +172,8 @@ proxy_policy_replace_00013 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId32} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId41} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId12}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId12}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId12}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId12}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId12} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.expedia.co.uk @@ -189,8 +189,8 @@ proxy_policy_replace_00014 ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId37} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId38} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId13}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId13}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId13}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId13}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId13} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.engadget.com @@ -200,8 +200,8 @@ proxy_policy_replace_00015 ${objectids} set Variable ${replace_objectId48} ${objectids} Catenate SEPARATOR=, ${objectids} ${replace_objectId49} #删除策略 - ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId14}]} - ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId14}]} + ${policyId1} set Variable {"policyType":"tsg_security","policyIds":[${intercept_replace_policyId14}],"vsysId":1} + ${policyId2} set Variable {"policyType":"pxy_manipulation","policyIds":[${replace_policyId14}],"vsysId":1} ${policyIds} Create List ${policyId1} ${policyId2} ${s} Convert to String ${replace_policyId14} GetLogList1 proxy_event ${starttime} ${endtime} ${testClentIP} ${s} http_host www.google.com.hk diff --git a/case/objects/import_export.robot b/case/objects/import_export.robot new file mode 100644 index 0000000..fd631fb --- /dev/null +++ b/case/objects/import_export.robot @@ -0,0 +1,19 @@ +*** Settings *** +Test Teardown DeletePolicyAndObjectAndOther +Force Tags basic admission bifang +Library OperatingSystem +Resource ../../keyword/common/command.robot +Resource ../../keyword/objects/object.robot +Resource ../../keyword/policys/policy.robot +Resource ../../keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** + + + + + +
\ No newline at end of file diff --git a/case/policies/proxy/http.robot b/case/policies/proxy/http.robot index c4a6004..557e03d 100644 --- a/case/policies/proxy/http.robot +++ b/case/policies/proxy/http.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP 1 Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/clear_data.robot -Resource ../../../keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} @@ -243,6 +243,29 @@ edit_element-url-reqbody [Tags] MultiFilter ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/proxy/http/proxy-http-edit_element-url-reqbody-data.yaml ${TEST NAME} +run_script-url + [Tags] SingleFilter RunScript + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/proxy/http/proxy-http-run_script-url-data.yaml ${TEST NAME} + +run_script-host-url + [Tags] MultiFilter RunScript + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/proxy/http/proxy-http-run_script-host-url-data.yaml ${TEST NAME} + +run_script-host-url-reqheader + [Tags] MultiFilter RunScript + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/proxy/http/proxy-http-run_script-host-url-reqheader-data.yaml ${TEST NAME} + +run_script-host-url-resheader + [Tags] MultiFilter RunScript + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/proxy/http/proxy-http-run_script-host-url-resheader-data.yaml ${TEST NAME} + +run_script-host-url-reqheader-resheader + [Tags] MultiFilter RunScript + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/proxy/http/proxy-http-run_script-host-url-reqheader-resheader-data.yaml ${TEST NAME} + + + + @@ -251,7 +274,6 @@ edit_element-url-reqbody - diff --git a/case/policies/proxy/priority/proxy_http_priority_tests.robot b/case/policies/proxy/priority/proxy_http_priority_tests.robot index 56fe873..25a0b4f 100644 --- a/case/policies/proxy/priority/proxy_http_priority_tests.robot +++ b/case/policies/proxy/priority/proxy_http_priority_tests.robot @@ -3,13 +3,12 @@ Test Setup LoginAndAddLocalIP Test Teardown DeletePolicyAndObject1 ${policyIds} ${objectids} ${url} ${profiledId} ${categoryIds} Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../../../keyword/common/file_operation.robot -Resource ../../../../keyword/objects/object.robot -Resource ../../../../keyword/policys/policy.robot -Resource ../../../../keyword/common/login_logout_switch.robot -Library ../../../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} diff --git a/case/policies/security/anonytun_vpn.robot b/case/policies/security/anonytun_vpn.robot new file mode 100644 index 0000000..4d50bb9 --- /dev/null +++ b/case/policies/security/anonytun_vpn.robot @@ -0,0 +1,28 @@ +*** Settings *** +Test Setup LoginAndAddLocalIP +Test Teardown Run Keywords +... DeletePolicyAndObjectAndOther +... AND LogoutAndDelLocalIP +Force Tags WholeProcess Serial +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/anonytun_vpn/anonytun_vpn-airtest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/anonytun_vpn/anonytun_vpn-airtest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/anonytun_vpn/anonytun_vpn-airtest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/baidu.robot b/case/policies/security/baidu.robot index 5cf6850..855801a 100644 --- a/case/policies/security/baidu.robot +++ b/case/policies/security/baidu.robot @@ -5,66 +5,98 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} -allow-only-IpAndApplication-video - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-allow-only-IpAndApplication-video-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-video + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-allow-only-IpAndApplication-video-data.yaml ${TEST NAME} -allow-only-IpAndApplication-benefitLife - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-allow-only-IpAndApplication-benefitLife-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-benefitLife + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-allow-only-IpAndApplication-benefitLife-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-search - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} -deny-only-IpAndApplication-video - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-deny-only-IpAndApplication-video-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-video + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-deny-only-IpAndApplication-video-data.yaml ${TEST NAME} -deny-only-IpAndApplication-benefitLife - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-deny-only-IpAndApplication-benefitLife-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-benefitLife + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-deny-only-IpAndApplication-benefitLife-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-video - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-monitor-only-IpAndApplication-video-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-video + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-monitor-only-IpAndApplication-video-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-benefitLife - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-monitor-only-IpAndApplication-benefitLife-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-benefitLife + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/security-baidu-monitor-only-IpAndApplication-benefitLife-data.yaml ${TEST NAME} +allow-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/baidu-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/baidu-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/baidu-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/baidu-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/baidu-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/baidu-airTest-data.yaml ${TEST NAME} - - +allow-only-IpAndApplication-frontPage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/baidu-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-frontPage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/baidu-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-frontPage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/baidu/baidu-airTest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/bilibili.robot b/case/policies/security/bilibili.robot new file mode 100644 index 0000000..95026d0 --- /dev/null +++ b/case/policies/security/bilibili.robot @@ -0,0 +1,65 @@ +*** Settings *** +Test Setup LoginAndAddLocalIP +Test Teardown Run Keywords +... DeletePolicyAndObjectAndOther +... AND LogoutAndDelLocalIP +Force Tags WholeProcess Serial +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** +allow-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-MemberPurchase-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-MemberPurchase-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-MemberPurchase-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-frontPage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-frontPage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-frontPage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/bilibili/bilibili-airTest-data.yaml ${TEST NAME} +
\ No newline at end of file diff --git a/case/policies/security/dingding.robot b/case/policies/security/dingding.robot index d0ff65b..e227b94 100644 --- a/case/policies/security/dingding.robot +++ b/case/policies/security/dingding.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} diff --git a/case/policies/security/dns.robot b/case/policies/security/dns.robot index 87be5d2..02161c2 100644 --- a/case/policies/security/dns.robot +++ b/case/policies/security/dns.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} @@ -19,6 +19,14 @@ allow-only-IpAndApplication [Tags] OnlySourceAndApp Famous sites ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/dns/security-dns-allow-only-ipAndApplication-data.yaml ${TEST NAME} +allow-fqdn-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/dns/security-dns-allow-fqdn-exactly-data.yaml ${TEST NAME} + +allow-fqdn-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/dns/security-dns-allow-fqdn-suffix-data.yaml ${TEST NAME} + # allow-only-Application # [Tags] OnlyApplication Famous sites # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/dns/security-dns-allow-only-application-data.yaml ${TEST NAME} @@ -54,6 +62,10 @@ monitor-fqdn-suffix monitor-fqdn-exactly [Tags] WholeProcess Parallel ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/dns/security-dns-monitor-fqdn-exactly-data.yaml ${TEST NAME} + +monitor-dns-log-verify + [Tags] WholeProcess Parallel + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/dns/security-monitor-dns-log-verify-data.yaml ${TEST NAME} diff --git a/case/policies/security/facebook.robot b/case/policies/security/facebook.robot index a867aad..e1cd126 100644 --- a/case/policies/security/facebook.robot +++ b/case/policies/security/facebook.robot @@ -5,73 +5,109 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -allow-only-IpAndApplication-video - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-video-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-video + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-video-data.yaml ${TEST NAME} -allow-only-IpAndApplication-liveStreaming - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-liveStreaming + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-allow-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} -deny-only-IpAndApplication-call - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -deny-only-IpAndApplication-video - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-video-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-video + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-video-data.yaml ${TEST NAME} -deny-only-IpAndApplication-liveStreaming - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-liveStreaming + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-deny-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-video - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-video-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-video + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-video-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-liveStreaming - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} - +# monitor-only-IpAndApplication-liveStreaming + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/security-facebook-monitor-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/facebook-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/facebook-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/facebook-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/facebook-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/facebook-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/facebook-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/facebook-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/facebook-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/facebook/facebook-airTest-data.yaml ${TEST NAME} +
\ No newline at end of file diff --git a/case/policies/security/flashvpn.robot b/case/policies/security/flashvpn.robot new file mode 100644 index 0000000..81b8a72 --- /dev/null +++ b/case/policies/security/flashvpn.robot @@ -0,0 +1,28 @@ +*** Settings *** +Test Setup LoginAndAddLocalIP +Test Teardown Run Keywords +... DeletePolicyAndObjectAndOther +... AND LogoutAndDelLocalIP +Force Tags WholeProcess Serial +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/flashvpn/flashvpn-airtest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/flashvpn/flashvpn-airtest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/flashvpn/flashvpn-airtest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/freegate.robot b/case/policies/security/freegate.robot index 71b619a..c30c896 100644 --- a/case/policies/security/freegate.robot +++ b/case/policies/security/freegate.robot @@ -5,31 +5,43 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-wholeProcess - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/security-freegate-allow-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-wholeProcess + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/security-freegate-allow-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-connect + # [Tags] OnlySourceAndApp app Rate Limit + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/security-freegate-deny-only-IpAndApplication-connect-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-visitWebsite + # [Tags] OnlySourceAndApp app Rate Limit + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/security-freegate-deny-only-IpAndApplication-visitWebsite-data.yaml ${TEST NAME} -deny-only-IpAndApplication-connect - [Tags] OnlySourceAndApp app Rate Limit - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/security-freegate-deny-only-IpAndApplication-connect-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-wholeProcess + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/security-freegate-monitor-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/freegate-airtest-data.yaml ${TEST NAME} deny-only-IpAndApplication-visitWebsite - [Tags] OnlySourceAndApp app Rate Limit - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/security-freegate-deny-only-IpAndApplication-visitWebsite-data.yaml ${TEST NAME} + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/freegate-airtest-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-wholeProcess +monitor-only-IpAndApplication-visitWebsite [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/security-freegate-monitor-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/freegate/freegate-airtest-data.yaml ${TEST NAME} diff --git a/case/policies/security/ftp.robot b/case/policies/security/ftp.robot index afadf42..6d92f91 100644 --- a/case/policies/security/ftp.robot +++ b/case/policies/security/ftp.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} @@ -23,10 +23,74 @@ allow-only-IpAndApplication # [Tags] OnlyApplication # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-only-application-data.yaml ${TEST NAME} +allow-account-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-account-exactly-data.yaml ${TEST NAME} + +allow-account-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-account-suffix-data.yaml ${TEST NAME} + +allow-account-prefix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-account-prefix-data.yaml ${TEST NAME} + +allow-account-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-account-substring-data.yaml ${TEST NAME} + +allow-content-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-content-exactly-data.yaml ${TEST NAME} + +allow-content-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-content-suffix-data.yaml ${TEST NAME} + +allow-content-prefix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-content-prefix-data.yaml ${TEST NAME} + +allow-content-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-content-substring-data.yaml ${TEST NAME} + +allow-uri-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-uri-exactly-data.yaml ${TEST NAME} + +allow-uri-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-uri-suffix-data.yaml ${TEST NAME} + +allow-uri-prefix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-uri-prefix-data.yaml ${TEST NAME} + +allow-uri-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-uri-substring-data.yaml ${TEST NAME} + +allow-uri-account + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-uri-account-data.yaml ${TEST NAME} + +allow-uri-content + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-uri-content-data.yaml ${TEST NAME} + +allow-account-content + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-account-content-data.yaml ${TEST NAME} + +allow-uri-account-content + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-allow-uri-account-content-data.yaml ${TEST NAME} + deny-only-IpAndApplication [Tags] OnlySourceAndApp OnlyApplication - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-deny-only-IpAndApplication-data.yaml ${TEST NAME} - + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-deny-only-IpAndApplication-data.yaml ${TEST NAME} + # deny-only-Application # [Tags] OnlyApplication # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-deny-only-application-data.yaml ${TEST NAME} @@ -138,6 +202,11 @@ monitor-account-substring monitor-account-exactly [Tags] Reset Tamper RateLimit ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-monitor-account-exactly-data.yaml ${TEST NAME} + +monitor-ftp-log-verify + [Tags] Reset Tamper RateLimit + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ftp/security-ftp-monitor-ftp-log-verify-data.yaml ${TEST NAME} + diff --git a/case/policies/security/gmail.robot b/case/policies/security/gmail.robot index 63f3040..49101f7 100644 --- a/case/policies/security/gmail.robot +++ b/case/policies/security/gmail.robot @@ -5,52 +5,72 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendMail - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-allow-only-IpAndApplication-sendMail-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendMail + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-allow-only-IpAndApplication-sendMail-data.yaml ${TEST NAME} -allow-only-IpAndApplication-meeting - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-allow-only-IpAndApplication-meeting-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-meeting + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-allow-only-IpAndApplication-meeting-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendMail - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-deny-only-IpAndApplication-sendMail-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendMail + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-deny-only-IpAndApplication-sendMail-data.yaml ${TEST NAME} -deny-only-IpAndApplication-meeting - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-deny-only-IpAndApplication-meeting-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-meeting + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-deny-only-IpAndApplication-meeting-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendMail - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-monitor-only-IpAndApplication-sendMail-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendMail + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-monitor-only-IpAndApplication-sendMail-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-meeting - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-monitor-only-IpAndApplication-meeting-data.yaml ${TEST NAME} - - +# monitor-only-IpAndApplication-meeting + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/security-gmail-monitor-only-IpAndApplication-meeting-data.yaml ${TEST NAME} -
\ No newline at end of file +allow-only-IpAndApplication-sendEmail-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/gmail-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendEmail-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/gmail-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendEmail-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/gmail-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-Meeting-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/gmail-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-Meeting-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/gmail-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-Meeting-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/gmail/gmail-airTest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/gre.robot b/case/policies/security/gre.robot index c39695c..cb41e4f 100644 --- a/case/policies/security/gre.robot +++ b/case/policies/security/gre.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/clear_data.robot -Resource ../../../keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} diff --git a/case/policies/security/http.robot b/case/policies/security/http.robot index 8b58204..edf3cc8 100644 --- a/case/policies/security/http.robot +++ b/case/policies/security/http.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/clear_data.robot -Resource ../../../keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} @@ -46,7 +46,111 @@ allow-url-exactly allow-fqdn-url [Tags] MultiFilter ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-fqdn-url-data.yaml ${TEST NAME} + +allow-reqheader-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-reqheader-exactly-data.yaml ${TEST NAME} + +allow-reqheader-prefix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-reqheader-prefix-data.yaml ${TEST NAME} + +allow-reqheader-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-reqheader-suffix-data.yaml ${TEST NAME} + +allow-reqheader-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-reqheader-substring-data.yaml ${TEST NAME} + +allow-resheader-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-resheader-exactly-data.yaml ${TEST NAME} +allow-resheader-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-resheader-suffix-data.yaml ${TEST NAME} + +allow-resheader-prefix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-resheader-prefix-data.yaml ${TEST NAME} + +allow-resheader-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-resheader-substring-data.yaml ${TEST NAME} + +allow-resbody-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-resbody-substring-data.yaml ${TEST NAME} + +allow-reqbody-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-reqbody-substring-data.yaml ${TEST NAME} + +allow-fqdn-resbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-fqdn-resbody-data.yaml ${TEST NAME} + +allow-fqdn-reqbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-fqdn-reqbody-data.yaml ${TEST NAME} + +allow-fqdn-resheader + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-fqdn-resheader-data.yaml ${TEST NAME} + +allow-fqdn-reqheader + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-fqdn-reqheader-data.yaml ${TEST NAME} + +allow-url-reqheader + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-url-reqheader-data.yaml ${TEST NAME} + +allow-url-resheader + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-url-resheader-data.yaml ${TEST NAME} + +allow-url-reqbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-url-reqbody-data.yaml ${TEST NAME} + +allow-url-resbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-url-resbody-data.yaml ${TEST NAME} + +allow-reqheader-resheader + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-reqheader-resheader-data.yaml ${TEST NAME} + +allow-reqbody-resbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-reqbody-resbody-data.yaml ${TEST NAME} + +allow-fqdn-reqheader-reqbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-fqdn-reqheader-reqbody-data.yaml ${TEST NAME} + +allow-url-resheader-resbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-url-resheader-resbody-data.yaml ${TEST NAME} + +allow-fqdn-url-reqheader-resheader + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-fqdn-url-reqheader-resheader-data.yaml ${TEST NAME} + +allow-fqdn-url-reqbody-resbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-fqdn-url-reqbody-resbody-data.yaml ${TEST NAME} + +allow-reqheader-resheader-reqbody-resbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-reqheader-resheader-reqbody-resbody-data.yaml ${TEST NAME} + +allow-fqdn-url-reqheader-resheader-reqbody-resbody + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-allow-fqdn-url-reqheader-resheader-reqbody-resbody-data.yaml ${TEST NAME} + deny-only-IpAndApplication [Tags] OnlySourceAndApp ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-deny-only-IpAndApplication-data.yaml ${TEST NAME} @@ -152,6 +256,10 @@ monitor-reqbody-substring monitor-fqdn-url-reqheader-resheader-reqbody-resbody [Tags] MultiFilter ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-monitor-fqdn-url-reqheader-resheader-reqbody-resbody-data.yaml ${TEST NAME} + +monitor-http-log-verify + [Tags] MultiFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-monitor-http-log-verify-data.yaml ${TEST NAME} intercept-fqdn-suffix [Tags] SingleFiler @@ -161,9 +269,8 @@ intercept-fqdn-exactly [Tags] SingleFiler ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/http/security-http-intercept-fqdn-exactly-data.yaml ${TEST NAME} -# test-add - # [Tags] SingleFiler - # ${objectIds} ${policyIds} ${profileId} PolilcysByTemplate ${path}/data/security/http/test-add.yaml ${TEST NAME} + +
\ No newline at end of file diff --git a/case/policies/security/instagram.robot b/case/policies/security/instagram.robot index 52abbb6..f656379 100644 --- a/case/policies/security/instagram.robot +++ b/case/policies/security/instagram.robot @@ -5,85 +5,134 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-focus - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-focus-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-focus + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-focus-data.yaml ${TEST NAME} -allow-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -allow-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-focus - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-focus-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-focus + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-focus-data.yaml ${TEST NAME} -deny-only-IpAndApplication-search - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -deny-only-IpAndApplication-call - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-focus - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-focus-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-focus + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-focus-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} - - - - - - - - - - - +# monitor-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/security-instagram-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/instagram/instagram-airTest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/mail.robot b/case/policies/security/mail.robot index b041581..54c6e8d 100644 --- a/case/policies/security/mail.robot +++ b/case/policies/security/mail.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} @@ -23,6 +23,206 @@ allow-only-IpAndApplication # [Tags] OnlyApplication # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-only-application-data.yaml ${TEST NAME} +allow-subject-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-exactly-data.yaml ${TEST NAME} + +allow-subject-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-suffix-data.yaml ${TEST NAME} + +allow-subject-prefix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-prefix-data.yaml ${TEST NAME} + +allow-subject-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-substring-data.yaml ${TEST NAME} + +allow-content-substring + [Tags] Reset Tamper RateLimit + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-content-substring-data.yaml ${TEST NAME} + +allow-attachmentname-exactly + [Tags] Reset Tamper RateLimit + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentname-exactly-data.yaml ${TEST NAME} + +allow-attachmentname-suffix + [Tags] Reset Tamper RateLimit + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentname-suffix-data.yaml ${TEST NAME} + +allow-attachmentname-prefix + [Tags] Reset Tamper RateLimit + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentname-prefix-data.yaml ${TEST NAME} + +allow-attachmentname-substring + [Tags] Reset Tamper RateLimit + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentname-substring-data.yaml ${TEST NAME} + +allow-attachmentcontent-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentcontent-substring-data.yaml ${TEST NAME} + +allow-from-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-from-exactly-data.yaml ${TEST NAME} + +allow-from-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-from-suffix-data.yaml ${TEST NAME} + +allow-from-prefix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-from-prefix-data.yaml ${TEST NAME} + +allow-from-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-from-substring-data.yaml ${TEST NAME} + +allow-to-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-to-exactly-data.yaml ${TEST NAME} + +allow-to-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-to-suffix-data.yaml ${TEST NAME} + +allow-to-prefix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-to-prefix-data.yaml ${TEST NAME} + +allow-to-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-to-substring-data.yaml ${TEST NAME} + +allow-account-exactly + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-account-excatly-data.yaml ${TEST NAME} + +allow-account-suffix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-account-suffix-data.yaml ${TEST NAME} + +allow-account-prefix + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-account-prefix-data.yaml ${TEST NAME} + +allow-account-substring + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-account-substring-data.yaml ${TEST NAME} + +allow-subject-content + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-content-data.yaml ${TEST NAME} + +allow-subject-attachmentname + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-attachmentname-data.yaml ${TEST NAME} + +allow-subject-attachmentcontent + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-attachmentcontent-data.yaml ${TEST NAME} + +allow-subject-from + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-from-data.yaml ${TEST NAME} + +allow-subject-to + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-to-data.yaml ${TEST NAME} + +allow-subject-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-account-data.yaml ${TEST NAME} + +allow-content-attachmentname + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-content-attachmentname-data.yaml ${TEST NAME} + +allow-content-attachmentcontent + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-content-attachmentcontent-data.yaml ${TEST NAME} + +allow-content-from + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-content-from-data.yaml ${TEST NAME} + +allow-content-to + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-content-to-data.yaml ${TEST NAME} + +allow-content-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-contents-account-data.yaml ${TEST NAME} + +allow-attachmentname-attachmentcontent + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentname-attachmentcontent-data.yaml ${TEST NAME} + +allow-attachmentname-from + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentname-from-data.yaml ${TEST NAME} + +allow-attachmentname-to + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentname-to-data.yaml ${TEST NAME} + +allow-attachmentname-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentname-account-data.yaml ${TEST NAME} + +allow-attachmentcontent-from + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentcontent-from-data.yaml ${TEST NAME} + +allow-attachmentcontent-to + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentcontent-to-data.yaml ${TEST NAME} + +allow-attachmentcontent-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-attachmentcontent-account-data.yaml ${TEST NAME} + +allow-from-to + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-from-to-data.yaml ${TEST NAME} + +allow-from-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-from-account-data.yaml ${TEST NAME} + +allow-to-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-to-account-data.yaml ${TEST NAME} + +allow-content-attachmentname-attachmentcontent-from-to-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-content-attachmentname-attachmentcontent-from-to-account-data.yaml ${TEST NAME} + +allow-subject-attachmentname-attachmentcontent-from-to-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-attachmentname-attachmentcontent-from-to-account-data.yaml ${TEST NAME} + +allow-subject-content-attachmentcontent-from-to-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-content-attachmentcontent-from-to-account-data.yaml ${TEST NAME} + +allow-subject-content-attachmentname-from-to-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-content-attachmentname--from-to-account-data.yaml ${TEST NAME} + +allow-subject-content-attachmentname-attachmentcontent-to-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-content-attachmentname-attachmentcontent-to-account-data.yaml ${TEST NAME} + +allow-subject-content-attachmentname-attachmentcontent-from-account + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-content-attachmentname-attachmentcontent-from-account-data.yaml ${TEST NAME} + +allow-subject-content-attachmentname-attachmentcontent-from-to + [Tags] SingleFilter + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-allow-subject-content-attachmentname-attachmentcontent-from-to-data.yaml ${TEST NAME} + deny-only-IpAndApplication [Tags] OnlySourceAndApp ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-deny-only-IpAndApplication-data.yaml ${TEST NAME} @@ -235,6 +435,10 @@ monitor-account-substring monitor-account-exactly [Tags] SingleFilter ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-mail-monitor-account-exactly-data.yaml ${TEST NAME} + +monitor-mail-log-verify + [Tags] logVeify + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/mail/security-monitor-mail-log-verify-data.yaml ${TEST NAME} diff --git a/case/policies/security/priority/security_dns_priority_tests.robot b/case/policies/security/priority/security_dns_priority_tests.robot index fcbdb9f..3e47166 100644 --- a/case/policies/security/priority/security_dns_priority_tests.robot +++ b/case/policies/security/priority/security_dns_priority_tests.robot @@ -3,13 +3,12 @@ Test Setup LoginAndAddLocalIP Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../../../keyword/common/file_operation.robot -Resource ../../../../keyword/objects/object.robot -Resource ../../../../keyword/policys/policy.robot -Resource ../../../../keyword/common/login_logout_switch.robot -Library ../../../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} diff --git a/case/policies/security/priority/security_ftp_priority_tests.robot b/case/policies/security/priority/security_ftp_priority_tests.robot index 02fee2d..ccdf71c 100644 --- a/case/policies/security/priority/security_ftp_priority_tests.robot +++ b/case/policies/security/priority/security_ftp_priority_tests.robot @@ -3,13 +3,12 @@ Test Setup LoginAndAddLocalIP Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../../../keyword/common/file_operation.robot -Resource ../../../../keyword/objects/object.robot -Resource ../../../../keyword/policys/policy.robot -Resource ../../../../keyword/common/login_logout_switch.robot -Library ../../../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} diff --git a/case/policies/security/priority/security_http_priority_tests.robot b/case/policies/security/priority/security_http_priority_tests.robot index dacf1b5..108a92c 100644 --- a/case/policies/security/priority/security_http_priority_tests.robot +++ b/case/policies/security/priority/security_http_priority_tests.robot @@ -3,13 +3,12 @@ Test Setup LoginAndAddLocalIP Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../../../keyword/common/file_operation.robot -Resource ../../../../keyword/objects/object.robot -Resource ../../../../keyword/policys/policy.robot -Resource ../../../../keyword/common/login_logout_switch.robot -Library ../../../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} diff --git a/case/policies/security/priority/security_mail_priority_tests.robot b/case/policies/security/priority/security_mail_priority_tests.robot index ac9b654..4f939a2 100644 --- a/case/policies/security/priority/security_mail_priority_tests.robot +++ b/case/policies/security/priority/security_mail_priority_tests.robot @@ -3,13 +3,12 @@ Test Setup LoginAndAddLocalIP Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../../../keyword/common/file_operation.robot -Resource ../../../../keyword/objects/object.robot -Resource ../../../../keyword/policys/policy.robot -Resource ../../../../keyword/common/login_logout_switch.robot -Library ../../../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} diff --git a/case/policies/security/priority/security_ssl_priority_tests.robot b/case/policies/security/priority/security_ssl_priority_tests.robot index 84f4b45..94b92b9 100644 --- a/case/policies/security/priority/security_ssl_priority_tests.robot +++ b/case/policies/security/priority/security_ssl_priority_tests.robot @@ -3,13 +3,12 @@ Test Setup LoginAndAddLocalIP Test Teardown DeletePolicyAndObject ${policyIds} ${objectids} ${categoryIds} Force Tags tsg_adc_wp adc_api security_policy Library OperatingSystem -Resource ../../../../keyword/common/systemcommand.robot -# Resource ../../keyword/common/log_variable.robot -Resource ../../../../keyword/common/file_operation.robot -Resource ../../../../keyword/objects/object.robot -Resource ../../../../keyword/policys/policy.robot -Resource ../../../../keyword/common/login_logout_switch.robot -Library ../../../../customlib/verify_policy.py +Resource ${EXECDIR}/keyword/common/systemcommand.robot +Resource ${EXECDIR}/keyword/common/file_operation.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Library ${EXECDIR}/customlib/verify_policy.py *** Variables *** ${policyIds} ${EMPTY} diff --git a/case/policies/security/protonvpn.robot b/case/policies/security/protonvpn.robot new file mode 100644 index 0000000..84d0b51 --- /dev/null +++ b/case/policies/security/protonvpn.robot @@ -0,0 +1,28 @@ +*** Settings *** +Test Setup LoginAndAddLocalIP +Test Teardown Run Keywords +... DeletePolicyAndObjectAndOther +... AND LogoutAndDelLocalIP +Force Tags WholeProcess Serial +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/protonvpn/protonvpn-airtest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/protonvpn/protonvpn-airtest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/protonvpn/protonvpn-airtest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/psiphon3.robot b/case/policies/security/psiphon3.robot index 8d26d76..7479bea 100644 --- a/case/policies/security/psiphon3.robot +++ b/case/policies/security/psiphon3.robot @@ -5,31 +5,43 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-wholeProcess - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/security-psiphon3-allow-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-wholeProcess + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/security-psiphon3-allow-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-connect + # [Tags] OnlySourceAndApp app Rate Limit + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/security-psiphon3-deny-only-IpAndApplication-connect-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-visitWebsite + # [Tags] OnlySourceAndApp app Rate Limit + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/security-psiphon3-deny-only-IpAndApplication-visitWebsite-data.yaml ${TEST NAME} -deny-only-IpAndApplication-connect - [Tags] OnlySourceAndApp app Rate Limit - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/security-psiphon3-deny-only-IpAndApplication-connect-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-wholeProcess + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/security-psiphon3-monitor-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/psiphon3-airtest-data.yaml ${TEST NAME} deny-only-IpAndApplication-visitWebsite - [Tags] OnlySourceAndApp app Rate Limit - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/security-psiphon3-deny-only-IpAndApplication-visitWebsite-data.yaml ${TEST NAME} + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/psiphon3-airtest-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-wholeProcess +monitor-only-IpAndApplication-visitWebsite [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/security-psiphon3-monitor-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/psiphon3/psiphon3-airtest-data.yaml ${TEST NAME} diff --git a/case/policies/security/qq.robot b/case/policies/security/qq.robot index daaee7c..740a2d6 100644 --- a/case/policies/security/qq.robot +++ b/case/policies/security/qq.robot @@ -5,77 +5,137 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} - -allow-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} - -allow-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} - -allow-only-IpAndApplication-aspect - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-aspect-data.yaml ${TEST NAME} - -allow-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} - -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} - -deny-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} - -deny-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} - -deny-only-IpAndApplication-aspect - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-aspect-data.yaml ${TEST NAME} - -deny-only-IpAndApplication-call - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-aspect - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-aspect-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} - +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} + +# allow-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} + +# allow-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} + +# allow-only-IpAndApplication-aspect + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-aspect-data.yaml ${TEST NAME} + +# allow-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-aspect + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-aspect-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-aspect + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-aspect-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/security-qq-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/qq/qq-airTest-data.yaml ${TEST NAME} + diff --git a/case/policies/security/sip.robot b/case/policies/security/sip.robot index 9273abb..4d4cc06 100644 --- a/case/policies/security/sip.robot +++ b/case/policies/security/sip.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} diff --git a/case/policies/security/skype.robot b/case/policies/security/skype.robot index edb6d8a..c31d2e4 100644 --- a/case/policies/security/skype.robot +++ b/case/policies/security/skype.robot @@ -5,87 +5,123 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendPicture - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendPicture + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} -allow-only-IpAndApplication-voiceCall - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-voiceCall + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} -allow-only-IpAndApplication-videoCall - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-videoCall + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} -allow-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendPicture - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendPicture + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} -deny-only-IpAndApplication-voiceCall - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-voiceCall + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} -deny-only-IpAndApplication-videoCall - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-videoCall + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} -deny-only-IpAndApplication-call - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendPicture - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendPicture + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-voiceCall - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-voiceCall + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-videoCall - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-videoCall + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/security-skype-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/skype-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/skype-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/skype-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/skype-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/skype-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/skype-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/skype-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/skype-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/skype/skype-airTest-data.yaml ${TEST NAME} diff --git a/case/policies/security/ssl.robot b/case/policies/security/ssl.robot index 610c16a..d6f407e 100644 --- a/case/policies/security/ssl.robot +++ b/case/policies/security/ssl.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/clear_data.robot -Resource ../../../keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} @@ -39,6 +39,22 @@ allow-only-IpAndApplication # [Tags] OnlyApplication Famous sites # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-allow-only-application-data.yaml ${TEST NAME} +allow-san-exactly + [Tags] SingleFiler TLS1_2 + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-allow-san-exactly-data.yaml ${TEST NAME} + +allow-san-suffix + [Tags] SingleFiler TLS1_2 + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-allow-san-suffix-data.yaml ${TEST NAME} + +allow-cn-exactly + [Tags] SingleFiler TLS1_2 + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-allow-cn-exactly-data.yaml ${TEST NAME} + +allow-cn-suffix + [Tags] SingleFiler TLS1_2 + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-allow-cn-suffix-data.yaml ${TEST NAME} + deny-fqdn-suffix-famousSites [Tags] Reset Tamper RateLimit SingleFiler MultiFilter Famous sites ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-deny-fqdn-suffix-famousSites-data.yaml ${TEST NAME} @@ -79,10 +95,19 @@ monitor-fqdn-exactly [Tags] SingleFiler MultiFilter Famous sites ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-monitor-fqdn-exactly-data.yaml ${TEST NAME} +# monitor-fqdn-exactly + # [Tags] SingleFiler MultiFilter Famous sites + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-monitor-fqdn-exactly-data.yaml ${TEST NAME} + monitor-only-IpAndApplication [Tags] OnlySourceAndApp Famous sites ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-monitor-only-ipAndApplication-data.yaml ${TEST NAME} + +monitor-log-verify + [Tags] SingleFiler MultiFilter Famous sites + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-monitor-log-verify-data.yaml ${TEST NAME} + # monitor-only-Application # [Tags] OnlyApplication Famous sites # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ssl/security-ssl-monitor-only-application-data.yaml ${TEST NAME} diff --git a/case/policies/security/tachyon.robot b/case/policies/security/tachyon.robot index aabfa47..39fcae8 100644 --- a/case/policies/security/tachyon.robot +++ b/case/policies/security/tachyon.robot @@ -5,31 +5,43 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-wholeProcess - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyon/security-tachyon-allow-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-wholeProcess + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyon/security-tachyon-allow-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-connect + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyon/security-tachyon-deny-only-IpAndApplication-connect-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-visitWebsite + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyon/security-tachyon-deny-only-IpAndApplication-visitWebsite-data.yaml ${TEST NAME} -deny-only-IpAndApplication-connect - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyon/security-tachyon-deny-only-IpAndApplication-connect-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-wholeProcess + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyon/security-tachyon-monitor-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyonvpn/tachyonvpn-airtest-data.yaml ${TEST NAME} deny-only-IpAndApplication-visitWebsite - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyon/security-tachyon-deny-only-IpAndApplication-visitWebsite-data.yaml ${TEST NAME} + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyonvpn/tachyonvpn-airtest-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-wholeProcess +monitor-only-IpAndApplication-visitWebsite [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyon/security-tachyon-monitor-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tachyonvpn/tachyonvpn-airtest-data.yaml ${TEST NAME} diff --git a/case/policies/security/taobao.robot b/case/policies/security/taobao.robot index 8d26011..4771167 100644 --- a/case/policies/security/taobao.robot +++ b/case/policies/security/taobao.robot @@ -5,61 +5,96 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} -allow-only-IpAndApplication-find - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-allow-only-IpAndApplication-find-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-find + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-allow-only-IpAndApplication-find-data.yaml ${TEST NAME} -allow-only-IpAndApplication-message - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-allow-only-IpAndApplication-message-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-message + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-allow-only-IpAndApplication-message-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-search - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} -deny-only-IpAndApplication-find - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-deny-only-IpAndApplication-find-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-find + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-deny-only-IpAndApplication-find-data.yaml ${TEST NAME} -deny-only-IpAndApplication-message - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-deny-only-IpAndApplication-message-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-message + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-deny-only-IpAndApplication-message-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-find - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-monitor-only-IpAndApplication-find-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-find + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-monitor-only-IpAndApplication-find-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-message - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-monitor-only-IpAndApplication-message-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-message + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/security-taobao-monitor-only-IpAndApplication-message-data.yaml ${TEST NAME} +allow-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/taobao-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/taobao-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/taobao-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/taobao-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/taobao-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/taobao-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-find-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/taobao-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-find-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/taobao-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-find-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/taobao/taobao-airTest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/telegram.robot b/case/policies/security/telegram.robot index 5b70ed9..c932709 100644 --- a/case/policies/security/telegram.robot +++ b/case/policies/security/telegram.robot @@ -5,75 +5,130 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendEmoj - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendEmoj + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} -allow-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} -allow-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendEmoj - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendEmoj + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} -deny-only-IpAndApplication-search - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} -deny-only-IpAndApplication-call - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendEmoj - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendEmoj + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-sendMessage-airTest + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/security-telegram-deny-only-IpAndApplication-sendMessage-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + + +allow-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-socks5-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-socks5-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-socks5-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-MTPROTO-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-MTPROTO-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-MTPROTO-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/telegram/telegram-airTest-data.yaml ${TEST NAME} + + diff --git a/case/policies/security/tor.robot b/case/policies/security/tor.robot index 55b97ed..adaf295 100644 --- a/case/policies/security/tor.robot +++ b/case/policies/security/tor.robot @@ -5,31 +5,43 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-wholeProcess - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/security-tor-allow-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-wholeProcess + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/security-tor-allow-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-connect + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/security-tor-deny-only-IpAndApplication-connect-data.yaml ${TEST NAME} + +# deny-only-IpAndApplication-visitWebsite + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/security-tor-deny-only-IpAndApplication-visitWebsite-data.yaml ${TEST NAME} -deny-only-IpAndApplication-connect - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/security-tor-deny-only-IpAndApplication-connect-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-wholeProcess + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/security-tor-monitor-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/tor-airtest-data.yaml ${TEST NAME} deny-only-IpAndApplication-visitWebsite - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/security-tor-deny-only-IpAndApplication-visitWebsite-data.yaml ${TEST NAME} + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/tor-airtest-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-wholeProcess +monitor-only-IpAndApplication-visitWebsite [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/security-tor-monitor-only-IpAndApplication-wholeProcess-data.yaml ${TEST NAME} + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/tor/tor-airtest-data.yaml ${TEST NAME} diff --git a/case/policies/security/traffic_replay/traffic_replay.robot b/case/policies/security/traffic_replay/traffic_replay.robot index c592b8f..5ecf158 100644 --- a/case/policies/security/traffic_replay/traffic_replay.robot +++ b/case/policies/security/traffic_replay/traffic_replay.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../../keyword/common/command.robot -Resource ../../../../keyword/objects/object.robot -Resource ../../../../keyword/policys/policy.robot -Resource ../../../../keyword/common/login_logout_switch.robot -Resource ../../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} @@ -19,24 +19,43 @@ straum-only-traffic-replay [Tags] Memory CPU Stratum ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} -straum-policy-with-traffic-replay - [Tags] Memory CPU Stratum - ${policyIds} CreatePolicyByJson {"opAction":"add","returnData":1,"refuseCode":true,"policyList":{"policyId":"","policyName":"test","policyType":"tsg_security","action":"monitor","userTags":"","doBlacklist":0,"doLog":1,"policyDesc":"","effectiveRange":{},"userRegion":{"protocol":"STRATUM","traffic_mirror":{"enable":0,"mirror_profile":null},"packet_capture":{"enable":0}},"source":[],"destination":[],"filterList":[],"appIdObjects":[149],"appSelectorObjects":[],"isValid":1,"scheduleId":[]}} - ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} +# straum-policy-with-traffic-replay + # [Tags] Memory CPU Stratum + # ${policyIds} CreatePolicyByJson {"opAction":"add","returnData":1,"refuseCode":true,"policyList":{"policyId":"","policyName":"test","policyType":"tsg_security","action":"monitor","userTags":"","doBlacklist":0,"doLog":1,"policyDesc":"","effectiveRange":{},"userRegion":{"protocol":"STRATUM","traffic_mirror":{"enable":0,"mirror_profile":null},"packet_capture":{"enable":0}},"source":[],"destination":[],"filterList":[],"appIdObjects":[149],"appSelectorObjects":[],"isValid":1,"scheduleId":[]}} + # ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} gtp-only-traffic-replay [Tags] Memory CPU Gtp ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} -gtp-policy-with-traffic-replay - [Tags] Memory CPU Gtp - ${policyIds} CreatePolicyByJson {"opAction":"add","returnData":1,"refuseCode":true,"policyList":{"policyId":"","policyName":"testgtp","policyType":"tsg_security","action":"monitor","userTags":"","doBlacklist":0,"doLog":1,"policyDesc":"","effectiveRange":{},"userRegion":{"protocol":"GTP","traffic_mirror":{"enable":0,"mirror_profile":null},"packet_capture":{"enable":0}},"source":[],"destination":[],"filterList":[],"appIdObjects":[104],"appSelectorObjects":[],"isValid":0,"scheduleId":[]}} - ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} +# gtp-policy-with-traffic-replay + # [Tags] Memory CPU Gtp + # ${policyIds} CreatePolicyByJson {"opAction":"add","returnData":1,"refuseCode":true,"policyList":{"policyId":"","policyName":"testgtp","policyType":"tsg_security","action":"monitor","userTags":"","doBlacklist":0,"doLog":1,"policyDesc":"","effectiveRange":{},"userRegion":{"protocol":"GTP","traffic_mirror":{"enable":0,"mirror_profile":null},"packet_capture":{"enable":0}},"source":[],"destination":[],"filterList":[],"appIdObjects":[104],"appSelectorObjects":[],"isValid":0,"scheduleId":[]}} + # ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} http-only-traffic-replay - [Tags] Memory CPU Gtp + [Tags] Memory CPU http + ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} + +rdp-only-traffic-replay + [Tags] Memory CPU rdp + ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} + +voip-only-traffic-replay + [Tags] Memory CPU voip + ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} + +bgp-open-only-traffic-replay + ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} + +bgp-keepalive-only-traffic-replay + ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} + +bgp-update-only-traffic-replay + ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} + +bgp-notification-only-traffic-replay ExecuteScript ${path}/data/security/traffic_replay/${TEST NAME}.yaml ${TEST NAME} - diff --git a/case/policies/security/turbovpn_mm.robot b/case/policies/security/turbovpn_mm.robot new file mode 100644 index 0000000..32145e9 --- /dev/null +++ b/case/policies/security/turbovpn_mm.robot @@ -0,0 +1,28 @@ +*** Settings *** +Test Setup LoginAndAddLocalIP +Test Teardown Run Keywords +... DeletePolicyAndObjectAndOther +... AND LogoutAndDelLocalIP +Force Tags WholeProcess Serial +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/turbovpn_mm/turbovpn_mm-airtest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/turbovpn_mm/turbovpn_mm-airtest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/turbovpn_mm/turbovpn_mm-airtest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/twitter.robot b/case/policies/security/twitter.robot index 5745cf5..7d634ab 100644 --- a/case/policies/security/twitter.robot +++ b/case/policies/security/twitter.robot @@ -5,63 +5,96 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-focus - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-allow-only-IpAndApplication-focus-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-focus + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-allow-only-IpAndApplication-focus-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -allow-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-focus - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-deny-only-IpAndApplication-focus-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-focus + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-deny-only-IpAndApplication-focus-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -deny-only-IpAndApplication-search - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-focus - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-monitor-only-IpAndApplication-focus-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-focus + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-monitor-only-IpAndApplication-focus-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} - +# monitor-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/security-twitter-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} -
\ No newline at end of file +allow-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/twitter-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/twitter-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/twitter-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/twitter-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/twitter-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/twitter-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/twitter-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/twitter-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/twitter/twitter-airTest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/ugvpn.robot b/case/policies/security/ugvpn.robot new file mode 100644 index 0000000..d6519af --- /dev/null +++ b/case/policies/security/ugvpn.robot @@ -0,0 +1,28 @@ +*** Settings *** +Test Setup LoginAndAddLocalIP +Test Teardown Run Keywords +... DeletePolicyAndObjectAndOther +... AND LogoutAndDelLocalIP +Force Tags WholeProcess Serial +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ugvpn/ugvpn-airtest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ugvpn/ugvpn-airtest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/ugvpn/ugvpn-airtest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/urbanvpn.robot b/case/policies/security/urbanvpn.robot new file mode 100644 index 0000000..7af3e56 --- /dev/null +++ b/case/policies/security/urbanvpn.robot @@ -0,0 +1,28 @@ +*** Settings *** +Test Setup LoginAndAddLocalIP +Test Teardown Run Keywords +... DeletePolicyAndObjectAndOther +... AND LogoutAndDelLocalIP +Force Tags WholeProcess Serial +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/urbanvpn/urbanvpn-airtest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/urbanvpn/urbanvpn-airtest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/urbanvpn/urbanvpn-airtest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/v4c.robot b/case/policies/security/v4c.robot new file mode 100644 index 0000000..84111ad --- /dev/null +++ b/case/policies/security/v4c.robot @@ -0,0 +1,38 @@ +*** Settings *** +Test Setup LoginAndAddLocalIP +Test Teardown Run Keywords +... DeletePolicyAndObjectAndOther +... AND LogoutAndDelLocalIP +Force Tags WholeProcess Serial +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/v4c/v4c-airtest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/v4c/v4c-airtest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/v4c/v4c-airtest-data.yaml ${TEST NAME} + + + + + + + + + +
\ No newline at end of file diff --git a/case/policies/security/vpnlat.robot b/case/policies/security/vpnlat.robot new file mode 100644 index 0000000..a3bb277 --- /dev/null +++ b/case/policies/security/vpnlat.robot @@ -0,0 +1,28 @@ +*** Settings *** +Test Setup LoginAndAddLocalIP +Test Teardown Run Keywords +... DeletePolicyAndObjectAndOther +... AND LogoutAndDelLocalIP +Force Tags WholeProcess Serial +Library OperatingSystem +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +*** Variables *** +${createPolicyIds} ${EMPTY} +${createObjectIds} ${EMPTY} + +*** Test Cases *** +allow-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/vpnlat/vpnlat-airtest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/vpnlat/vpnlat-airtest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-visitWebsite + [Tags] OnlySourceAndApp app + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/vpnlat/vpnlat-airtest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/wechat.robot b/case/policies/security/wechat.robot index 15fbe75..d01c424 100644 --- a/case/policies/security/wechat.robot +++ b/case/policies/security/wechat.robot @@ -5,121 +5,204 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} -allow-only-IpAndApplication-video - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-video-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-video + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-video-data.yaml ${TEST NAME} -allow-only-IpAndApplication-liveStreaming - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-liveStreaming + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} -allow-only-IpAndApplication-takeALook - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-takeALook-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-takeALook + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-takeALook-data.yaml ${TEST NAME} -allow-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} -allow-only-IpAndApplication-nearby - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-nearby-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-nearby + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-nearby-data.yaml ${TEST NAME} -allow-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} -deny-only-IpAndApplication-video - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-video-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-video + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-video-data.yaml ${TEST NAME} -deny-only-IpAndApplication-liveStreaming - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-liveStreaming + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} -deny-only-IpAndApplication-takeALook - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-takeALook-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-takeALook + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-takeALook-data.yaml ${TEST NAME} -deny-only-IpAndApplication-search - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} -deny-only-IpAndApplication-nearby - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-nearby-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-nearby + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-nearby-data.yaml ${TEST NAME} -deny-only-IpAndApplication-call - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-video - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-video-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-video + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-video-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-liveStreaming - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-takeALook - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-takeALook-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-nearby - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-nearby-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-liveStreaming + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-liveStreaming-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-takeALook + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-takeALook-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-nearby + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-nearby-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/security-wechat-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-video-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-talkLook-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-talkLook-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-talkLook-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/wechat/wechat-airTest-data.yaml ${TEST NAME} diff --git a/case/policies/security/whatsapp.robot b/case/policies/security/whatsapp.robot index dbdefa1..7e7c09a 100644 --- a/case/policies/security/whatsapp.robot +++ b/case/policies/security/whatsapp.robot @@ -5,110 +5,157 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendEmoj - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendEmoj + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} -allow-only-IpAndApplication-sendPicture - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-sendPicture + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} -allow-only-IpAndApplication-voiceCall - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-voiceCall + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} -allow-only-IpAndApplication-videoCall - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-videoCall + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} -allow-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-allow-only-IpAndApplication-call-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendEmoj - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendEmoj + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} -deny-only-IpAndApplication-sendPicture - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-sendPicture + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} -deny-only-IpAndApplication-voiceCall - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-voiceCall + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} -deny-only-IpAndApplication-videoCall - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-videoCall + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} -deny-only-IpAndApplication-call - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-deny-only-IpAndApplication-call-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-sendDynamic - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-sendMessage - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-sendEmoj - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-sendPicture - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-voiceCall - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-videoCall - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} - -monitor-only-IpAndApplication-call - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} - +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-sendDynamic + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-sendDynamic-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-sendMessage + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-sendMessage-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-sendEmoj + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-sendEmoj-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-sendPicture + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-sendPicture-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-voiceCall + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-voiceCall-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-videoCall + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-videoCall-data.yaml ${TEST NAME} + +# monitor-only-IpAndApplication-call + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/security-whatsapp-monitor-only-IpAndApplication-call-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendMessage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-sendDynamic-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-voiceCalls-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-videoCall-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/whatsapp/whatsapp-airTest-data.yaml ${TEST NAME}
\ No newline at end of file diff --git a/case/policies/security/wireguard.robot b/case/policies/security/wireguard.robot index 86a2223..2d3381c 100644 --- a/case/policies/security/wireguard.robot +++ b/case/policies/security/wireguard.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} diff --git a/case/policies/security/youtube.robot b/case/policies/security/youtube.robot index a8afa12..6df9342 100644 --- a/case/policies/security/youtube.robot +++ b/case/policies/security/youtube.robot @@ -5,77 +5,124 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags WholeProcess Serial Library OperatingSystem -Resource ../../../keyword/common/command.robot -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/common/command.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} *** Test Cases *** -allow-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-login-data.yaml ${TEST NAME} -allow-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-search-data.yaml ${TEST NAME} -allow-only-IpAndApplication-playVideo - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-playVideo-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-playVideo + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-playVideo-data.yaml ${TEST NAME} -allow-only-IpAndApplication-videoOperation - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-videoOperation-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-videoOperation + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-videoOperation-data.yaml ${TEST NAME} -allow-only-IpAndApplication-subscribe - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-subscribe-data.yaml ${TEST NAME} +# allow-only-IpAndApplication-subscribe + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-allow-only-IpAndApplication-subscribe-data.yaml ${TEST NAME} -deny-only-IpAndApplication-login - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-login-data.yaml ${TEST NAME} -deny-only-IpAndApplication-search - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-search-data.yaml ${TEST NAME} -deny-only-IpAndApplication-playVideo - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-playVideo-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-playVideo + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-playVideo-data.yaml ${TEST NAME} -deny-only-IpAndApplication-videoOperation - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-videoOperation-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-videoOperation + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-videoOperation-data.yaml ${TEST NAME} -deny-only-IpAndApplication-subscribe - [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-subscribe-data.yaml ${TEST NAME} +# deny-only-IpAndApplication-subscribe + # [Tags] OnlySourceAndApp app default Drop Rate Limit Tamper + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-deny-only-IpAndApplication-subscribe-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-login - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-login + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-login-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-search - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-search + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-search-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-playVideo - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-playVideo-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-playVideo + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-playVideo-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-videoOperation - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-videoOperation-data.yaml ${TEST NAME} +# monitor-only-IpAndApplication-videoOperation + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-videoOperation-data.yaml ${TEST NAME} -monitor-only-IpAndApplication-subscribe - [Tags] OnlySourceAndApp app - ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-subscribe-data.yaml ${TEST NAME} - +# monitor-only-IpAndApplication-subscribe + # [Tags] OnlySourceAndApp app + # ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/security-youtube-monitor-only-IpAndApplication-subscribe-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-search-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-shorts-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-shorts-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-shorts-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-frontPage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-frontPage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-frontPage-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +allow-only-IpAndApplication-SubscriptionContent-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +deny-only-IpAndApplication-SubscriptionContent-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} + +monitor-only-IpAndApplication-SubscriptionContent-airTest + [Tags] OnlySourceAndApp app AirTest + ${objectIds} ${policyIds} PolilcysByTemplate ${path}/data/security/youtube/youtube-airTest-data.yaml ${TEST NAME} diff --git a/case/system/iplibraries/iplibrariescase.robot b/case/system/iplibraries/iplibrariescase.robot index edfd373..513db8d 100644 --- a/case/system/iplibraries/iplibrariescase.robot +++ b/case/system/iplibraries/iplibrariescase.robot @@ -43,6 +43,16 @@ iplibraries_import_ipv4AndGeo log ${iplibrariesIdList}
IPLibrariesImport uploadFiles city_geo.csv ip_location_v4.csv ${EMPTY} 200
+iplibraries_import_ipv4AndGeoDup
+ ${iplibrariesIdList} Set Variable 1214
+ log ${iplibrariesIdList}
+ IPLibrariesImport uploadFiles city_geo_dup.csv ip_location_v4.csv ${EMPTY} 40019031
+
+iplibraries_import_ipv4DupAndGeo
+ ${iplibrariesIdList} Set Variable 1214
+ log ${iplibrariesIdList}
+ IPLibrariesImport uploadFiles city_geo.csv ip_location_v4.csv ${EMPTY} 40019031
+
iplibraries_import_ipv6AndGeo
${iplibrariesIdList} Set Variable 1214
log ${iplibrariesIdList}
diff --git a/case/system/trouble_shooting/packet_capture.robot b/case/system/trouble_shooting/packet_capture.robot index c72bd0d..df637af 100644 --- a/case/system/trouble_shooting/packet_capture.robot +++ b/case/system/trouble_shooting/packet_capture.robot @@ -5,11 +5,11 @@ Test Teardown Run Keywords ... AND LogoutAndDelLocalIP Force Tags PacketTroubleShooting Library OperatingSystem -Resource ../../../keyword/objects/object.robot -Resource ../../../keyword/policys/policy.robot -Resource ../../../keyword/common/login_logout_switch.robot -Resource ../../../keyword/common/clear_data.robot -Resource ../../../keyword/system/trouble_shooting/packet_capture.robot +Resource ${EXECDIR}/keyword/objects/object.robot +Resource ${EXECDIR}/keyword/policys/policy.robot +Resource ${EXECDIR}/keyword/common/login_logout_switch.robot +Resource ${EXECDIR}/keyword/common/clear_data.robot +Resource ${EXECDIR}/keyword/system/trouble_shooting/packet_capture.robot *** Variables *** ${createPolicyIds} ${EMPTY} ${createObjectIds} ${EMPTY} @@ -28,6 +28,7 @@ all-filter ${packetCaptureIds} PacketPoliciesByTemplate ${path}/data/system/trouble_shooting/all-filter.yaml ${TEST NAME} nouse-filter + [Tags] PacketTroubleShooting ${packetCaptureIds} PacketPoliciesByTemplate ${path}/data/system/trouble_shooting/nouse-filter.yaml ${TEST NAME} |