gfwleak/dongxiaoyan-tsg-autotest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、公共文件添加日志查询次数变量${logfornumber}2、修改安全策略allow协议http和ssl全流程用例3、新建log验证关键字（循环验证）

Browse Source
This commit is contained in:
lyf
2021-04-28 18:49:45 +08:00
parent 253793312b
commit c6fff1f700
6 changed files with 534 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
02-Keyword/tsg_bfapi/LogVariable.robot
View File

@@ -1,60 +1,93 @@
*** Settings ***
Resource ../../03-Variable/BifangApiVariable.txt
Resource LogSchema.robot
Library REST http://${host}:${port}
Library RequestsLibrary
Library OperatingSystem
Library Collections
Library string
*** Keywords ***
GetLogList
[Arguments] ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
${logCondition} GetLogCondition ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id}
log ${logCondition}
${LogListResponse} PostRemoteData /${version}/log/list ${logCondition}
Should Be Equal As Strings ${LogListResponse.status_code} 200
${returnData} To Json ${LogListResponse.content}
${responseCode} Get From Dictionary ${returnData} code
Log ${responseCode}
Should Be Equal ${responseCode} ${200} security_event_log \ \ test query list failed
log this time request security_event_log \ table logRecord \ : ${LogListResponse.content}
${a} Set Variable this time request security_event_log \ table logRecord \ : ${LogListResponse.content}
log ${a}
${log} Set Variable ${LogListResponse.json()}[data][list]
FOR ${logs} IN ${log}
log ${logs}
END
log %%%%%%%%%%%%%%%%%%%%%%%%${logs}
Should Contain ${logs}"" ${client_ip}
Should Contain ${logs}"" ${policy_id}
Should Contain ${logs}"" ${parmkey}
Should Contain ${logs}"${parmkey}" ${parmvalue}
GetLogListSize
[Documentation]
... 描述：ProxyPinning
...
[Arguments] ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
${logCondition} GetALLLogCondition ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} 10000 1
log ${logCondition}
${LogListResponse} PostRemoteData /${version}/log/list ${logCondition}
Should Be Equal As Strings ${LogListResponse.status_code} 200
${returnData} To Json ${LogListResponse.content}
${data} Get From Dictionary ${returnData} data
${len} Get Length ${data}[list]
[Return] ${len}
GetLogCount
[Arguments] ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
${logCondition} GetALLLogCondition ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} 10000 1
${LogListResponse} PostRemoteData /${version}/log/count ${logCondition}
Should Be Equal As Strings ${LogListResponse.status_code} 200
${returnData} To Json ${LogListResponse.content}
${len} Set Variable ${LogListResponse.json()}[data][total]
#${len} Get From Dictionary ${returnData} total
[Return] ${len}
*** Settings ***
Resource ../../03-Variable/BifangApiVariable.txt
Resource LogSchema.robot
Library REST http://${host}:${port}
Library RequestsLibrary
Library OperatingSystem
Library Collections
Library string
Library ../../04-CustomLibrary/Custometest/log_contrast.py
*** Keywords ***
GetLogList_new
[Arguments] ${logType} ${startTime} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
FOR ${i} IN RANGE ${logfornumber}
Sleep ${policyLogVerificationSleepSeconds}s
${endtime} Get Time
${logs} GetLogList_new1 ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
${returnvalue} log_contrast ${logs} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
${trueorfalse} Run Keyword If "${returnvalue}"=="true" set variable true
... ELSE set variable false
Run Keyword If "${returnvalue}"=="true" Exit for loop
END
[Return] ${trueorfalse}
GetLogList_new1
[Arguments] ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
${logCondition} GetLogCondition ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id}
log ${logCondition}
${LogListResponse} PostRemoteData /${version}/log/list ${logCondition}
Should Be Equal As Strings ${LogListResponse.status_code} 200
${returnData} To Json ${LogListResponse.content}
${responseCode} Get From Dictionary ${returnData} code
Log ${responseCode}
Should Be Equal ${responseCode} ${200} security_event_log \ \ test query list failed
log this time request security_event_log \ table logRecord \ : ${LogListResponse.content}
${a} Set Variable this time request security_event_log \ table logRecord \ : ${LogListResponse.content}
log ${a}
${log} Set Variable ${LogListResponse.json()}[data][list]
FOR ${logs} IN ${log}
log ${logs}
END
[Return] ${logs}
GetLogList
[Arguments] ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
${logCondition} GetLogCondition ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id}
log ${logCondition}
${LogListResponse} PostRemoteData /${version}/log/list ${logCondition}
Should Be Equal As Strings ${LogListResponse.status_code} 200
${returnData} To Json ${LogListResponse.content}
${responseCode} Get From Dictionary ${returnData} code
Log ${responseCode}
Should Be Equal ${responseCode} ${200} security_event_log \ \ test query list failed
log this time request security_event_log \ table logRecord \ : ${LogListResponse.content}
${a} Set Variable this time request security_event_log \ table logRecord \ : ${LogListResponse.content}
log ${a}
${log} Set Variable ${LogListResponse.json()}[data][list]
FOR ${logs} IN ${log}
log ${logs}
END
log %%%%%%%%%%%%%%%%%%%%%%%%${logs}
Should Contain ${logs}"" ${client_ip}
Should Contain ${logs}"" ${policy_id}
Should Contain ${logs}"" ${parmkey}
Should Contain ${logs}"${parmkey}" ${parmvalue}
GetLogListSize
[Documentation]
... 描述：ProxyPinning
...
[Arguments] ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
${logCondition} GetALLLogCondition ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} 10000 1
log ${logCondition}
${LogListResponse} PostRemoteData /${version}/log/list ${logCondition}
Should Be Equal As Strings ${LogListResponse.status_code} 200
${returnData} To Json ${LogListResponse.content}
${data} Get From Dictionary ${returnData} data
${len} Get Length ${data}[list]
[Return] ${len}
GetLogCount
[Arguments] ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} ${parmkey} ${parmvalue}
${logCondition} GetALLLogCondition ${logType} ${startTime} ${endTime} ${client_ip} ${policy_id} 10000 1
${LogListResponse} PostRemoteData /${version}/log/count ${logCondition}
Should Be Equal As Strings ${LogListResponse.status_code} 200
${returnData} To Json ${LogListResponse.content}
${len} Set Variable ${LogListResponse.json()}[data][total]
#${len} Get From Dictionary ${returnData} total
[Return] ${len}

2
02-Keyword/tsg_bfapi/policy_object/Application.robot
View File

@@ -39,7 +39,7 @@ GetAppIdObjects
[Return] ${appidobject}
DeletePolicyAndObjectAndApplicationAndSignature
[Arguments] ${policyids} ${objectids} ${appids} ${signatureId}
[Arguments] ${policyids} ${objectids} ${appids}=${EMPTY} ${signatureId}=${EMPTY}
#删除和对象
#2020-09-01修改，引用DeletePolicyAndGroupObject，避免分别维护并兼容之前用例
Run Keyword If "${policyids}"=="${EMPTY}" log no policyids to del