diff --git a/01-TestCase/tsg_bfapi/Settings/.gitkeep b/01-TestCase/tsg_bfapi/Settings/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/01-TestCase/tsg_bfapi/setting/ClearAllPolicy.robot b/01-TestCase/tsg_bfapi/setting/ClearAllPolicy.robot deleted file mode 100644 index e0e386c..0000000 --- a/01-TestCase/tsg_bfapi/setting/ClearAllPolicy.robot +++ /dev/null @@ -1,50 +0,0 @@ -*** Settings *** -Force Tags tsg_bf_api Clear_All_Policys -Library String -Library OperatingSystem -Library Selenium2Library -Library Collections -Resource ../../../02-Keyword/tsg_bfapi/Common.robot -Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot -Resource ../../../03-Variable/BifangApiVariable.txt - -*** Variables *** -${url1} /policy/profile/keyringobj -${url2} /policy/profile/trustedcacertobj -${url3} /policy/profile/responsepages -${url4} /policy/profile/hijackfiles -${url5} /policy/profile/insertscripts -${url6} /policy/profile/trafficmirror - -*** Test Cases *** -Keyring Policy delete all case - # 清空所有策略!!! - ${reqData} Create Dictionary isClear=true - DeletePolicyFile ${url1} ${reqData} - -Trusted Cert Policy delete all case - # 清空所有策略!!! - ${reqData} Create Dictionary isClear=true - DeletePolicyFile ${url2} ${reqData} - -Response Pages Policy delete all case - # 清空所有策略!!! - ${reqData} Create Dictionary isClear=true - DeletePolicyFile ${url3} ${reqData} - -Hijack Files Policy delete all case - # 清空所有策略!!! - ${reqData} Create Dictionary isClear=true - DeletePolicyFile ${url4} ${reqData} - -Insert Scripts Policy delete all case - # 清空所有策略!!! - ${reqData} Create Dictionary isClear=true - DeletePolicyFile ${url5} ${reqData} - -Traffic Mirror Policy delete all case - # 清空所有策略!!! - ${reqData} Create Dictionary isClear=true - DeletePolicyFile ${url6} ${reqData} - - diff --git a/01-TestCase/tsg_bfapi/setting/Decryption_Profile.robot b/01-TestCase/tsg_bfapi/setting/DecryptionProfile.robot similarity index 93% rename from 01-TestCase/tsg_bfapi/setting/Decryption_Profile.robot rename to 01-TestCase/tsg_bfapi/setting/DecryptionProfile.robot index f1b29e5..26010ac 100644 --- a/01-TestCase/tsg_bfapi/setting/Decryption_Profile.robot +++ b/01-TestCase/tsg_bfapi/setting/DecryptionProfile.robot @@ -246,3 +246,19 @@ Decryption_Profile-00014 # 修改 ${reqData_edit} Set Variable {"opAction":"update","returnData":1,"list":[{"profileName":"zmmtest","profileDesc":"","profileId":"525","isValid":1,"decryption":{"dynamic_bypass":{"mutual_authentication":1,"cert_pinning":1,"cert_transparency":0,"protocol_errors":1,"ev_cert":0,"trusted_root_cert_is_not_installed_on_client":0},"certificate_checks":{"fail_action":"fail-close","approach":{"self-signed":1,"expiration":1,"cn":1,"issuer":1}},"protocol_version":{"allow_http2":1,"min":"ssl3","max":"tls13","mirror_client":1}}}]} UpdatePolicyFile2 ${url} ${reqData_edit} + +Decryption_Profile-00015 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=朱brightясный + Comment 打印需要修改的json内容 + log ${objectedit} + ${objectDict} Jsoneditmanu ${setting_proxy_profile_decryption_profile} ${objectedit} + log ${objectDict} + ${response} CreateRequest ${url} ${objectDict} + # 查询 + ${profileId} Get From Dictionary ${response} profileId + ${profileName} Get From Dictionary ${response} profileName + QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} + # 修改 + ${reqData_edit} Set Variable {"opAction":"update","returnData":1,"list":[{"profileName":"zmmtest","profileDesc":"","profileId":"525","isValid":1,"decryption":{"dynamic_bypass":{"mutual_authentication":1,"cert_pinning":1,"cert_transparency":0,"protocol_errors":1,"ev_cert":0,"trusted_root_cert_is_not_installed_on_client":0},"certificate_checks":{"fail_action":"fail-close","approach":{"self-signed":1,"expiration":1,"cn":1,"issuer":1}},"protocol_version":{"allow_http2":1,"min":"ssl3","max":"tls13","mirror_client":1}}}]} + UpdatePolicyFile2 ${url} ${reqData_edit} diff --git a/01-TestCase/tsg_bfapi/setting/Dnsrecords.robot b/01-TestCase/tsg_bfapi/setting/Dnsrecords.robot index fe22468..e1a03f2 100644 --- a/01-TestCase/tsg_bfapi/setting/Dnsrecords.robot +++ b/01-TestCase/tsg_bfapi/setting/Dnsrecords.robot @@ -80,8 +80,8 @@ Dnsrecords_CNAME_-00003 Dnsrecords_AAAA_-00004 #Hijack 需要修改的内容 - ${Dict1} Create Dictionary value=2000：db8:2de::e13 - ${Dict2} Create Dictionary value=2000：db8:2de::e13 + ${Dict1} Create Dictionary value=2000:db8:2de::e13 + ${Dict2} Create Dictionary value=2000:db8:2de::e13 ${list} Create List ${Dict1} ${Dict2} ${objectedit} Create Dictionary recordName=12 recordType=AAAA recordValues=${list} Comment 打印需要修改的json内容 @@ -104,7 +104,7 @@ Dnsrecords_TXT_-00005 ${Dict1} Create Dictionary value=abc.com ${Dict2} Create Dictionary value=edf.com ${list} Create List ${Dict1} ${Dict2} - ${objectedit} Create Dictionary recordName=12 recordType=CNAME recordValues=${list} + ${objectedit} Create Dictionary recordName=12 recordType=TXT recordValues=${list} Comment 打印需要修改的json内容 ${objectDict} Jsoneditmanu ${setting_proxy_profiles_dnsrecords} ${objectedit} log ${objectDict} @@ -125,7 +125,7 @@ Dnsrecords_NS_-00006 ${Dict1} Create Dictionary value=abc.com ${Dict2} Create Dictionary value=edf.com ${list} Create List ${Dict1} ${Dict2} - ${objectedit} Create Dictionary recordName=12 recordType=CNAME recordValues=${list} + ${objectedit} Create Dictionary recordName=12 recordType=NS recordValues=${list} Comment 打印需要修改的json内容 ${objectDict} Jsoneditmanu ${setting_proxy_profiles_dnsrecords} ${objectedit} log ${objectDict} @@ -146,7 +146,7 @@ Dnsrecords_PTR_-00007 ${Dict1} Create Dictionary value=abc.com ${Dict2} Create Dictionary value=edf.com ${list} Create List ${Dict1} ${Dict2} - ${objectedit} Create Dictionary recordName=12 recordType=CNAME recordValues=${list} + ${objectedit} Create Dictionary recordName=12 recordType=PTR recordValues=${list} Comment 打印需要修改的json内容 ${objectDict} Jsoneditmanu ${setting_proxy_profiles_dnsrecords} ${objectedit} log ${objectDict} @@ -161,3 +161,24 @@ Dnsrecords_PTR_-00007 ${aaa} Evaluate type(${reqHeader_edit} ) log ${aaa} UpdatePolicyFile2 ${url} ${reqHeader_edit} + +Dnsrecords_Chinase_English_Russian_-00008 + #Hijack 需要修改的内容 + ${Dict1} Create Dictionary value=abc.com + ${Dict2} Create Dictionary value=edf.com + ${list} Create List ${Dict1} ${Dict2} + ${objectedit} Create Dictionary recordName=朱brightясный recordType=PTR recordValues=${list} + Comment 打印需要修改的json内容 + ${objectDict} Jsoneditmanu ${setting_proxy_profiles_dnsrecords} ${objectedit} + log ${objectDict} + ${response} Post-Request ${url} ${objectDict} + #查询 + ${profileId} Set Variable ${response['data']['list'][0]["recordId"]} + ${profileName} Set Variable ${response['data']['list'][0]["recordName"]} + QueryPolicyFile ${url} recordId=${profileId}&profileName=${profileName} + # 修改 + log ${profileId} + ${reqHeader_edit} Set Variable { \ \ \ \ "opAction": "update", \ \ \ \ "returnData": 1, \ \ \ \ "dnsRecordList": [ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "recordId": ${profileId}, \ \ \ \ \ \ \ \ \ \ \ \ "recordName": "12", \ \ \ \ \ \ \ \ \ \ \ \ "recordType": "A", \ \ \ \ \ \ \ \ \ \ \ \ "recordValues": [ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "value": "192.168.0.1" \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ }, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ "value": "192.168.0.2" \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ } \ \ \ \ \ \ \ \ \ \ \ \ ], \ \ \ \ \ \ \ \ \ \ \ \ "isValid": 1, \ \ \ \ \ \ \ \ \ \ \ \ "profileDesc": "" \ \ \ \ \ \ \ \ } \ \ \ \ ] } + ${aaa} Evaluate type(${reqHeader_edit} ) + log ${aaa} + UpdatePolicyFile2 ${url} ${reqHeader_edit} diff --git a/01-TestCase/tsg_bfapi/setting/Hijack_file_24_type.robot b/01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot similarity index 79% rename from 01-TestCase/tsg_bfapi/setting/Hijack_file_24_type.robot rename to 01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot index 461af0a..731dd7e 100644 --- a/01-TestCase/tsg_bfapi/setting/Hijack_file_24_type.robot +++ b/01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot @@ -28,8 +28,8 @@ Hijack_file_24_type_apk-00000 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"text/plain","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-24.txt","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-24.txt ${header_edit} #DeletePolicyFile ${url} ${profileId} Hijack_file_24_type_exe-00001 @@ -45,8 +45,8 @@ Hijack_file_24_type_exe-00001 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"text/plain","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-24.plain","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-24.plain ${header_edit} Hijack_file_24_type_gif-00002 #Hijack 需要修改的内容 @@ -61,8 +61,8 @@ Hijack_file_24_type_gif-00002 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"text/comma-separated-values","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-23.csv","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-23.csv ${header_edit} Hijack_file_24_type_html-00003 #Hijack 需要修改的内容 @@ -77,8 +77,8 @@ Hijack_file_24_type_html-00003 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"text/css","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-22.css","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-22.css ${header_edit} Hijack_file_24_type_jpeg-00004 #Hijack 需要修改的内容 @@ -93,8 +93,8 @@ Hijack_file_24_type_jpeg-00004 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/vnd.oasis.opendocument.text","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-21.odt","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-21.odt ${header_edit} Hijack_file_24_type_png-00005 #Hijack 需要修改的内容 @@ -109,8 +109,8 @@ Hijack_file_24_type_png-00005 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/vnd.openxmlformats-officedocument.presentationml.presentation","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-20.pptx","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-20.pptx ${header_edit} Hijack_file_24_type_png-00005-1 #Hijack 需要修改的内容 @@ -125,8 +125,8 @@ Hijack_file_24_type_png-00005-1 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/x-ppt","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-19.ppt","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-19.ppt ${header_edit} Hijack_file_24_type_svg-00006 #Hijack 需要修改的内容 @@ -141,8 +141,8 @@ Hijack_file_24_type_svg-00006 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/vnd.ms-powerpoint","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-19.ppt","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-19.ppt ${header_edit} Hijack_file_24_type_rpm-00007 #Hijack 需要修改的内容 @@ -157,8 +157,8 @@ Hijack_file_24_type_rpm-00007 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-18.xlsx","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-18.xlsx ${header_edit} Hijack_file_24_type_dmg-00008 #Hijack 需要修改的内容 @@ -173,8 +173,8 @@ Hijack_file_24_type_dmg-00008 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/x-xls","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-17.xls","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-17.xls ${header_edit} Hijack_file_24_type_js-00009 #Hijack 需要修改的内容 @@ -189,8 +189,8 @@ Hijack_file_24_type_js-00009 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/vnd.ms-excel","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-17.xls","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-17.xls ${header_edit} Hijack_file_24_type_rar-00010 #Hijack 需要修改的内容 @@ -205,8 +205,8 @@ Hijack_file_24_type_rar-00010 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/pdf","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-16.pdf","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-16.pdf ${header_edit} Hijack_file_24_type_zip-00011 #Hijack 需要修改的内容 @@ -221,8 +221,8 @@ Hijack_file_24_type_zip-00011 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"text/xml","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-15.xml","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-15.xml ${header_edit} Hijack_file_24_type_doc-00012 #Hijack 需要修改的内容 @@ -237,8 +237,8 @@ Hijack_file_24_type_doc-00012 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/json","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-14.json","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-14.json ${header_edit} Hijack_file_24_type_docx-00013 #Hijack 需要修改的内容 @@ -253,8 +253,8 @@ Hijack_file_24_type_docx-00013 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/vnd.openxmlformats-officedocument.wordprocessingml.document","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-13.docx","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-13.docx ${header_edit} Hijack_file_24_type_json-00014 #Hijack 需要修改的内容 @@ -269,8 +269,8 @@ Hijack_file_24_type_json-00014 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/msword","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-12.doc","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-12.doc ${header_edit} Hijack_file_24_type_xml-00015 #Hijack 需要修改的内容 @@ -285,8 +285,8 @@ Hijack_file_24_type_xml-00015 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/x-zip-compressed","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-11.zip","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-11.zip ${header_edit} Hijack_file_24_type_pdf-00016 #Hijack 需要修改的内容 @@ -301,8 +301,8 @@ Hijack_file_24_type_pdf-00016 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/octet-stream","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-10.rar","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-10.rar ${header_edit} Hijack_file_24_type_xls-00017 #Hijack 需要修改的内容 @@ -317,8 +317,8 @@ Hijack_file_24_type_xls-00017 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/x-javascript","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-9.js","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-9.js ${header_edit} Hijack_file_24_type_xls-00017-1 #Hijack 需要修改的内容 @@ -333,8 +333,8 @@ Hijack_file_24_type_xls-00017-1 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/x-apple-diskimage","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-8.dmg","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-8.dmg ${header_edit} Hijack_file_24_type_xlsx-00018 #Hijack 需要修改的内容 @@ -349,8 +349,8 @@ Hijack_file_24_type_xlsx-00018 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"audio/x-pn-realaudio-plugin","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-7.rpm","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-7.rpm ${header_edit} Hijack_file_24_type_ppt-00019 #Hijack 需要修改的内容 @@ -365,8 +365,8 @@ Hijack_file_24_type_ppt-00019 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"image/svg%2Bxml","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-6.svg","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-6.svg ${header_edit} Hijack_file_24_type_ppt-00019-1 #Hijack 需要修改的内容 @@ -381,7 +381,7 @@ Hijack_file_24_type_ppt-00019-1 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/x-png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} Hijack_file_24_type_pptx-00020 @@ -413,8 +413,8 @@ Hijack_file_24_type_odt-00021 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"image/jpeg","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-4.jpeg","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-4.jpeg ${header_edit} Hijack_file_24_type_css-00022 #Hijack 需要修改的内容 @@ -429,8 +429,8 @@ Hijack_file_24_type_css-00022 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"text/html","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-3.html","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-3.html ${header_edit} Hijack_file_24_type_csv-00023 #Hijack 需要修改的内容 @@ -445,8 +445,8 @@ Hijack_file_24_type_csv-00023 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"image/gif","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-2.gif","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-2.gif ${header_edit} Hijack_file_24_type_plain-00024 #Hijack 需要修改的内容 @@ -461,8 +461,8 @@ Hijack_file_24_type_plain-00024 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/x-msdos-program","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-1.exe","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-1.exe ${header_edit} Hijack_file_24_type_txt-00025 #Hijack 需要修改的内容 @@ -477,5 +477,21 @@ Hijack_file_24_type_txt-00025 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"image/png","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-5.png","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-5.png ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"application/vnd.android.package-archive","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-0.apk","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-0.apk ${header_edit} + +Hijack_file_24_type_Chinase_English_Russian-00026 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=Zhuming%E6%98%8E!%40%23%40%24%25%5E%26(())__%2B%2B%2B%2B%2B(*%26%25%24%5E%25%23%24!~!%40%5E%25%26*()((_%E2%96%89%E2%96%88%E2%96%87%E2%96%86%E2%96%8B%E2%96%8D%E2%96%8E%E2%88%9A%E2%98%9A%E2%98%9A%E3%8F%98%E2%98%9B%E2%88%9A%E2%80%A6%E3%89%BF%E3%80%93%D0%9D%D0%B0%D1%81%D1%82%D1%80%D0%BE%D0%B9%D0%BA%D0%B0 contentName=Create-Hijack Files-test-24.txt contentType=text/plain + Comment 打印需要修改的json内容 + log ${objectedit} + ${objectDict} Jsoneditmanu ${setting_proxy_profiles_hijack} ${objectedit} + log ${objectDict} + ${response} CreatePolicyFile4 ${url} hijack_files/ Create-Hijack Files-test-24.txt ${objectDict} + # 查询 + ${profileId} Get From Dictionary ${response} profileId + ${profileName} Get From Dictionary ${response} profileName + QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} + # 修改 + ${header_edit} Set Variable {"isValid":1,"contentType":"application/vnd.android.package-archive","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-0.apk","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-0.apk ${header_edit} diff --git a/01-TestCase/tsg_bfapi/setting/InsertScriptsPolicy.robot b/01-TestCase/tsg_bfapi/setting/InsertScriptsPolicy.robot index d0bc700..fc8e824 100644 --- a/01-TestCase/tsg_bfapi/setting/InsertScriptsPolicy.robot +++ b/01-TestCase/tsg_bfapi/setting/InsertScriptsPolicy.robot @@ -79,3 +79,20 @@ Insert_Scripts_css_after-00004 # 修改 ${reqHeader_edit} Set Variable {"isValid":1,"format":"js","insertOn":"after_page_load \ ","opAction":"update","profileName":"test_edit","profileId":"${profileId}","returnData":1} UpdatePolicyFile ${url} insert_files/ Create-Insert Scripts-test-1.js ${reqHeader_edit} + +Insert_Scripts_css_after-00005 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=%E6%9C%B1bright%D1%8F%D1%81%D0%BD%D1%8B%D0%B9 format=css insertOn="" + Comment 打印需要修改的json内容 + log ${objectedit} + ${objectDict} Jsoneditmanu ${setting_proxy_profiles_insert} ${objectedit} + log ${objectDict} + ${response} CreatePolicyFile4 ${url} insert_files/ Create-Insert Scripts-test.css ${objectDict} + log 12313123123123213123213 + # 查询 + ${profileId} Get From Dictionary ${response} profileId + ${profileName} Get From Dictionary ${response} profileName + QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} + # 修改 + ${reqHeader_edit} Set Variable {"isValid":1,"format":"js","insertOn":"after_page_load \ ","opAction":"update","profileName":"test_edit","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} insert_files/ Create-Insert Scripts-test-1.js ${reqHeader_edit} diff --git a/01-TestCase/tsg_bfapi/setting/IntermediaCert.robot b/01-TestCase/tsg_bfapi/setting/IntermediaCert.robot index 875100f..0415a6a 100644 --- a/01-TestCase/tsg_bfapi/setting/IntermediaCert.robot +++ b/01-TestCase/tsg_bfapi/setting/IntermediaCert.robot @@ -1,27 +1,23 @@ *** Settings *** -Force Tags tsg_bf_api Cached_Intermediate_Certificates -Library String -Library OperatingSystem -Library Selenium2Library -Library Collections -Resource ../../../02-Keyword/tsg_bfapi/Common.robot -Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot -Resource ../../../03-Variable/BifangApiVariable.txt +Force Tags tsg_bf_api Cached_Intermediate_Certificates +Library String +Library OperatingSystem +Library Selenium2Library +Library Collections +Resource ../../../02-Keyword/tsg_bfapi/Common.robot +Resource ../../../02-Keyword/tsg_bfapi/policy_file_interface/FunctionalKeywords.robot +Resource ../../../03-Variable/BifangApiVariable.txt *** Variables *** -${url} /policy/exch/intermediacert +${url} /policy/exch/intermediacert *** Test Cases *** -Intermedia Cert Policy case - +IntermediaCertPolicy-00001 # 查询1 - ${suffix_quary} Catenate SEPARATOR=& certId=269 sni=nationalbank.kz - QueryPolicyFile ${url} ${suffix_quary} - + QueryPolicyFile ${url} pageNo=1 # 查询2 - ${suffix_quary} Catenate SEPARATOR=& certIds=263,265 sni=dw-online.ksosoft + ${suffix_quary} Catenate SEPARATOR=& pageNo=1 pageSize=20 QueryPolicyFile ${url} ${suffix_quary} - # 启用/暂停 ${certId} QueryPolicyFile2 ${url} isValid=1 ${certIds} Create List ${certId} @@ -29,7 +25,17 @@ Intermedia Cert Policy case UpdatePolicyFile2 ${url} ${data} ${data2} Set Variable {"opAction":"enable","certIds":${certIds}} UpdatePolicyFile2 ${url} ${data2} - - - +IntermediaCertPolicy-00002 + # 查询1 + QueryPolicyFile ${url} pageNo=1 + # 查询2 + ${suffix_quary} Catenate SEPARATOR=& pageNo=2 pageSize=30 + QueryPolicyFile ${url} ${suffix_quary} + # 启用/暂停 + ${certId} QueryPolicyFile2 ${url} isValid=1 + ${certIds} Create List ${certId} + ${data} Set Variable {"opAction":"disable","certIds":${certIds}} + UpdatePolicyFile2 ${url} ${data} + ${data2} Set Variable {"opAction":"enable","certIds":${certIds}} + UpdatePolicyFile2 ${url} ${data2} diff --git a/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot b/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot index 42ceb45..3231985 100644 --- a/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot +++ b/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot @@ -38,11 +38,11 @@ Settings-ProxyProfiles-KeyringFile_end-entity-00002 Settings-ProxyProfiles-KeyringFile_Intermediate-00003 # 新增 end-entity - ${response} CreatePolicyMutipartFile ${url} keyrings/Intermediate/ tang-ca-v3-intermediate-01-cer.pem tang-ca-v3-intermediate-01-key.pem Intermediate + ${response} CreatePolicyMutipartFile ${url} keyrings/Intermediate/ tang-ca-v3-intermediate-02-cer.pem tang-ca-v3-intermediate-02-key.pem Intermediate # 查询 ${keyringId} Get From Dictionary ${response} keyringId ${keyringName} Get From Dictionary ${response} keyringName 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} diff --git a/01-TestCase/tsg_bfapi/setting/reflector_payload.robot b/01-TestCase/tsg_bfapi/setting/ReflectorPayload.robot similarity index 61% rename from 01-TestCase/tsg_bfapi/setting/reflector_payload.robot rename to 01-TestCase/tsg_bfapi/setting/ReflectorPayload.robot index 168d9cc..63ab155 100644 --- a/01-TestCase/tsg_bfapi/setting/reflector_payload.robot +++ b/01-TestCase/tsg_bfapi/setting/ReflectorPayload.robot @@ -15,7 +15,7 @@ ${url} policy/profile/reflector/payload ${profileId} ${EMPTY} *** Test Cases *** -reflector-00001 +ReflectorPayload-00001 #Hijack 需要修改的内容 ${objectedit} Create Dictionary profileName=12313 reflectorType=dns payload=SSBMT1ZFIFlPVSDmiJHniLHkvaA= Comment 打印需要修改的json内容 @@ -25,7 +25,23 @@ reflector-00001 #查询 ${profileId} Set Variable ${response['data']['list'][0]["profileId"]} ${profileName} Set Variable ${response['data']['list'][0]["profileName"]} - QueryPolicyFile ${url} recordId=${profileId}&profileName=${${profileName} } + QueryPolicyFile ${url} recordId=${profileId}&profileName=${profileName} + # 修改 + log ${profileId} + ${reqHeader_edit} Set Variable {"opAction": "update","returnData": 1,"reflectorList":[{"profileId":1,"profileName":"zzzzzzz","reflectorType":"dns","payload":"SSBMT1ZFIFlPVSDmiJHniLHkvaA=","isValid":1,"profileDesc":""}]} + UpdatePolicyFile2 ${url} ${reqHeader_edit} + +ReflectorPayload-00002 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=朱brightясный reflectorType=dns payload=SSBMT1ZFIFlPVSDmiJHniLHkvaA= + Comment 打印需要修改的json内容 + ${objectDict} Jsoneditmanu ${settig_proxy_profiles_reflector_payload} ${objectedit} + log ${objectDict} + ${response} Post-Request ${url} ${objectDict} + #查询 + ${profileId} Set Variable ${response['data']['list'][0]["profileId"]} + ${profileName} Set Variable ${response['data']['list'][0]["profileName"]} + QueryPolicyFile ${url} recordId=${profileId}&profileName=${profileName} # 修改 log ${profileId} ${reqHeader_edit} Set Variable {"opAction": "update","returnData": 1,"reflectorList":[{"profileId":1,"profileName":"zzzzzzz","reflectorType":"dns","payload":"SSBMT1ZFIFlPVSDmiJHniLHkvaA=","isValid":1,"profileDesc":""}]} diff --git a/01-TestCase/tsg_bfapi/setting/ResponsePagesPolicy.robot b/01-TestCase/tsg_bfapi/setting/ResponsePagesPolicy.robot index 4c928c3..0aaec09 100644 --- a/01-TestCase/tsg_bfapi/setting/ResponsePagesPolicy.robot +++ b/01-TestCase/tsg_bfapi/setting/ResponsePagesPolicy.robot @@ -36,3 +36,19 @@ Response_page_html-00001 # 修改 ${header_edit} Set Variable {"isValid":1,"format":"html","opAction":"update","profileName":"test_edit","profileId":"${profileId}","returnData":1} UpdatePolicyFile ${url} response_pages_files/ Create-Response Pages-test.html ${header_edit} + +Response_page_html-00002 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=%E6%9C%B1bright%D1%8F%D1%81%D0%BD%D1%8B%D0%B9 format=html + Comment 打印需要修改的json内容 + log ${objectedit} + ${objectDict} Jsoneditmanu ${setting_proxy_profiles_reponse_page} ${objectedit} + log ${objectDict} + ${response} CreatePolicyFile4 ${url} response_pages_files/ Create-Response Pages-test.html ${objectDict} + # 查询 + ${profileId} Get From Dictionary ${response} profileId + ${profileName} Get From Dictionary ${response} profileName + QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} + # 修改 + ${header_edit} Set Variable {"isValid":1,"format":"html","opAction":"update","profileName":"test_edit","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} response_pages_files/ Create-Response Pages-test.html ${header_edit} diff --git a/01-TestCase/tsg_bfapi/setting/TrafficMirrorPolicy.robot b/01-TestCase/tsg_bfapi/setting/TrafficMirrorPolicy.robot index 8be446d..a4360b8 100644 --- a/01-TestCase/tsg_bfapi/setting/TrafficMirrorPolicy.robot +++ b/01-TestCase/tsg_bfapi/setting/TrafficMirrorPolicy.robot @@ -95,3 +95,23 @@ TrafficMirrorPolicy_mac_Multi_object-00004 ${aaa} Evaluate type(${reqData_edit}) log ${aaa} UpdatePolicyFile2 ${url} ${reqData_edit} + +TrafficMirrorPolicy_mac_Multi_object-00005 + #Hijack 需要修改的内容 + ${list} Create List 13:13:13:13:13:13 13:13:13:13:13:13 + ${objectedit} Create Dictionary profileName=%E6%9C%B1bright%D1%8F%D1%81%D0%BD%D1%8B%D0%B9 addrType=mac addrArray=${list} + Comment 打印需要修改的json内容 + log ${objectedit} + ${objectDict} Jsoneditmanu ${setting_proxy_profiles_traffic_mirror_profiles} ${objectedit} + log ${objectDict} + ${response} CreateRequest ${url} ${objectDict} + # 查询 + log ${response} + ${profileId} Get From Dictionary ${response} profileId + ${profileName} Get From Dictionary ${response} profileName + QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} + # 修改 + ${reqData_edit} Set Variable {"opAction":"update","returnData":1,"trafficMirrorList":[{"profileId":"${profileId}","profileName":"test_edit","addrType":"vlan","isValid":1,"addrArray":["256"]}]} + ${aaa} Evaluate type(${reqData_edit}) + log ${aaa} + UpdatePolicyFile2 ${url} ${reqData_edit} diff --git a/01-TestCase/tsg_bfapi/setting/claimedsrcip.robot b/01-TestCase/tsg_bfapi/setting/claimedsrcip.robot index 432f7c5..209a6c0 100644 --- a/01-TestCase/tsg_bfapi/setting/claimedsrcip.robot +++ b/01-TestCase/tsg_bfapi/setting/claimedsrcip.robot @@ -26,7 +26,41 @@ claimedsrcip-00001 #查询 ${profileId} Set Variable ${response['data']['list'][0]["profileId"]} ${profileName} Set Variable ${response['data']['list'][0]["profileName"]} - QueryPolicyFile ${url} recordId=${profileId}&profileName=${${profileName} } + QueryPolicyFile ${url} recordId=${profileId}&profileName=${profileName} + # 修改 + log ${profileId} + ${reqHeader_edit} Set Variable {"opAction": "add","returnData": 1,"claimedSrcIpList":[{"profileId":1,"profileName":"1231","addrType":4,"ipList":["192.168.0.1/16","192.168.0.2/16","192.168.0.3/24"],"isValid":1,"profileDesc":""}],"isValid":1,"profileDesc":""} + UpdatePolicyFile2 ${url} ${reqHeader_edit} + +claimedsrcip-00002 + #Hijack 需要修改的内容 + ${list} Create List 192.168.0.1/16 192.168.0.2/16 192.168.0.3/24 + ${objectedit} Create Dictionary profileName=朱brightясный addrType=4 ipList=${list} + Comment 打印需要修改的json内容 + ${objectDict} Jsoneditmanu ${setting_proxy_profiles_claimedsrcip} ${objectedit} + log ${objectDict} + ${response} Post-Request ${url} ${objectDict} + #查询 + ${profileId} Set Variable ${response['data']['list'][0]["profileId"]} + ${profileName} Set Variable ${response['data']['list'][0]["profileName"]} + QueryPolicyFile ${url} recordId=${profileId}&profileName=${profileName} + # 修改 + log ${profileId} + ${reqHeader_edit} Set Variable {"opAction": "add","returnData": 1,"claimedSrcIpList":[{"profileId":1,"profileName":"1231","addrType":4,"ipList":["192.168.0.1/16","192.168.0.2/16","192.168.0.3/24"],"isValid":1,"profileDesc":""}],"isValid":1,"profileDesc":""} + UpdatePolicyFile2 ${url} ${reqHeader_edit} + +claimedsrcip-00003 + #Hijack 需要修改的内容 + ${list} Create List 192.168.0.1/16 192.168.0.2/16 192.168.0.3/24 + ${objectedit} Create Dictionary profileName=朱brightясный addrType=4 ipList=${list} + Comment 打印需要修改的json内容 + ${objectDict} Jsoneditmanu ${setting_proxy_profiles_claimedsrcip} ${objectedit} + log ${objectDict} + ${response} Post-Request ${url} ${objectDict} + #查询 + ${profileId} Set Variable ${response['data']['list'][0]["profileId"]} + ${profileName} Set Variable ${response['data']['list'][0]["profileName"]} + QueryPolicyFile ${url} recordId=${profileId}&profileName=${profileName} # 修改 log ${profileId} ${reqHeader_edit} Set Variable {"opAction": "add","returnData": 1,"claimedSrcIpList":[{"profileId":1,"profileName":"1231","addrType":4,"ipList":["192.168.0.1/16","192.168.0.2/16","192.168.0.3/24"],"isValid":1,"profileDesc":""}],"isValid":1,"profileDesc":""} diff --git a/01-TestCase/tsg_bfapi/setting/redirectdestination.robot b/01-TestCase/tsg_bfapi/setting/redirectdestination.robot deleted file mode 100644 index acde04d..0000000 --- a/01-TestCase/tsg_bfapi/setting/redirectdestination.robot +++ /dev/null @@ -1,33 +0,0 @@ -*** Settings *** -Test Teardown TeardownDelete ${url} profileIds ${profileId} -Force Tags tsg_adc Security_Policy -Library OperatingSystem -Resource ../../../02-Keyword/tsg_adc/SystemCommand.robot -Resource ../../../02-Keyword/tsg_bfapi/PolicyObject.robot -Resource ../../../02-Keyword/tsg_bfapi/LogVariable.robot -Resource ../../../02-Keyword/tsg_bfapi/ApiRequest.robot -Resource ../../../03-Variable/AllFlowCaseVariable.txt -Resource ../../../03-Variable/Policy_Objects_Module.txt -Library Custometest - -*** Variables *** -${url} policy/profile/redirectdestination -${profileId} ${EMPTY} - -*** Test Cases *** -claimedsrcip-00001 - #Hijack 需要修改的内容 - ${list} Create List 192.168.0.1/16 192.168.0.2/16 192.168.0.3/24 - ${objectedit} Create Dictionary profileName=12313 addrType=4 ipList=${list} - Comment 打印需要修改的json内容 - ${objectDict} Jsoneditmanu ${setting_proxy_profiles_claimedsrcip} ${objectedit} - log ${objectDict} - ${response} Post-Request ${url} ${objectDict} - #查询 - ${profileId} Set Variable ${response['data']['list'][0]["profileId"]} - ${profileName} Set Variable ${response['data']['list'][0]["profileName"]} - QueryPolicyFile ${url} recordId=${profileId}&profileName=${${profileName} } - # 修改 - log ${profileId} - ${reqHeader_edit} Set Variable {"opAction": "add","returnData": 1,"claimedSrcIpList":[{"profileId":1,"profileName":"1231","addrType":4,"ipList":["192.168.0.1/16","192.168.0.2/16","192.168.0.3/24"],"isValid":1,"profileDesc":""}],"isValid":1,"profileDesc":""} - UpdatePolicyFile2 ${url} ${reqHeader_edit} diff --git a/01-TestCase/tsg_bfapi/setting/reflector.robot b/01-TestCase/tsg_bfapi/setting/reflector.robot index 2a63255..030ad0e 100644 --- a/01-TestCase/tsg_bfapi/setting/reflector.robot +++ b/01-TestCase/tsg_bfapi/setting/reflector.robot @@ -26,7 +26,24 @@ reflector-00001 #查询 ${profileId} Set Variable ${response['data']['list'][0]["profileId"]} ${profileName} Set Variable ${response['data']['list'][0]["profileName"]} - QueryPolicyFile ${url} recordId=${profileId}&profileName=${${profileName} } + QueryPolicyFile ${url} recordId=${profileId}&profileName=${profileName} + # 修改 + log ${profileId} + ${reqHeader_edit} Set Variable {"opAction": "update","returnData": 1,"reflectorList":[{"profileId":${profileId} ,"profileName":"12313","addrType":4,"reflectorType":"dns","ipList":["192.168.0.1","192.168.0.2","192.168.0.3"],"isValid":1,"profileDesc":""}]} + UpdatePolicyFile2 ${url} ${reqHeader_edit} + +reflector-00002 + #Hijack 需要修改的内容 + ${list} Create List 192.168.0.1 192.168.0.2 192.168.0.3 + ${objectedit} Create Dictionary profileName=%E6%9C%B1bright%D1%8F%D1%81%D0%BD%D1%8B%D0%B9 reflectorType=DNS ipList=${list} + Comment 打印需要修改的json内容 + ${objectDict} Jsoneditmanu ${setting_proxy_profiles_reflector} ${objectedit} + log ${objectDict} + ${response} Post-Request ${url} ${objectDict} + #查询 + ${profileId} Set Variable ${response['data']['list'][0]["profileId"]} + ${profileName} Set Variable ${response['data']['list'][0]["profileName"]} + QueryPolicyFile ${url} recordId=${profileId}&profileName=${profileName} # 修改 log ${profileId} ${reqHeader_edit} Set Variable {"opAction": "update","returnData": 1,"reflectorList":[{"profileId":${profileId} ,"profileName":"12313","addrType":4,"reflectorType":"dns","ipList":["192.168.0.1","192.168.0.2","192.168.0.3"],"isValid":1,"profileDesc":""}]}