diff --git a/01-TestCase/tsg_bfapi/policy_object/PolicyObjectTests.robot b/01-TestCase/tsg_bfapi/policy_object/PolicyObjectTests.robot index 8c22e40..276ca79 100644 --- a/01-TestCase/tsg_bfapi/policy_object/PolicyObjectTests.robot +++ b/01-TestCase/tsg_bfapi/policy_object/PolicyObjectTests.robot @@ -438,9 +438,11 @@ Policy-Export-v1-00019 Policy-Verify-v1-00020 ${objectIds} Set Variable ${EMPTY} Comment 创建对象 - ${ipValue} Create Dictionary clientIp=192.168.41.67 clientPort=${1} serverIp=192.168.41.67 serverPort=${1} + ${ipValue} Create Dictionary ip=192.168.41.67 port=${1} ... addrType=${4} protocol=${6} - ${ipObj} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=ip + ${ipObj} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=source + ... attributeValue=${ipValue} + ${ipObj1} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=destination ... attributeValue=${ipValue} ${stringValue} Create Dictionary string=*baidu.com ${stringObj} Create Dictionary attributeType=string tableName=TSG_OBJ_URL protocol=HTTP attributeName=url @@ -448,36 +450,40 @@ Policy-Verify-v1-00020 ${appIdValue} Create Dictionary string=http. ${appIdObj} Create Dictionary attributeType=string protocol=HTTP attributeName=app_id ... attributeValue=${appIdValue} - ${attributes} Create List ${ipObj} ${stringObj} ${appIdObj} + ${attributes} Create List ${ipObj} ${stringObj} ${appIdObj} ${ipObj1} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} Policy-Verify-v1-00021 ${objectIds} Set Variable ${EMPTY} Comment 创建对象 - ${ipObj} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=ip - ... attributeValue={"clientIp":"192.168.41.67","clientPort":1,"serverIp":"192.168.41.67","serverPort":1,"addrType":4,"protocol":6} + ${ipObj} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=source + ... attributeValue={"ip":"192.168.41.67","port":1,"addrType":4,"protocol":6} + ${ipObj1} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=destination + ... attributeValue={"ip":"192.168.41.67","port":1,"addrType":4,"protocol":6} ${stringValue} Create Dictionary string=*baidu.com ${stringObj} Create Dictionary attributeType=string tableName=TSG_OBJ_URL protocol=HTTP attributeName=url ... attributeValue=${stringValue} ${appIdValue} Create Dictionary string=http. ${appIdObj} Create Dictionary attributeType=string protocol=HTTP attributeName=app_id ... attributeValue=${appIdValue} - ${attributes} Create List ${ipObj} ${stringObj} ${appIdObj} + ${attributes} Create List ${ipObj} ${stringObj} ${appIdObj} ${ipObj1} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} Policy-Verify-v1-00022 ${objectIds} Set Variable ${EMPTY} Comment 创建对象 - ${ipObj} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=ip - ... attributeValue={"clientIp":"192.168.41.67","clientPort":1,"serverIp":"192.168.41.67","serverPort":1,"addrType":4,"protocol":6} + ${ipObj} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=destination + ... attributeValue={"ip":"192.168.41.67","port":1,"addrType":4,"protocol":6} + ${ipObj1} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=source + ... attributeValue={"ip":"192.168.41.67","port":1,"addrType":4,"protocol":6} ${stringObj} Create Dictionary attributeType=string tableName=TSG_OBJ_URL protocol=HTTP attributeName=url ... attributeValue={'string':'*baidu.com'} ${appIdValue} Create Dictionary string=http. ${appIdObj} Create Dictionary attributeType=string protocol=HTTP attributeName=app_id ... attributeValue=${appIdValue} - ${attributes} Create List ${ipObj} ${stringObj} ${appIdObj} + ${attributes} Create List ${ipObj} ${stringObj} ${appIdObj} ${ipObj1} ${verifySession} Create Dictionary attributes=${attributes} ${verifyList} Create Dictionary policyType=tsg_security verifySession=${verifySession} ${rescode} ${resData} VerifyPolicies ${verifyList} @@ -485,8 +491,8 @@ Policy-Verify-v1-00022 Policy-Verify-v1-00023 ${objectIds} Set Variable ${EMPTY} Comment 创建对象 - ${ipObj} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=ip - ... attributeValue=192.168.41.67|1|192.168.41.67|1|4|6 + ${ipObj} Create Dictionary attributeType=ip tableName=TSG_OBJ_IP_ADDR protocol=HTTP attributeName=source + ... attributeValue=192.168.41.67|1|4|6 ${stringObj} Create Dictionary attributeType=string tableName=TSG_OBJ_URL protocol=HTTP attributeName=url ... attributeValue=*baidu.com ${appIdObj} Create Dictionary attributeType=string protocol=HTTP attributeName=app_id diff --git a/02-Keyword/tsg_bfapi/policy_object/Policy.robot b/02-Keyword/tsg_bfapi/policy_object/Policy.robot index 7b582f5..e1bcc8b 100644 --- a/02-Keyword/tsg_bfapi/policy_object/Policy.robot +++ b/02-Keyword/tsg_bfapi/policy_object/Policy.robot @@ -161,7 +161,7 @@ VerifyPolicies ... atrributeValue字段可为三种格式 ... 1:dict ... 2:json - ... 3.字符串，ip的value对应格式为clientIp|clientPort|serverIp|serverPort|addrType|protocol,注意addrType,protocol为数字 + ... 3.字符串，ip的value对应格式为ip|port|addrType|protocol,注意addrType,protocol为数字 ... signature 的value对应格式为district|string ... string的格式就是string ... 以上三种方式可以混合搭配使用 diff --git a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot index 89b031d..c9a3553 100644 --- a/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot +++ b/02-Keyword/tsg_bfapi/policy_object/ProcessPolicyBody.robot @@ -390,7 +390,7 @@ VerifyPolicyObj [Arguments] ${verifyObj} Log To Console Call VerifyPolicyObj ${emptyList} Create List - ${return} ${policyType} Run Keyword And Ignore Error Get From Dictionary ${verifyObj} policyType + ${return} ${policyType} Run Keyword And Ignore Error Set Variable ${verifyObj['policyType']} #Should Not Be Empty ${policyType} ${verifySession} Get From Dictionary ${verifyObj} verifySession Should Not Be Empty ${verifySession} @@ -398,10 +398,10 @@ VerifyPolicyObj Should Not Be Empty ${attributes} FOR ${attribute} IN @{attributes} ${attributeType} Get From Dictionary ${attribute} attributeType - ${return} ${tableName} Run Keyword And Ignore Error Get From Dictionary ${attribute} tableName - ${return} ${protocol} Run Keyword And Ignore Error Get From Dictionary ${attribute} protocol - ${attributeName} Get From Dictionary ${attribute} attributeName - ${attributeValue} Get From Dictionary ${attribute} attributeValue + ${return} ${tableName} Run Keyword And Ignore Error Set Variable ${attribute['tableName']} + ${return} ${protocol} Run Keyword And Ignore Error Set Variable ${attribute['protocol']} + ${attributeName} Get From Dictionary ${attribute} attributeName + ${attributeValue} Get From Dictionary ${attribute} attributeValue #将json转换为dict ${attributeValue} Convert To String ${attributeValue} ${start} Get Regexp Matches ${attributeValue} ^{\" @@ -427,34 +427,32 @@ ManageIpAttributeValue [Arguments] ${attributeValue} ${attributeName} ${type} Run Keyword And Return If "${type}"=="str" ExtractIpAttributeValue ${attributeValue} ${dict} Create Dictionary - ${return} ${clientIp} Run Keyword And Ignore Error Get From Dictionary ${attributeValue} clientIp - Run Keyword If "${clientIp}"=="${EMPTY}" and "${attributeName}"=="src_ip" Should Not Be Empty ${clientIp} - Set To Dictionary ${dict} clientIp=${clientIp} - ${return} ${clientPort} Run Keyword And Ignore Error Get From Dictionary ${attributeValue} clientPort - Run Keyword If "${clientPort}"=="${EMPTY}" and "${attributeName}"=="src_ip" Should Not Be Empty ${clientPort} - Set To Dictionary ${dict} clientPort=${clientPort} - ${return} ${serverIp} Run Keyword And Ignore Error Get From Dictionary ${attributeValue} serverIp - Run Keyword If "${serverIp}"=="${EMPTY}" and "${attributeName}"=="dest_ip" Should Not Be Empty ${serverIp} - Set To Dictionary ${dict} serverIp=${serverIp} - ${return} ${serverPort} Run Keyword And Ignore Error Get From Dictionary ${attributeValue} serverPort - Run Keyword If "${serverPort}"=="${EMPTY}" and "${attributeName}"=="dest_ip" Should Not Be Empty ${serverPort} - Set To Dictionary ${dict} serverPort=${serverPort} - ${return} ${addrType} Run Keyword And Ignore Error Get From Dictionary ${attributeValue} addrType - Should Be Equal As Strings ${return} PASS + ${return} ${ip} Run Keyword And Ignore Error Set Variable ${attributeValue['ip']} + Run Keyword If "${ip}"=="${EMPTY}" and "${attributeName}"=="source" Should Not Be Empty ${ip} + Run Keyword If "${ip}"=="${EMPTY}" and "${attributeName}"=="destination" Should Not Be Empty ${ip} + Set To Dictionary ${dict} ip=${ip} + ${return} ${port} Run Keyword And Ignore Error Set Variable ${attributeValue['port']} + Run Keyword If "${port}"=="${EMPTY}" and "${attributeName}"=="source" Should Not Be Empty ${port} + Run Keyword If "${port}"=="${EMPTY}" and "${attributeName}"=="destination" Should Not Be Empty ${port} + Set To Dictionary ${dict} port=${port} + ${return} ${addrType} Run Keyword And Ignore Error Set Variable ${attributeValue['addrType']} + Run Keyword If "${port}"=="${EMPTY}" and "${attributeName}"=="source" Should Not Be Empty ${addrType} + Run Keyword If "${port}"=="${EMPTY}" and "${attributeName}"=="destination" Should Not Be Empty ${addrType} Set To Dictionary ${dict} addrType=${addrType} - ${return} ${protocol} Run Keyword And Ignore Error Get From Dictionary ${attributeValue} protocol - Should Be Equal As Strings ${return} PASS + ${return} ${protocol} Run Keyword And Ignore Error Set Variable ${attributeValue['protocol']} + Run Keyword If "${port}"=="${EMPTY}" and "${attributeName}"=="source" Should Not Be Empty ${protocol} + Run Keyword If "${port}"=="${EMPTY}" and "${attributeName}"=="destination" Should Not Be Empty ${protocol} Set To Dictionary ${dict} protocol=${protocol} [Return] ${dict} ExtractIpAttributeValue [Arguments] ${attributeValue} ${list} Split String ${attributeValue} | ${len} Get Length ${list} - Should Be Equal As Integers ${len} 6 - ${addrType} Evaluate int(${list}[4]) - ${protocol} Evaluate int(${list}[5]) - ${dict} Create Dictionary clientIp=${list}[0] clientPort=${list}[1] serverIp=${list}[2] - ... serverPort=${list}[3] addrType=${addrType} protocol=${protocol} + Should Be Equal As Integers ${len} 4 + ${addrType} Evaluate int(${list}[2]) + ${protocol} Evaluate int(${list}[3]) + ${dict} Create Dictionary ip=${list}[0] port=${list}[1] + ... addrType=${addrType} protocol=${protocol} [Return] ${dict} ManageSignatureAttributeValue [Arguments] ${attributeValue} ${type}