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

修改证书关键字，添加证书类型变量

Browse Source
This commit is contained in:
朱明明
2020-06-02 19:17:49 +08:00
parent c03a7c9358
commit ff0652739c
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot
View File

@@ -119,27 +119,24 @@ CreatePolicyFileNoFile
[Return] ${response} [Return] ${response}
CreatePolicyMutipartFile CreatePolicyMutipartFile
[Documentation] [Arguments] ${url} ${filePath} ${pubFileName} ${priFileName} ${keyringType} @{header}
... 必传参数：url、filePath（文件路径）、pubFileName（证书文件名）、priFileName（私钥文件名） [Documentation] 必传参数：url、filePath（文件路径）、pubFileName（证书文件名）、priFileName（私钥文件名）,keyringType(证书类型)
... 可选参数：header（不传时使用默认值） ... 可选参数：header（不传时使用默认值）
[Arguments] ${url} ${filePath} ${pubFileName} ${priFileName} @{header}
${suffix} Generate Random String ${suffix} Generate Random String
${certName} Catenate SEPARATOR=_ test ${suffix} ${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} ${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 ... ELSE Get From List ${header} 0
${pubFile} Evaluate open(r"${path}/${filePath}${pubFileName}",'rb') ${pubFile} Evaluate open(r"${path}/${filePath}${pubFileName}",'rb')
${priFile} Evaluate open(r"${path}/${filePath}${priFileName}",'rb') ${priFile} Evaluate open(r"${path}/${filePath}${priFileName}",'rb')
${fileDict} Create Dictionary publicFile ${pubFile} ${fileDict} Create Dictionary publicFile ${pubFile}
Set To Dictionary ${fileDict} privateFile ${priFile} Set To Dictionary ${fileDict} privateFile ${priFile}
${requestData} Create Dictionary name="publicFile" filename="${pubFileName}" Content-Type=application/octet-stream ${requestData} Create Dictionary name="publicFile" filename="${pubFileName}" Content-Type=application/octet-stream
Set To Dictionary ${requestData} name privateFile Set To Dictionary ${requestData} name privateFile
Set To Dictionary ${requestData} filename ${priFileName} Set To Dictionary ${requestData} filename ${priFileName}
Set To Dictionary ${requestData} Content-Type application/octet-stream Set To Dictionary ${requestData} Content-Type application/octet-stream
${fileDesc} Create Dictionary File-Desc=${header} ${fileDesc} Create Dictionary File-Desc=${header}
${content} UpFilePostRequest ${url} ${requestData} ${fileDict} ${fileDesc} ${content} UpFilePostRequest ${url} ${requestData} ${fileDict} ${fileDesc}
${msg} Set Variable ${content['msg']} ${msg} Set Variable ${content['msg']}
${list} Set Variable ${content['data']['list']} ${list} Set Variable ${content['data']['list']}
${keyringId} Set Variable ${list[0]['keyringId']} ${keyringId} Set Variable ${list[0]['keyringId']}
${keyringName} Set Variable ${list[0]['keyringName']} ${keyringName} Set Variable ${list[0]['keyringName']}