diff --git a/02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot b/02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot index a0736d1..38ef7b1 100644 --- a/02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot +++ b/02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot @@ -206,14 +206,15 @@ TeardownDelete CreatePolicyFile4 - [Arguments] ${url} ${filePath} ${objectDict} - ${binFile} Evaluate open(r"${path}/${filePath}${objectDict}[contentName]",'rb') + [Arguments] ${url} ${filePath} ${fileName} ${objectDict} + [Timeout] + ${binFile} Evaluate open(r"${path}/${filePath}${fileName}",'rb') ${fileDict} Create Dictionary file=${binFile} - ${requestData} Create Dictionary name="file" filename="${objectDict}[contentName]" Content-Type=application/octet-stream + ${requestData} Create Dictionary name="file" filename="${fileName}" Content-Type=application/octet-stream ${suffix} Generate Random String ${profileName} Catenate SEPARATOR=_ test ${suffix} log ${objectDict} - ${string} Convert To String ${objectDict} + ${string} Convert To String ${objectDict} ${fileDesc} Create Dictionary File-Desc=${string} log ${fileDesc}[File-Desc] ${content} UpFilePostRequest ${url} ${requestData} ${fileDict} ${fileDesc} @@ -224,5 +225,18 @@ CreatePolicyFile4 ${response} Create Dictionary msg=${msg} profileId=${profileId} profileName=${profileName} Log add operation:${msg} Log profileId:${profileId} + [Return] ${response} - +CreateRequest + [Arguments] ${url} ${data} + [Documentation] 必传参数:url + ... 可选参数:data(不传时使用默认值) + ${content} Post-Request ${url} ${data} + ${msg} Set Variable ${content['msg']} + ${list} Set Variable ${content['data']['list']} + ${profileId} Set Variable ${list[0]['profileId']} + ${profileName} Set Variable ${list[0]['profileName']} + ${response} Create Dictionary msg=${msg} profileId=${profileId} profileName=${profileName} + Log add operation:${msg} + Log profileId:${profileId} + [Return] ${response}