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

Merge branch 'develop' of https://git.mesalab.cn/dongxiaoyan/tsg_autotest.git into develop

Browse Source
This commit is contained in:
lyf
2020-07-20 18:39:53 +08:00
parent c8ee6b01d9 75ac77362a
commit 9bfda23583
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
02-Keyword/tsg_bfapi/policy_object/Log.robot
View File

@@ -8,6 +8,9 @@ Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/Functional
Resource ../Common.robot
*** Variables ***
${logUrl} /log
${arraySplitor} ,
${itemSplitor} |
${valueSplitor} ^
*** Keywords ***
GetLogSchema
[Documentation]
@@ -86,9 +89,9 @@ QueryLogs
... 处理 order by
[Arguments] ${orderBy}
${orderByList} Create List
@{orderByArr} Split String ${orderBy} ,
@{orderByArr} Split String ${orderBy} ${arraySplitor}
FOR ${order} IN @{orderByArr}
@{orderByArr} Split String ${order} |
@{orderByArr} Split String ${order} ${itemSplitor}
${dict} Create Dictionary field=${orderByArr}[0] asc=${orderByArr}[1]
Append To List ${orderByList} ${dict}
END
@@ -98,9 +101,9 @@ QueryLogs
... 处理fields
[Arguments] ${fields}
${fieldsList} Create List
@{fieldsArr} Split String ${fields} ,
@{fieldsArr} Split String ${fields} ${arraySplitor}
FOR ${field} IN @{fieldsArr}
@{fieldArr} Split String ${field} |
@{fieldArr} Split String ${field} ${itemSplitor}
${dict} Create Dictionary name=${fieldArr}[0] type=${fieldArr}[1]
${len} Get Length ${fieldArr}
# batch时有lang字段
@@ -113,10 +116,10 @@ QueryLogs
... 处理conditions
[Arguments] ${conditions}
${conditionsList} Create List
@{conditionsArr} Split String ${conditions} ,
@{conditionsArr} Split String ${conditions} ${arraySplitor}
FOR ${condition} IN @{conditionsArr}
@{conditionArr} Split String ${condition} |
@{value} Split String ${conditionArr}[3] ^
@{conditionArr} Split String ${condition} ${itemSplitor}
@{value} Split String ${conditionArr}[3] ${valueSplitor}
${type} Set Variable ${conditionArr}[1]
${value} Run Keyword If "${type}"=="int" or "${type}"=="long" toDigitList ${value} ${type}
... ELSE Set Variable ${value}
@@ -130,8 +133,8 @@ toDigitList
[Arguments] ${values} ${type}
${list} Create List
FOR ${var} IN @{values}
${var} Run Keyword If "${type}"=="int" Evaluate int('${var}')
... ELSE Evaluate long('${var}')
#wx-fix python3中没有long类型，整形只有int类型，可以当做long类型使用
${var} Evaluate int('${var}')
Append To List ${list} ${var}
END
[Return] ${list}