From e7242fcb77eb3d277c1aec93ae78c29e73db6e61 Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Mon, 7 Sep 2020 19:46:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=82=E5=BA=9420.09?= =?UTF-8?q?=E7=89=88appid=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policy_object/PolicyObjectTests.robot | 46 +++++++++-------- .../Security_Policy_Allow_Test.robot | 31 ++++++------ .../Security_Policy_Deny_Test.robot | 49 ++++++++++--------- 01-TestCase/zjj/DLL-DeviceID-Test.robot | 5 +- 4 files changed, 70 insertions(+), 61 deletions(-) diff --git a/01-TestCase/tsg_bfapi/policy_object/PolicyObjectTests.robot b/01-TestCase/tsg_bfapi/policy_object/PolicyObjectTests.robot index fa36af2..e65c208 100644 --- a/01-TestCase/tsg_bfapi/policy_object/PolicyObjectTests.robot +++ b/01-TestCase/tsg_bfapi/policy_object/PolicyObjectTests.robot @@ -5,6 +5,8 @@ Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Object.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Log.robot Resource ../../../02-Keyword/tsg_bfapi/Common.robot +Resource ../../../03-Variable/ApplicationID.txt + Library json Library DateTime *** Variables *** @@ -106,7 +108,7 @@ Policy-Post-v2-00004 ... action=deny #effectiveRange={} ... userRegion={"protocol":"SSL","method":"drop"} ... filterList=${objectId}|TSG_FIELD_SSL_CN - ... isValid=${1} appIdObjects=3 + ... isValid=${1} appIdObjects=${SSL_ID} ${rescode} ${policyIds} AddPolicies 1 ${policy} v2 Log ${rescode} ${policyIds} ${objectIds} Policy-Post-v2-00005 @@ -129,7 +131,7 @@ Policy-Post-v2-00005 ... userRegion={"protocol":"HTTP","method":"drop"} ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... destination=${objectId2}|TSG_FIELD_HTTP_URL - ... isValid=${1} appIdObjects=2 + ... isValid=${1} appIdObjects=${HTTP_ID} ${rescode} ${policyIds} AddPolicies 1 ${policy} v2 Log ${rescode} ${policyIds} ${objectIds} Policy-Post-v2-00006 @@ -188,7 +190,7 @@ Policy-Post-v2-00007 ... userRegion={"protocol":"HTTP","method":"drop"} ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... destination=${objectId3}|TSG_FIELD_HTTP_URL - ... isValid=${1} appIdObjects=2 + ... isValid=${1} appIdObjects=${HTTP_ID} ${rescode} ${policyIds} AddPolicies 1 ${policy} v2 Log ${rescode} ${updatePolicyId} Set Variable ${policyIds}[0][policyIds][0] @@ -199,7 +201,7 @@ Policy-Post-v2-00007 ... userRegion={"protocol":"HTTP","traffic_forward":{"enable":1}} ... source=${objectId2}|TSG_SECURITY_SOURCE_ADDR ... destination=${objectId4}|TSG_FIELD_HTTP_URL - ... isValid=${1} appIdObjects=2 + ... isValid=${1} appIdObjects=${HTTP_ID} ${rescode} UpdatePolicies 1 ${policy} v2 update Policy-Post-v2-00008 Comment 创建IP @@ -222,7 +224,7 @@ Policy-Post-v2-00008 ... userRegion={"protocol":"HTTP","method":"drop"} ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... destination=${objectId3}|TSG_FIELD_HTTP_URL - ... isValid=${1} appIdObjects=2 + ... isValid=${1} appIdObjects=${HTTP_ID} ${policy1} Copy Dictionary ${policy} true ${rescode} ${policyIds} AddPolicies 1 ${policy} v2 Log ${rescode} @@ -251,7 +253,7 @@ Policy-Post-v2-00009 ... userRegion={"protocol":"HTTP","method":"drop"} ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... destination=${objectId3}|TSG_FIELD_HTTP_URL - ... isValid=${0} appIdObjects=2 + ... isValid=${0} appIdObjects=${HTTP_ID} ${policy1} Copy Dictionary ${policy} true ${rescode} ${policyIds} AddPolicies 1 ${policy} v2 Log ${rescode} @@ -280,7 +282,7 @@ Policy-Post-v2-00010 ... userRegion={"protocol":"HTTP","method":"drop"} ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... destination=${objectId3}|TSG_FIELD_HTTP_URL - ... isValid=${0} appIdObjects=2 + ... isValid=${0} appIdObjects=${HTTP_ID} ${rescode} ${policyIds} AddPolicies 1 ${policy} v2 Log ${rescode} ${updatePolicyId} Set Variable ${policyIds}[0][policyIds][0] @@ -308,7 +310,7 @@ Policy-Post-v2-00011 ... userRegion={"protocol":"HTTP","method":"drop"} ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... destination=${objectId3}|TSG_FIELD_HTTP_URL - ... isValid=${1} appIdObjects=2 + ... isValid=${1} appIdObjects=${HTTP_ID} ${rescode} ${policyIds} AddPolicies 1 ${policy} v2 Log ${rescode} ${updatePolicyId} Set Variable ${policyIds}[0][policyIds][0] @@ -428,7 +430,7 @@ Policy-Delete-v1-00016 ... userRegion={"protocol":"HTTP","method":"drop"} ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... destination=${objectId3}|TSG_FIELD_HTTP_URL - ... isValid=${1} appIdObjects=2 + ... isValid=${1} appIdObjects=${HTTP_ID} ${rescode} ${policyIds} AddPolicies 1 ${policy} v2 Log ${rescode} Comment 删除安全策略 @@ -456,7 +458,7 @@ Policy-Delete-v1-00017 ... userRegion={"protocol":"HTTP","method":"drop"} ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... destination=${objectId3}|TSG_FIELD_HTTP_URL - ... isValid=${1} appIdObjects=2 + ... isValid=${1} appIdObjects=${HTTP_ID} ${rescode} ${policyIds} AddPolicies 1 ${policy} v2 Log ${rescode} Comment 删除安全策略 @@ -550,18 +552,22 @@ Policy-Verify-v1dxy ${objectIds} Set Variable ${EMPTY} Comment 创建对象 ${ipObj} Create Dictionary attributeType=ip attributeName=source - ... attributeValue=192.168.41.67|1|4|6|TSG_SECURITY_SOURCE_ADDR + ... attributeValue=192.168.50.25|1|4|6|TSG_SECURITY_SOURCE_ADDR ${ipObj1} Create Dictionary attributeType=ip attributeName=destination - ... attributeValue=192.168.41.68|1|4|6|TSG_SECURITY_DESTINATION_ADDR - ${stringObj} Create Dictionary attributeType=string tableName=TSG_OBJ_URL protocol=HTTP attributeName=url - ... attributeValue=*baidu.com - ${stringObj1} Create Dictionary attributeType=string protocol=HTTP attributeName=url - ... attributeValue=*jd.com - ${appIdObj} Create Dictionary attributeType=string protocol=HTTP attributeName=app_id - ... attributeValue=http. - ${signatureObj} Create Dictionary attributeType=signature protocol=HTTP attributeName=req_body + ... attributeValue=254.253.252.251|1|4|6|TSG_SECURITY_DESTINATION_ADDR + ${cnObj} Create Dictionary attributeType=string protocol=SSL attributeName=cn + ... attributeValue=verifytest.com + ${subidObj} Create Dictionary attributeType=string protocol=SSL attributeName=subscriberid + ... attributeValue=test25 + ${sniObj} Create Dictionary attributeType=string protocol=SSL attributeName=sni + ... attributeValue=verify.com + ${scnObj} Create Dictionary attributeType=string protocol=SSL attributeName=san + ... attributeValue=verifytest + ${appIdObj} Create Dictionary attributeType=string protocol=SSL attributeName=app_id + ... attributeValue=ssl. + ${signatureObj} Create Dictionary attributeType=signature protocol=SSL attributeName=req_body ... attributeValue=Content-Type|application/json - ${attributes} Create List ${ipObj} ${stringObj} ${appIdObj} ${signatureObj} ${ipObj1} ${stringObj1} + ${attributes} Create List ${ipObj} ${cnObj} ${appIdObj} ${subidObj} ${ipObj1} ${scnObj} ${sniObj} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} diff --git a/01-TestCase/tsg_bfapi/security_policy/Security_Policy_Allow_Test.robot b/01-TestCase/tsg_bfapi/security_policy/Security_Policy_Allow_Test.robot index 16d6ce9..320c4c1 100644 --- a/01-TestCase/tsg_bfapi/security_policy/Security_Policy_Allow_Test.robot +++ b/01-TestCase/tsg_bfapi/security_policy/Security_Policy_Allow_Test.robot @@ -5,6 +5,7 @@ Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Object.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Log.robot Resource ../../../02-Keyword/tsg_bfapi/Common.robot +Resource ../../../03-Variable/ApplicationID.txt Library json Library DateTime *** Variables *** @@ -24,7 +25,7 @@ Allow-test-001 ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} ${objectIds} Create List [${objectId1}] Comment 创建策略 - ${policyDict} Create Dictionary policyName=新建allow单选协 action=allow source=${objectId1}|TSG_SECURITY_SOURCE_ADDR userRegion={"protocol":"HTTP"} isValid=${1} appIdObjects=2 + ${policyDict} Create Dictionary policyName=新建allow单选协 action=allow source=${objectId1}|TSG_SECURITY_SOURCE_ADDR userRegion={"protocol":"HTTP"} isValid=${1} appIdObjects=${HTTP_ID} ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${policyIds}]} @@ -47,7 +48,7 @@ Allow-test-002 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"SSL"} ... isValid=${1} - ... appIdObjects=3 + ... appIdObjects=${SSL_ID} ... policyDesc=autotest ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${policyIds}]} @@ -167,7 +168,7 @@ Allow-test-007 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... isValid=${1} ... userRegion={} - ... appIdObjects=2,3,4,5,6,7 + ... appIdObjects=${HTTP_ID},3,4,5,6,7 ... policyDesc=autotest ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${policyIds}]} @@ -195,7 +196,7 @@ Allow-test-008 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -224,7 +225,7 @@ Allow-test-009 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -261,7 +262,7 @@ Allow-test-010 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId2}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -289,7 +290,7 @@ Allow-test-011 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -318,7 +319,7 @@ Allow-test-012 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -356,7 +357,7 @@ Allow-test-013 ... ... userRegion={"protocol":"HTTP"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId2}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -385,7 +386,7 @@ Allow-test-014 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"SSL"} ... isValid=${1} - ... appIdObjects=3 + ... appIdObjects=${SSL_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_SSL_SNI ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -414,7 +415,7 @@ Allow-test-015 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"SSL"} ... isValid=${1} - ... appIdObjects=3 + ... appIdObjects=${SSL_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_SSL_SNI ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -451,7 +452,7 @@ Allow-test-016 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"SSL"} ... isValid=${1} - ... appIdObjects=3 + ... appIdObjects=${SSL_ID} ... policyDesc=autotest ... filterList=${objectId2}|TSG_FIELD_SSL_SNI ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -480,7 +481,7 @@ Allow-test-017 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"SSL"} ... isValid=${1} - ... appIdObjects=3 + ... appIdObjects=${SSL_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_SSL_SNI ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -509,7 +510,7 @@ Allow-test-018 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"SSL"} ... isValid=${1} - ... appIdObjects=3 + ... appIdObjects=${SSL_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_SSL_SNI ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -547,7 +548,7 @@ Allow-test-019 ... ... userRegion={"protocol":"SSL"} ... isValid=${1} - ... appIdObjects=3 + ... appIdObjects=${SSL_ID} ... policyDesc=autotest ... filterList=${objectId2}|TSG_FIELD_SSL_SNI ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 diff --git a/01-TestCase/tsg_bfapi/security_policy/Security_Policy_Deny_Test.robot b/01-TestCase/tsg_bfapi/security_policy/Security_Policy_Deny_Test.robot index 2a250d8..249de60 100644 --- a/01-TestCase/tsg_bfapi/security_policy/Security_Policy_Deny_Test.robot +++ b/01-TestCase/tsg_bfapi/security_policy/Security_Policy_Deny_Test.robot @@ -5,6 +5,7 @@ Resource ../../../02-Keyword/tsg_bfapi/policy_object/Policy.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Object.robot Resource ../../../02-Keyword/tsg_bfapi/policy_object/Log.robot Resource ../../../02-Keyword/tsg_bfapi/Common.robot +Resource ../../../03-Variable/ApplicationID.txt Library json Library DateTime *** Variables *** @@ -24,7 +25,7 @@ deny-test-001 ${rescode} ${objectId1} AddObject2 ${1} ${objectDict} ${objectIds} Create List [${objectId1}] Comment 创建策略 - ${policyDict} Create Dictionary policyName=新建deny单选协 action=deny source=${objectId1}|TSG_SECURITY_SOURCE_ADDR userRegion={"protocol":"HTTP","method":"drop"} isValid=${1} appIdObjects=2 + ${policyDict} Create Dictionary policyName=新建deny单选协 action=deny source=${objectId1}|TSG_SECURITY_SOURCE_ADDR userRegion={"protocol":"HTTP","method":"drop"} isValid=${1} appIdObjects=${HTTP_ID} ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${policyIds}]} @@ -47,7 +48,7 @@ deny-test-002 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"SSL","method":"drop"} ... isValid=${1} - ... appIdObjects=3 + ... appIdObjects=${SSL_ID} ... policyDesc=autotest ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${policyIds}]} @@ -167,7 +168,7 @@ deny-test-007 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... isValid=${1} ... userRegion={"method":"drop"} - ... appIdObjects=2,3,4,5,6,7 + ... appIdObjects=${HTTP_ID},3,4,5,6,7 ... policyDesc=autotest ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 ${policyIds} Create List {"policyType":"tsg_security","policyIds":[${policyIds}]} @@ -195,7 +196,7 @@ deny-test-008 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -224,7 +225,7 @@ deny-test-009 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -261,7 +262,7 @@ deny-test-010 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId2}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -289,7 +290,7 @@ deny-test-011 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -318,7 +319,7 @@ deny-test-012 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -356,7 +357,7 @@ deny-test-013 ... source=${objectId1}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId2}|TSG_FIELD_HTTP_HOST ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -375,7 +376,7 @@ deny-test-014 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_URL ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -394,7 +395,7 @@ deny-test-015 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_URL ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -413,7 +414,7 @@ deny-test-016 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_URL ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -432,7 +433,7 @@ deny-test-017 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_URL ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -476,7 +477,7 @@ deny-test-018 ... source=${objectId0}|TSG_SECURITY_SOURCE_ADDR ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId5}|TSG_FIELD_HTTP_URL ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -495,7 +496,7 @@ deny-test-019 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -514,7 +515,7 @@ deny-test-020 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -533,7 +534,7 @@ deny-test-021 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -552,7 +553,7 @@ deny-test-022 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -586,7 +587,7 @@ deny-test-023 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId5}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -605,7 +606,7 @@ deny-test-024 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -624,7 +625,7 @@ deny-test-025 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -643,7 +644,7 @@ deny-test-026 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -662,7 +663,7 @@ deny-test-027 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId1}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 @@ -696,7 +697,7 @@ deny-test-028 ... action=deny ... userRegion={"protocol":"HTTP","method":"drop"} ... isValid=${1} - ... appIdObjects=2 + ... appIdObjects=${HTTP_ID} ... policyDesc=autotest ... filterList=${objectId5}|TSG_FIELD_HTTP_REQ_HDR ${rescode} ${policyIds} AddPolicies 1 ${policyDict} v2 diff --git a/01-TestCase/zjj/DLL-DeviceID-Test.robot b/01-TestCase/zjj/DLL-DeviceID-Test.robot index fc63f07..f671177 100644 --- a/01-TestCase/zjj/DLL-DeviceID-Test.robot +++ b/01-TestCase/zjj/DLL-DeviceID-Test.robot @@ -8,6 +8,7 @@ Resource ../../02-Keyword/tsg_bfapi/LogVariable.robot Resource ../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../02-Keyword/tsg_adc/FileOperation.robot Resource ../../02-Keyword/tsg_bfapi/policy_object/Policy.robot +Resource ../../03-Variable/ApplicationID.txt ##注意此文件中的测试用例需要修改ManagePolicyBocy.robot的内容EffectiveRangeValueType3函数的#${obj} Create Dictionary tag=location value=${valueList} 替换为${obj} Create Dictionary tag=device_id value=${valueList} *** Variables *** @@ -22,7 +23,7 @@ DLL-DeviceID-SecurityPolicy-Deny-Http-00001 ${objectids} set Variable ${objectId} #鍒涘缓 Deny 鎼厤Allow Comment 鍒涘缓瀹夊叏绛栫暐 - ${policyDict} Create Dictionary policyName=DLL-DeviceID-SecurityPolicy-Deny-Http-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} effectiveRange=device_1 filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=2 + ${policyDict} Create Dictionary policyName=DLL-DeviceID-SecurityPolicy-Deny-Http-00001 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} effectiveRange=device_1 filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyIds1} set Variable {"policyType":"tsg_security","policyIds":[${policyId}]} @@ -48,7 +49,7 @@ DLL-DeviceID-SecurityPolicy-Deny-Http-00002 ${objectids} set Variable ${objectId} #鍒涘缓 Deny 鎼厤Allow Comment 鍒涘缓瀹夊叏绛栫暐 - ${policyDict} Create Dictionary policyName=DLL-DeviceID-SecurityPolicy-Deny-Http-000021 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} effectiveRange=device_100 filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=2 + ${policyDict} Create Dictionary policyName=DLL-DeviceID-SecurityPolicy-Deny-Http-000021 policyType=tsg_security policyDesc=autotest action=deny userRegion={"protocol":"HTTP","method":"drop"} effectiveRange=device_100 filterList=${objectId}|TSG_FIELD_HTTP_HOST isValid=${1} appIdObjects=${HTTP_ID} log ${policyDict} ${rescode} ${policyId} AddPolicies 1 ${policyDict} v2 ${policyIds1} set Variable {"policyType":"tsg_security","policyIds":[${policyId}]}