diff --git a/01-TestCase/tsg_bfapi/setting/Claimedsrcip.robot b/01-TestCase/tsg_bfapi/setting/Claimedsrcip.robot index 8aaff3c..2345f51 100644 --- a/01-TestCase/tsg_bfapi/setting/Claimedsrcip.robot +++ b/01-TestCase/tsg_bfapi/setting/Claimedsrcip.robot @@ -32,7 +32,7 @@ claimedsrcip-00001 ${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 +claimedsrcip_Chinase_English_Russian-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} @@ -49,10 +49,10 @@ claimedsrcip-00002 ${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 +claimedsrcip_Namelong1-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} + ${objectedit} Create Dictionary profileName=1 addrType=4 ipList=${list} Comment 打印需要修改的json内容 ${objectDict} Jsoneditmanu ${setting_proxy_profiles_claimedsrcip} ${objectedit} log ${objectDict} @@ -65,3 +65,21 @@ claimedsrcip-00003 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_Namelong128-00004 + #Hijack 需要修改的内容 + ${list} Create List 192.168.0.1/16 192.168.0.2/16 192.168.0.3/24 + ${objectedit} Create Dictionary profileName=12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313 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} \ No newline at end of file diff --git a/01-TestCase/tsg_bfapi/setting/DecryptionProfile.robot b/01-TestCase/tsg_bfapi/setting/DecryptionProfile.robot index 698082c..bbe71f7 100644 --- a/01-TestCase/tsg_bfapi/setting/DecryptionProfile.robot +++ b/01-TestCase/tsg_bfapi/setting/DecryptionProfile.robot @@ -262,3 +262,54 @@ Decryption_Profile-00015 # 修改 ${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_Chinase_English_Russian-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} + +Decryption_Profile_Namelong1-000016 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=1 + 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} + + +Decryption_Profile_Namelong128-000017 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313 + 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 0fbbac0..8f4bca9 100644 --- a/01-TestCase/tsg_bfapi/setting/Dnsrecords.robot +++ b/01-TestCase/tsg_bfapi/setting/Dnsrecords.robot @@ -182,3 +182,45 @@ Dnsrecords_Chinase_English_Russian_-00008 ${aaa} Evaluate type(${reqHeader_edit} ) log ${aaa} UpdatePolicyFile2 ${url} ${reqHeader_edit} + +Dnsrecords_Namelong1_-00009 + #Hijack 需要修改的内容 + ${Dict1} Create Dictionary value=abc.com + ${Dict2} Create Dictionary value=edf.com + ${list} Create List ${Dict1} ${Dict2} + ${objectedit} Create Dictionary recordName=1 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} + +Dnsrecords_Namelong128_-00010 + #Hijack 需要修改的内容 + ${Dict1} Create Dictionary value=abc.com + ${Dict2} Create Dictionary value=edf.com + ${list} Create List ${Dict1} ${Dict2} + ${objectedit} Create Dictionary recordName=12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313 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/HijackFile24Type.robot b/01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot index 30183cc..a745d47 100644 --- a/01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot +++ b/01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot @@ -515,3 +515,36 @@ Hijack_file_24_type_Chinase_English_Russian-00026 # 修改 ${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_Namelong1-00027 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=1 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} + +Hijack_file_24_type_Namelong128-00028 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313 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 866195e..15f2347 100644 --- a/01-TestCase/tsg_bfapi/setting/InsertScriptsPolicy.robot +++ b/01-TestCase/tsg_bfapi/setting/InsertScriptsPolicy.robot @@ -96,3 +96,37 @@ Insert_Scripts_css_after-00005 # 修改 ${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_Namelong1-00006 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=1 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} + +Insert_Scripts_Namelong128-00007 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313 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 36da892..2861527 100644 --- a/01-TestCase/tsg_bfapi/setting/IntermediaCert.robot +++ b/01-TestCase/tsg_bfapi/setting/IntermediaCert.robot @@ -12,7 +12,7 @@ Resource ../../../03-Variable/BifangApiVariable.txt ${url} /v1/policy/exch/intermediacert *** Test Cases *** -IntermediaCertPolicy-00001 +IntermediaCertPolicy_pageNo1_-00001 # 查询1 QueryPolicyFile ${url} pageNo=1 # 查询2 @@ -26,9 +26,23 @@ IntermediaCertPolicy-00001 ${data2} Set Variable {"opAction":"enable","certIds":${certIds}} UpdatePolicyFile2 ${url} ${data2} -IntermediaCertPolicy-00002 +IntermediaCertPolicy_pageNo2-00002 # 查询1 - QueryPolicyFile ${url} pageNo=1 + QueryPolicyFile ${url} pageNo=2 + # 查询2 + ${suffix_quary} Catenate SEPARATOR=& pageNo=2 pageSize=20 + 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} + +IntermediaCertPolicy_isValid1_-00003 + # 查询1 + QueryPolicyFile ${url} pageNo=2 # 查询2 ${suffix_quary} Catenate SEPARATOR=& pageNo=2 pageSize=30 QueryPolicyFile ${url} ${suffix_quary} @@ -39,3 +53,17 @@ IntermediaCertPolicy-00002 UpdatePolicyFile2 ${url} ${data} ${data2} Set Variable {"opAction":"enable","certIds":${certIds}} UpdatePolicyFile2 ${url} ${data2} + +IntermediaCertPolicy_isValid0_-00004 + # 查询1 + QueryPolicyFile ${url} pageNo=2 + # 查询2 + ${suffix_quary} Catenate SEPARATOR=& pageNo=2 pageSize=30 + QueryPolicyFile ${url} ${suffix_quary} + # 启用/暂停 + ${certId} QueryPolicyFile2 ${url} isValid=0 + ${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 9b82939..1f3e408 100644 --- a/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot +++ b/01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot @@ -46,3 +46,38 @@ Settings-ProxyProfiles-KeyringFile_Intermediate-00003 # 修改 ${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} + +Settings-ProxyProfiles-KeyringFile_Namelong1-00004 + # 新增 end-entity + ${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":"1","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} + + +Settings-ProxyProfiles-KeyringFile_Namelong128-00005 + # 新增 end-entity + ${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":"12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313","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} + +Settings-ProxyProfiles-KeyringFile_Chinase_English_Russian-00006 + # 新增 end-entity + ${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":"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","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} + diff --git a/01-TestCase/tsg_bfapi/setting/Reflector.robot b/01-TestCase/tsg_bfapi/setting/Reflector.robot index 6ba4fb7..28885a3 100644 --- a/01-TestCase/tsg_bfapi/setting/Reflector.robot +++ b/01-TestCase/tsg_bfapi/setting/Reflector.robot @@ -32,7 +32,7 @@ reflector-00001 ${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 +reflector_Chinase_English_Russian-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} @@ -48,3 +48,39 @@ reflector-00002 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_Namelong1-00003 + #Hijack 需要修改的内容 + ${list} Create List 192.168.0.1 192.168.0.2 192.168.0.3 + ${objectedit} Create Dictionary profileName=1 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":""}]} + UpdatePolicyFile2 ${url} ${reqHeader_edit} + + +reflector_Namelong128-00004 + #Hijack 需要修改的内容 + ${list} Create List 192.168.0.1 192.168.0.2 192.168.0.3 + ${objectedit} Create Dictionary profileName=12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313 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":""}]} + UpdatePolicyFile2 ${url} ${reqHeader_edit} + \ No newline at end of file diff --git a/01-TestCase/tsg_bfapi/setting/ReflectorPayload.robot b/01-TestCase/tsg_bfapi/setting/ReflectorPayload.robot index 856361e..e5f7a55 100644 --- a/01-TestCase/tsg_bfapi/setting/ReflectorPayload.robot +++ b/01-TestCase/tsg_bfapi/setting/ReflectorPayload.robot @@ -30,8 +30,8 @@ ReflectorPayload-00001 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 + +ReflectorPayload_Chinase_English_Russian-00002 #Hijack 需要修改的内容 ${objectedit} Create Dictionary profileName=朱brightясный reflectorType=dns payload=SSBMT1ZFIFlPVSDmiJHniLHkvaA= Comment 打印需要修改的json内容 @@ -46,3 +46,35 @@ ReflectorPayload-00002 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_Namelong1-00003 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=1 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":""}]} + UpdatePolicyFile2 ${url} ${reqHeader_edit} + +ReflectorPayload_Namelong128-00004 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313 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":""}]} + UpdatePolicyFile2 ${url} ${reqHeader_edit} diff --git a/01-TestCase/tsg_bfapi/setting/ResponsePagesPolicy.robot b/01-TestCase/tsg_bfapi/setting/ResponsePagesPolicy.robot index 4fde9dd..fd91006 100644 --- a/01-TestCase/tsg_bfapi/setting/ResponsePagesPolicy.robot +++ b/01-TestCase/tsg_bfapi/setting/ResponsePagesPolicy.robot @@ -52,3 +52,36 @@ Response_page_html-00002 # 修改 ${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-Namelong1_00003 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=1 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} + +Response_page_html-Namelong128_00004 + #Hijack 需要修改的内容 + ${objectedit} Create Dictionary profileName=12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313 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 5a48942..12279cd 100644 --- a/01-TestCase/tsg_bfapi/setting/TrafficMirrorPolicy.robot +++ b/01-TestCase/tsg_bfapi/setting/TrafficMirrorPolicy.robot @@ -95,6 +95,7 @@ TrafficMirrorPolicy_mac_Multi_object-00004 ${aaa} Evaluate type(${reqData_edit}) log ${aaa} UpdatePolicyFile2 ${url} ${reqData_edit} + TrafficMirrorPolicy_mac_Multi_object-00005 #Hijack 需要修改的内容 @@ -115,3 +116,45 @@ TrafficMirrorPolicy_mac_Multi_object-00005 ${aaa} Evaluate type(${reqData_edit}) log ${aaa} UpdatePolicyFile2 ${url} ${reqData_edit} + +TrafficMirrorPolicy_Namelong1-00006 + #Hijack 需要修改的内容 + ${list} Create List 13:13:13:13:13:13 13:13:13:13:13:13 + ${objectedit} Create Dictionary profileName=1 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} + + +TrafficMirrorPolicy_Namelong128-00007 + #Hijack 需要修改的内容 + ${list} Create List 13:13:13:13:13:13 13:13:13:13:13:13 + ${objectedit} Create Dictionary profileName=12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313 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/TrustedCertPolicy.robot b/01-TestCase/tsg_bfapi/setting/TrustedCertPolicy.robot index c5df566..dd016c3 100644 --- a/01-TestCase/tsg_bfapi/setting/TrustedCertPolicy.robot +++ b/01-TestCase/tsg_bfapi/setting/TrustedCertPolicy.robot @@ -54,3 +54,25 @@ TrustedCertPolicy_Intermediate-00003 # 修改 ${header_edit} Set Variable {"isValid":1,"opAction":"update","certName":"test_edit","certId":"${certId}","returnData":1} UpdatePolicyFile ${url} keyrings/root/ tango-ca-trust-ca-cer.pem ${header_edit} + +TrustedCertPolicy_Namelong1-00003 + # 新增 + ${response} CreatePolicyFile ${url} keyrings/Intermediate/ tang-ca-v3-intermediate-01-cer.pem + # 查询 + ${certId} Get From Dictionary ${response} certId + ${certName} Get From Dictionary ${response} certName + QueryPolicyFile ${url} certId=${certId}&certName=${certName} + # 修改 + ${header_edit} Set Variable {"isValid":1,"opAction":"update","certName":"1","certId":"${certId}","returnData":1} + UpdatePolicyFile ${url} keyrings/root/ tango-ca-trust-ca-cer.pem ${header_edit} + +TrustedCertPolicy_Namelong128-00003 + # 新增 + ${response} CreatePolicyFile ${url} keyrings/Intermediate/ tang-ca-v3-intermediate-01-cer.pem + # 查询 + ${certId} Get From Dictionary ${response} certId + ${certName} Get From Dictionary ${response} certName + QueryPolicyFile ${url} certId=${certId}&certName=${certName} + # 修改 + ${header_edit} Set Variable {"isValid":1,"opAction":"update","certName":"12311233333333333333333333333333333qweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee3333333333333333333333131312312321313","certId":"${certId}","returnData":1} + UpdatePolicyFile ${url} keyrings/root/ tango-ca-trust-ca-cer.pem ${header_edit}