diff --git a/02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot b/02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot index 38ef7b1..9538d5f 100644 --- a/02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot +++ b/02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot @@ -119,27 +119,24 @@ CreatePolicyFileNoFile [Return] ${response} CreatePolicyMutipartFile - [Documentation] - ... 必传参数:url、filePath(文件路径)、pubFileName(证书文件名)、priFileName(私钥文件名) + [Arguments] ${url} ${filePath} ${pubFileName} ${priFileName} ${keyringType} @{header} + [Documentation] 必传参数:url、filePath(文件路径)、pubFileName(证书文件名)、priFileName(私钥文件名),keyringType(证书类型) ... 可选参数:header(不传时使用默认值) - [Arguments] ${url} ${filePath} ${pubFileName} ${priFileName} @{header} ${suffix} Generate Random String ${certName} Catenate SEPARATOR=_ test ${suffix} - ${header} Run Keyword If ${header}==[] Set Variable {"isValid":1,"opAction":"add","returnData":1,"keyringName":"${certName}","keyringType":"root","reissueExpiryHour":0,"crl":"null","publicKeyAlgo":"rsa1024","keyringId":null,"includeRoot":0} - ... ELSE Get From List ${header} 0 - + ${header} Run Keyword If ${header}==[] Set Variable {"isValid":1,"opAction":"add","returnData":1,"keyringName":"${certName}","keyringType":"${keyringType}","reissueExpiryHour":0,"crl":"null","publicKeyAlgo":"rsa1024","keyringId":null,"includeRoot":0} + ... ELSE Get From List ${header} 0 ${pubFile} Evaluate open(r"${path}/${filePath}${pubFileName}",'rb') ${priFile} Evaluate open(r"${path}/${filePath}${priFileName}",'rb') - ${fileDict} Create Dictionary publicFile ${pubFile} - Set To Dictionary ${fileDict} privateFile ${priFile} + ${fileDict} Create Dictionary publicFile ${pubFile} + Set To Dictionary ${fileDict} privateFile ${priFile} ${requestData} Create Dictionary name="publicFile" filename="${pubFileName}" Content-Type=application/octet-stream Set To Dictionary ${requestData} name privateFile Set To Dictionary ${requestData} filename ${priFileName} Set To Dictionary ${requestData} Content-Type application/octet-stream ${fileDesc} Create Dictionary File-Desc=${header} - ${content} UpFilePostRequest ${url} ${requestData} ${fileDict} ${fileDesc} - ${msg} Set Variable ${content['msg']} + ${msg} Set Variable ${content['msg']} ${list} Set Variable ${content['data']['list']} ${keyringId} Set Variable ${list[0]['keyringId']} ${keyringName} Set Variable ${list[0]['keyringName']}