From c32c621d7273e40d3ea518e9744404cc94383823 Mon Sep 17 00:00:00 2001 From: doufenghu Date: Mon, 6 May 2024 17:20:12 +0800 Subject: [PATCH] support tsg 24.05 --- 24.05/tsg_olap_e2e_test/collection.json | 99 ++++-------------------- 24.05/tsg_olap_e2e_test/environment.json | 14 +++- 2 files changed, 27 insertions(+), 86 deletions(-) diff --git a/24.05/tsg_olap_e2e_test/collection.json b/24.05/tsg_olap_e2e_test/collection.json index 8730f2b..a3ff519 100644 --- a/24.05/tsg_olap_e2e_test/collection.json +++ b/24.05/tsg_olap_e2e_test/collection.json @@ -50,7 +50,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from proxy_event where vsys_id=1024 and recv_time >={{Last 10 Minutes Start}} group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from proxy_event where vsys_id=1024 and recv_time >={{Last 10 Minutes Start}} and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -114,7 +114,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from voip_record where vsys_id=1024 and decoded_as='VoIP' and recv_time >={{Last 10 Minutes Start}} group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from voip_record where vsys_id=1024 and decoded_as='VoIP' and recv_time >={{Last 10 Minutes Start}} and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -178,7 +178,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from monitor_event where vsys_id=1024 and recv_time >={{Last 10 Minutes Start}} group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\":\"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from monitor_event where vsys_id=1024 and recv_time >={{Last 10 Minutes Start}} and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\":\"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -242,7 +242,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from security_event where vsys_id=1024 and recv_time >={{Last 10 Minutes Start}} group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\":\"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from security_event where vsys_id=1024 and recv_time >={{Last 10 Minutes Start}} and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\":\"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -306,7 +306,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from session_record where vsys_id=1024 and recv_time >={{Last 10 Minutes Start}} group by data_center order by cnt asc\",\n \"output_mode\":\"json\",\n \"exec_mode\":\"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from session_record where vsys_id=1024 and recv_time >={{Last 10 Minutes Start}} and data_center='{{data_center}}' group by data_center order by cnt asc\",\n \"output_mode\":\"json\",\n \"execution_mode\":\"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -375,7 +375,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from traffic_general_stat where __time = {{metric_fixed_time}} and vsys_id=1024 group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from traffic_general_stat where __time = {{metric_fixed_time}} and vsys_id=1024 and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -439,7 +439,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from application_protocol_stat where __time = {{metric_fixed_time}} and vsys_id=1024 group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from application_protocol_stat where __time = {{metric_fixed_time}} and vsys_id=1024 and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -503,7 +503,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center,count(*) as cnt from statistics_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center,count(*) as cnt from statistics_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -567,7 +567,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from security_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from security_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -627,7 +627,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from monitor_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from monitor_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -687,7 +687,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center,count(*) as cnt from proxy_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center,count(*) as cnt from proxy_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -747,7 +747,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from service_chaining_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from service_chaining_rule_hits where __time ={{metric_fixed_time}} and vsys_id=1024 and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -807,7 +807,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from object_statistics where __time ={{metric_fixed_time}} and vsys_id=1024 group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from object_statistics where __time ={{metric_fixed_time}} and vsys_id=1024 and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -867,7 +867,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from statistics_rule where __time ={{metric_fixed_time}} and vsys_id=1024 group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"exec_mode\": \"oneshot\"\n}", + "raw": "{\n \"statement\" : \"select data_center, count(*) as cnt from statistics_rule where __time ={{metric_fixed_time}} and vsys_id=1024 and data_center='{{data_center}}' group by data_center order by cnt asc\" ,\n \"output_mode\":\"json\",\n \"execution_mode\": \"oneshot\"\n}", "options": { "raw": { "language": "json" @@ -1199,71 +1199,6 @@ } }, "response": [] - }, - { - "name": "trouble_shooting_pcap_capture_test", - "event": [ - { - "listen": "test", - "script": { - "exec": [ - "pm.test(\"Status code is 200\", function () {", - " pm.response.to.not.be.error;", - " pm.response.to.be.json;", - " const responseJson = pm.response.json();", - " pm.expect(responseJson.data[0].fileName).to.be.not.null;", - "});", - "", - "", - "" - ], - "type": "text/javascript", - "packages": {} - } - }, - { - "listen": "prerequest", - "script": { - "exec": [ - "" - ], - "type": "text/javascript", - "packages": {} - } - } - ], - "protocolProfileBehavior": { - "disableBodyPruning": true - }, - "request": { - "method": "GET", - "header": [ - { - "key": "Content-Type", - "value": "application/x-www-form-urlencoded", - "type": "text" - } - ], - "body": { - "mode": "urlencoded", - "urlencoded": [] - }, - "url": { - "raw": "http://{{qgw_ip}}:{{qgw_port}}/v1/hos/troubleshooting_file_bucket/123e4567-e89b-12d3-a456-426614174006", - "protocol": "http", - "host": [ - "{{qgw_ip}}" - ], - "port": "{{qgw_port}}", - "path": [ - "v1", - "hos", - "troubleshooting_file_bucket", - "123e4567-e89b-12d3-a456-426614174006" - ] - } - }, - "response": [] } ] }, @@ -1339,7 +1274,7 @@ "response": [] }, { - "name": "delete_troubleshooting_pcap_files_test", + "name": "delete_datapath_telemery_pcap_files_test", "event": [ { "listen": "test", @@ -1382,7 +1317,7 @@ "urlencoded": [] }, "url": { - "raw": "http://{{qgw_ip}}:{{qgw_port}}/v1/hos/traffic_file_bucket?file_names=123e4567-e89b-12d3-a456-426614174006", + "raw": "http://{{qgw_ip}}:{{qgw_port}}/v1/hos/traffic_file_bucket?file_names=123e4567-e89b-12d3-a456-426614174007", "protocol": "http", "host": [ "{{qgw_ip}}" @@ -1396,7 +1331,7 @@ "query": [ { "key": "file_names", - "value": "123e4567-e89b-12d3-a456-426614174006" + "value": "123e4567-e89b-12d3-a456-426614174007" } ] } diff --git a/24.05/tsg_olap_e2e_test/environment.json b/24.05/tsg_olap_e2e_test/environment.json index 4255a8f..da15426 100644 --- a/24.05/tsg_olap_e2e_test/environment.json +++ b/24.05/tsg_olap_e2e_test/environment.json @@ -4,7 +4,7 @@ "values": [ { "key": "qgw_ip", - "value": "192.168.44.30", + "value": "192.168.44.67", "type": "default", "enabled": true }, @@ -16,7 +16,7 @@ }, { "key": "hos_ip", - "value": "192.168.44.30", + "value": "192.168.44.67", "type": "default", "enabled": true }, @@ -43,9 +43,15 @@ "value": "FROM_UNIXTIME(946681200)", "type": "default", "enabled": true + }, + { + "key": "data_center", + "value": "tsg_olap", + "type": "default", + "enabled": true } ], "_postman_variable_scope": "environment", - "_postman_exported_at": "2024-04-23T09:59:24.045Z", - "_postman_exported_using": "Postman/10.24.22" + "_postman_exported_at": "2024-05-06T09:14:27.000Z", + "_postman_exported_using": "Postman/10.24.24" } \ No newline at end of file