cli相关文件更改大小写适应linux;

添加oam接口
中间件接口更新,添加限流测试
This commit is contained in:
dongxiaoyan
2020-06-11 09:26:43 +08:00
parent 2b35194cdd
commit b36f413d16
30 changed files with 3380 additions and 46 deletions

View File

@@ -11,7 +11,7 @@ ObjectParamsOpertion
... 描述入口opAction参数固定为'add'
... 其它参数默认值见../../03-Variable/PolicyObjectDefault.txt
[Arguments] ${returnData} ${objectList}
[Arguments] ${returnData} ${objectList} ${opAction}
${emptyList} Create List
${returnDict} Create Dictionary
# 断言必传参数
@@ -45,14 +45,16 @@ ObjectParamsOpertion
${return} ${subObjectIds} Run Keyword And Ignore Error Set Variable ${objectList}[subObjectIds]
${subObjectIdsV} Run Keyword If "${return}"!="FAIL" and "${subObjectIds}"!="${EMPTY}" and "${subObjectIds}"!="${None}" Evaluate list(map(int, re.split('[,]', '${subObjectIds}'))) re
... ELSE Set Variable ${emptyList}
${return} ${objectId} Run Keyword And Ignore Error Set Variable ${objectList}[objectId]
Run Keyword If "${return}"=="FAIL" or "${objectId}"=="${EMPTY}" Set To Dictionary ${returnDict} objectId=${EMPTY}
... ELSE Set To Dictionary ${returnDict} objectId=${objectId}
Set To Dictionary ${returnDict} subObjectIds=${subObjectIdsV}
# 处理AddItemList
ManageAddItemList ${objectList} ${returnDict}
# 转为json结构并返回
${dict} Create Dictionary opAction=add returnData=${returnData} objectList=${returnDict}
${dict} Create Dictionary opAction=${opAction} returnData=${returnData} objectList=${returnDict}
${json} json.Dumps ${dict} ensure_ascii=False
Log Object_Request_Body-${json}
[Return] ${json}
@@ -232,6 +234,7 @@ OtherParams
${return} ${itemDesc} Run Keyword And Ignore Error Set Variable ${values}[6]
Run Keyword If "${return}"!="FAIL" and "${itemDesc}"!="${EMPTY}" Set To Dictionary ${obj} itemDesc=${itemDesc}