From 5833f8f4fe870fb91b2ab91b85482801825f5d60 Mon Sep 17 00:00:00 2001 From: liuyuanfang Date: Fri, 19 Jun 2020 11:43:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9Teardown=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_bfapi/offline_stat_report/ApiRequest1.robot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/02-Keyword/tsg_bfapi/offline_stat_report/ApiRequest1.robot b/02-Keyword/tsg_bfapi/offline_stat_report/ApiRequest1.robot index 1243871..aa858ad 100644 --- a/02-Keyword/tsg_bfapi/offline_stat_report/ApiRequest1.robot +++ b/02-Keyword/tsg_bfapi/offline_stat_report/ApiRequest1.robot @@ -17,11 +17,11 @@ TeardownDelete ${data3} Create Dictionary jobIds=${ids2} ${data4} Create Dictionary resultIds=${ids3} Run Keyword If "${reportId}"=="${EMPTY}" log no report to delete - ... ELSE BaseEditRequestOK ${report_url} ${data3} + ... ELSE BaseDeleteRequestOK ${report_url} ${data3} Run Keyword If "${chartId}"=="${EMPTY}" log no chart to delete - ... ELSE BaseEditRequestOK ${chart_url} ${data2} + ... ELSE BaseDeleteRequestOK ${chart_url} ${data2} Run Keyword If "${datasetId}"=="${EMPTY}" log no dataset to delete - ... ELSE BaseEditRequestOK ${dataset_url} ${data1} + ... ELSE BaseDeleteRequestOK ${dataset_url} ${data1} Run Keyword If "${resultId}"=="${EMPTY}" log no dataset to delete - ... ELSE BaseEditRequestOK ${result_url} ${data4} + ... ELSE BaseDeleteRequestOK ${result_url} ${data4} From e3840203052e3538bd72be552b646f45da50e0c1 Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Fri, 19 Jun 2020 11:44:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AD=99=E5=A7=9C?= =?UTF-8?q?=E6=9C=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tsg_bfapi/geolocation/DictCrease.robot | 51 +++++++++++++++++++ .../geolocation/DictDetailSearch.robot | 48 +++++++++++++++++ .../tsg_bfapi/geolocation/DictSearch.robot | 45 ++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 01-TestCase/tsg_bfapi/geolocation/DictCrease.robot create mode 100644 01-TestCase/tsg_bfapi/geolocation/DictDetailSearch.robot create mode 100644 01-TestCase/tsg_bfapi/geolocation/DictSearch.robot diff --git a/01-TestCase/tsg_bfapi/geolocation/DictCrease.robot b/01-TestCase/tsg_bfapi/geolocation/DictCrease.robot new file mode 100644 index 0000000..01159df --- /dev/null +++ b/01-TestCase/tsg_bfapi/geolocation/DictCrease.robot @@ -0,0 +1,51 @@ +*** Settings *** +Test Teardown TeardownDelete ${url} geoNameIds ${geoNameId} +Force Tags tsg_bf_api dict_create #Suite Teardown Delete All Sessions +Library String +Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot +Resource ../../../03-Variable/BifangApiVariable.txt +Resource ../../../03-Variable/Policy_Objects_Module.txt +Library Custometest + +*** Variables *** +${url} /${version}/geolocation/dict +${geoNameId} ${EMPTY} + +*** Test Cases *** +dictcrease-01 + ${objectedit} Create Dictionary geoNameId=1001 + Comment 打印需要修改的json内容 + log ${objectedit} + ${objectDict} Jsoneditmanu ${settig_proxy_profiles_geolocation_dictcrease} ${objectedit} + log ${objectDict} + ${response} CreateRequest_locationId ${url} ${objectDict} + # 查询 + ${geoNameId} Get From Dictionary ${response} geoNameId + #log ${geoNameId} + #${locationId} Get From Dictionary ${response} locationId + #log ${locationId} + QueryPolicyFile ${url} geoNameId=${geoNameId} + #QueryPolicyFile ${url} locationId=${locationId} + # 修改 + ${reqData_edit} Set Variable {"opAction":"update","returnData":1,"list":[{"locationId":1,"addrType":4,"startIp":"221.178.125.0","endIp":"221.178.125.255","geoNameId":"1001","latitude":22.4984,"longitude":112.9947,"coords":1000,"language":"Chinese (zh-CN)","continentAbbr":"AS","continentFull":"Asia","countryAbbr":"CN","countryFull":"China","provinceAbbr":"GD","provinceFull":"Guangdong","cityFull":"shenzhen","timeZone":"Asia/Shanghai"}]} + UpdatePolicyFile2 ${url} ${reqData_edit} + [Teardown] log to console ${\n} + +dictcrease-02 + ${objectedit} Create Dictionary geoNameId=1001 + Comment 打印需要修改的json内容 + log ${objectedit} + ${objectDict} Jsoneditmanu ${settig_proxy_profiles_geolocation_dictcreases} ${objectedit} + log ${objectDict} + ${response} CreateRequest_locationId ${url} ${objectDict} + # 查询 + ${geoNameId} Get From Dictionary ${response} geoNameId + #log ${geoNameId} + #${locationId} Get From Dictionary ${response} locationId + #log ${locationId} + QueryPolicyFile ${url} geoNameId=${geoNameId} + #QueryPolicyFile ${url} locationId=${locationId} + # 修改 + ${reqData_edit} Set Variable {"opAction":"update","returnData":1,"list":[{"locationId":1,"addrType":4,"startIp":"221.178.125.0","endIp":"221.178.125.255","geoNameId":"1001","latitude":22.4984,"longitude":112.9947,"coords":1000,"language":"Chinese (zh-CN)","continentAbbr":"AS","continentFull":"Asia","countryAbbr":"CN","countryFull":"China","provinceAbbr":"GD","provinceFull":"Guangdong","cityFull":"shenzhen","timeZone":"Asia/Shanghai"}]} + UpdatePolicyFile2 ${url} ${reqData_edit} + [Teardown] log to console ${\n} diff --git a/01-TestCase/tsg_bfapi/geolocation/DictDetailSearch.robot b/01-TestCase/tsg_bfapi/geolocation/DictDetailSearch.robot new file mode 100644 index 0000000..a9c7a31 --- /dev/null +++ b/01-TestCase/tsg_bfapi/geolocation/DictDetailSearch.robot @@ -0,0 +1,48 @@ +*** Settings *** +Force Tags tsg_bf_api dict_ditail_search #Test Teardown TeardownDelete ${url} profileIds ${profileId} +Library String +Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot +Resource ../../../03-Variable/BifangApiVariable.txt +*** Variables *** +${url} /${version}/geolocation/dict/detail +${profileId} ${EMPTY} + +*** Test Cases *** +dictdetailsearch-01 + #${objectedit} Create Dictionary geoNameId=1001 + #Comment 打印需要修改的json内容 + #log ${objectedit} + #${objectDict} Jsoneditmanu ${settig_proxy_profiles_geolocation_dictdetail} ${objectedit} + #log ${objectDict} + #${response} CreateRequest ${url} ${objectDict} + # 查询 + ${geoNameId} Set Variable 1001 + ${locationId} Set Variable 1 + QueryPolicyFile ${url} geoNameId=${geoNameId}&locationId=${locationId} + # 修改 + #${reqData_edit} Set Variable {"opAction":"update","returnData":1,"list":[{"continentAbbr":"AS","continentFull":"Asia","countryAbbr":"CN","countryFull":"China","geoNameId":"1001","latitude":22.4984,"longitude":112.9947,"coords":1000,"language":"Chinese (zh-CN)","provinceAbbr":"GD","provinceFull":"Guangdong","cityFull":"shenzhen","timeZone":"Asia/Shanghai","locationId":1,"addrType":4,"startIp":"221.178.125.0","endIp":"221.178.125.255","isValid":1,"isInitialize":0,"opUser":1,"opUserName":"admin","opTime":"2020-05-12 12:00:00"},{"continentAbbr":"AS","continentFull":"Asia","countryAbbr":"CN","countryFull":"China","geoNameId":"1001","latitude":22.4984,"longitude":112.9947,"coords":1000,"language":"Chinese (zh-CN)","provinceAbbr":"GD","provinceFull":"Guangdong","cityFull":"shenzhen","timeZone":"Asia/Shanghai","locationId":2,"addrType":4,"startIp":"10.5.23.0","endIp":"10.5.23.255","isValid":1,"isInitialize":0,"opUser":1,"opUserName":"admin","opTime":"2020-05-12 12:00:00"},{"continentAbbr":"AS","continentFull":"Asia","countryAbbr":"CN","countryFull":"China","geoNameId":"1002","latitude":22.4984,"longitude":112.9947,"coords":1000,"language":"Chinese (zh-CN)","provinceAbbr":"GD","provinceFull":"Guangdong","cityFull":"guangzhou","timeZone":"Asia/Shanghai","locationId":3,"addrType":4,"startIp":"12.223.22.0","endIp":"12.223.22.255","isValid":1,"isInitialize":0,"opUser":1,"opUserName":"admin","opTime":"2020-05-12 12:00:00"},{"continentAbbr":"AS","continentFull":"Asia","countryAbbr":"CN","countryFull":"China","geoNameId":"1002","latitude":22.4984,"longitude":112.9947,"coords":1000,"language":"Chinese (zh-CN)","provinceAbbr":"GD","provinceFull":"Guangdong","cityFull":"guangzhou","timeZone":"Asia/Shanghai","locationId":4,"addrType":4,"startIp":"26.38.96.0","endIp":"26.38.96.255","isValid":1,"isInitialize":0,"opUser":1,"opUserName":"admin","opTime":"2020-05-12 12:00:00"}]}} + #UpdatePolicyFile2 ${url} ${reqData_edit} + +dictdetailsearch-02 + # 查询 + ${provinceAbbr} Set Variable GD + ${provinceFull} Set Variable Guangdong + QueryPolicyFile ${url} provinceAbbr=${provinceAbbr}&provinceFull=${provinceFull} + +dictdetailsearch-03 + # 查询 + ${countryFull} Set Variable China + ${countryAbbr} Set Variable CN + QueryPolicyFile ${url} countryFull=${countryFull}&countryAbbr=${countryAbbr} + +dictdetailsearch-04 + # 查询 + ${continentAbbr} Set Variable AS + ${continentFull} Set Variable Asia + QueryPolicyFile ${url} continentAbbr=${continentAbbr}&continentFull=${continentFull} + +dictdetailsearch-05 + # 查询 + ${countryFull} Set Variable China + ${cityFull} Set Variable guangzhou + QueryPolicyFile ${url} countryFull=${countryFull}&lcityFull=${cityFull} diff --git a/01-TestCase/tsg_bfapi/geolocation/DictSearch.robot b/01-TestCase/tsg_bfapi/geolocation/DictSearch.robot new file mode 100644 index 0000000..08f3cd3 --- /dev/null +++ b/01-TestCase/tsg_bfapi/geolocation/DictSearch.robot @@ -0,0 +1,45 @@ +*** Settings *** +Force Tags tsg_bf_api dict_search #Test Teardown TeardownDelete ${url} profileIds ${profileId} +Library String +Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot +Resource ../../../03-Variable/BifangApiVariable.txt + +*** Variables *** +${url} /${version}/geolocation/dict +${profileId} ${EMPTY} + +*** Test Cases *** +dictsearch-01 + #新增 + #${objectedit} Create Dictionary geoNameId=1001 + #Comment 打印需要修改的json内容 + #log ${objectedit} + #${objectDict} Jsoneditmanu ${settig_proxy_profiles_geolocation_dictsearch} ${objectedit} + #log ${objectDict} + ##${response} CreateRequest ${url} ${objectDict} + #${url} ${objectDict} + # 查询 + ${geoNameId} Set Variable 1001 + ${countryFull} Set Variable China + QueryPolicyFile ${url} geoNameId=${geoNameId}&countryFull=${countryFull} + # 修改 + #log ${geoNameId} + #${reqHeader_edit} Set Variable {"opAction":"update","returnData":1,"list":[{"continentList":[{"continentFull":"Asia","countryList":[{"countryFull":"China","cityList":[{"geoNameId":"1001","continentFull":"Asia","countryFull":"China","cityFull":"shenzhen"},{"geoNameId":"1002","continentFull":"Asia","countryFull":"China","cityFull":"guangzhou"}]}]}]}]} + +dictsearch-02 + # 查询 + ${continentAbbr} Set Variable AS + ${continentFull} Set Variable Asia + QueryPolicyFile ${url} continentAbbr=${continentAbbr}&continentFull=${continentFull} + +dictsearch-03 + # 查询 + ${provinceAbbr} Set Variable GD + ${provinceFull} Set Variable Guangdong + QueryPolicyFile ${url} provinceAbbr=${provinceAbbr}&provinceFull=${provinceFull} + +dictsearch-04 + # 查询 + ${countryAbbr} Set Variable China + ${countryFull} Set Variable China + QueryPolicyFile ${url} provinceAbbr=${countryAbbr}&provinceFull=${countryFull} From bc6b6ed90fcc8f86f6900371ccb04fd2451ce603 Mon Sep 17 00:00:00 2001 From: gaochengrui Date: Fri, 19 Jun 2020 11:47:23 +0800 Subject: [PATCH 3/3] Update KeyringPolicyFile.robot --- 01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot b/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot index 65c8e36..9b82939 100644 --- a/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot +++ b/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot @@ -23,7 +23,7 @@ Settings-ProxyProfiles-KeyringFile_root-00001 QueryPolicyFile ${url} keyringId=${keyringId}&keyringName=${keyringName} # 修改 ${header_edit} Set Variable {"isValid":1,"opAction":"update","returnData":1,"keyringName":"test_edit","keyringType":"end-entity","reissueExpiryHour":0,"crl":"null","publicKeyAlgo":"rsa2048","keyringId":"${keyringId}","includeRoot":0} - UpdatePolicyMutipartFile ${url} Keyrings/end-entity/ tang-ca-v3-www.amazon.cn-cer.pem tang-ca-v3-www.amazon.cn-key.pem ${header_edit} + UpdatePolicyMutipartFile ${url} keyrings/end-entity/ tang-ca-v3-www.amazon.cn-cer.pem tang-ca-v3-www.amazon.cn-key.pem ${header_edit} Settings-ProxyProfiles-KeyringFile_end-entity-00002 # 新增 end-entity @@ -34,7 +34,7 @@ Settings-ProxyProfiles-KeyringFile_end-entity-00002 QueryPolicyFile ${url} keyringId=${keyringId}&keyringName=${keyringName} # 修改 ${header_edit} Set Variable {"isValid":1,"opAction":"update","returnData":1,"keyringName":"test_edit","keyringType":"end-entity","reissueExpiryHour":0,"crl":"null","publicKeyAlgo":"rsa2048","keyringId":"${keyringId}","includeRoot":0} - UpdatePolicyMutipartFile ${url} Keyrings/end-entity/ tang-ca-v3-www.amazon.cn-cer.pem tang-ca-v3-www.amazon.cn-key.pem ${header_edit} + UpdatePolicyMutipartFile ${url} keyrings/end-entity/ tang-ca-v3-www.amazon.cn-cer.pem tang-ca-v3-www.amazon.cn-key.pem ${header_edit} Settings-ProxyProfiles-KeyringFile_Intermediate-00003 # 新增 end-entity @@ -45,4 +45,4 @@ Settings-ProxyProfiles-KeyringFile_Intermediate-00003 QueryPolicyFile ${url} keyringId=${keyringId}&keyringName=${keyringName} # 修改 ${header_edit} Set Variable {"isValid":1,"opAction":"update","returnData":1,"keyringName":"test_edit","keyringType":"end-entity","reissueExpiryHour":0,"crl":"null","publicKeyAlgo":"rsa2048","keyringId":"${keyringId}","includeRoot":0} - UpdatePolicyMutipartFile ${url} Keyrings/end-entity/ tang-ca-v3-www.amazon.cn-cer.pem tang-ca-v3-www.amazon.cn-key.pem ${header_edit} + UpdatePolicyMutipartFile ${url} keyrings/end-entity/ tang-ca-v3-www.amazon.cn-cer.pem tang-ca-v3-www.amazon.cn-key.pem ${header_edit}