diff --git a/py-scripts/tools/ct_us_001.json b/py-scripts/tools/ct_us_001.json index 1006076c..b46be16e 100644 --- a/py-scripts/tools/ct_us_001.json +++ b/py-scripts/tools/ct_us_001.json @@ -12,6 +12,7 @@ "test_parameters":{ "test_bed": "CT-US-001", "test_rig": "CT-US-001", + "database_tag": "testbed CT-US-001", "lf_mgr_ip": "192.168.100.116", "lf_mgr_port": "8080", "dut_set_name": "DUT_NAME ASUSRT-AX88U", @@ -19,15 +20,15 @@ "dut_bssid_2g": "3c:7c:3f:55:4d:60", "dut_bssid_5g": "3c:7c:3f:55:4d:64", "dut_sw": "3.0.0.4.386_44266", - "test_timeout": 300, + "test_timeout": 600, "load_blank_db": false, "load_factory_default_db": true, "load_custom_db": false, "custom_db": "DFLT_ETH1_GEN", - "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com", - "host_ip_production": "192.168.100.201", + "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com", + "host_ip_production": "192.168.100.153", "email_list_test": "chuck.rekiere@candelatech.com", - "host_ip_test": "192.168.100.201", + "host_ip_test": "192.168.100.153", "email_title_txt": "Lanforge QA Testing CT-US-001", "email_txt": "Lanforge QA Testing CT-US-001 " }, diff --git a/py-scripts/tools/ct_us_002.json b/py-scripts/tools/ct_us_002.json index 74fe43e1..26911fa7 100644 --- a/py-scripts/tools/ct_us_002.json +++ b/py-scripts/tools/ct_us_002.json @@ -12,20 +12,22 @@ "test_parameters":{ "test_bed": "CT-US-002", "test_rig": "CT-US-002", + "database_tag": "testbed CT-US-002", "lf_mgr_ip": "192.168.100.200", "lf_mgr_port": "8080", "dut_set_name": "DUT_NAME NETGEAR59-5G", "dut_name": "NETGEAR-AX12", + "dut_bssid_2g": "94:a6:7e:54:d4:31", "dut_bssid_5g": "94:a6:7e:54:d4:33", - "test_timeout": 1200, + "test_timeout": 600, "load_blank_db": false, "load_factory_default_db": true, "load_custom_db": false, "custom_db": "DFLT_ETH1_GEN", - "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com", - "host_ip_production": "192.168.100.201", + "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,erin.grimes@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com", + "host_ip_production": "192.168.100.153", "email_list_test": "chuck.rekiere@candelatech.com", - "host_ip_test": "192.168.100.201", + "host_ip_test": "192.168.100.153", "email_title_txt": "Lanforge QA Testing CT-US-002", "email_txt": "Lanforge QA Testing CT-US-002" }, @@ -43,30 +45,6 @@ "col_names": "name,tx_byptes,rx_bytes,dropped", "upstream_port": "1.1.eth2" }, - "test_database":{ - "database_config": "True", - "database_host": "192.168.100.201", - "database_port": "8086", - "database_token": "-u_Wd-L8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ==", - "database_org": "Candela", - "database_bucket": "lanforge_qa_testing", - "database_tag": "testbed CT-US-002" - }, - "test_dashboard":{ - "dashboard_config": "True", - "dashboard_host": "192.168.100.201", - "dashboard_token": "eyJrIjoiS1NGRU8xcTVBQW9lUmlTM2dNRFpqNjFqV05MZkM0dzciLCJuIjoibWF0dGhldyIsImlkIjoxfQ==" - }, - "test_blog":{ - "blog_config": "True", - "blog_host": "192.168.100.153", - "blog_token": "60df4b0175953f400cd30650:d50e1fabf9a9b5d3d30fe97bc3bf04971d05496a89e92a169a0d72357c81f742", - "blog_authors": "Matthew", - "blog_customer": "candela", - "blog_user_push": "lanforge", - "blog_password_push": "lanforge", - "blog_flag": "--kpi_to_ghost" - }, "radio_dict":{ "RADIO_0_CFG":{"KEY":"RADIO_0_CFG","RADIO":"wiphy0","STATIONS":"4","SSID":"NETGEAR59-5G","PASSWD":"crispynest798","SECURITY":"wpa2"}, "RADIO_1_CFG":{"KEY":"RADIO_1_CFG","RADIO":"wiphy1","STATIONS":"4","SSID":"NETGEAR59-5G","PASSWD":"crispynest798","SECURITY":"wpa2"} diff --git a/py-scripts/tools/ct_us_002_tests.json b/py-scripts/tools/ct_us_002_tests.json index d6368cbb..20481956 100644 --- a/py-scripts/tools/ct_us_002_tests.json +++ b/py-scripts/tools/ct_us_002_tests.json @@ -1,5 +1,19 @@ { "test_suites":{ + "suite_l3":{ + "test_l3_longevity":{ + "enabled":"TRUE", + "load_db":"skip", + "command":"test_l3_longevity.py", + "args":"", + "args_list":[ + " --lfmgr LF_MGR_IP --test_duration 60s --polling_interval 15s --upstream_port eth2 ", + " --radio 'radio==wiphy1,stations==4,ssid==NETGEAR59,ssid_pw==crispynest798,security==wpa2' ", + " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000" + ] + } + }, + "suite_two":{ "test_l3_longevity":{"enabled":"TRUE","command":"test_l3_longevity.py","args":"--test_duration 15s --polling_interval 5s --upstream_port UPSTREAM_PORT --radio 'radio==wiphy1,stations==4,ssid==ct523c-vap,ssid_pw==ct523c-vap,security==wpa2' --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000"} }, @@ -11,7 +25,7 @@ "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", - " --ssid 'ssid_idx=0 ssid=NETGEAR59-5G security=WPA2 password=crispynest798 bssid=DUT_BSSID_5G'", + " --ssid 'ssid_idx=0 ssid=NETGEAR59 security=WPA2 password=crispynest798 bssid=DUT_BSSID_2G'", " --ssid 'ssid_idx=1 ssid=NETGEAR59-5G security=WPA2 password=crispynest798 bssid=DUT_BSSID_5G'", " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ]}, @@ -42,8 +56,9 @@ " --set 'Multi Band Performance' 0 --set 'Stability' 0 --set 'Multi-Station Throughput vs Pkt Size' 0,", " --set 'Throughput vs Pkt Size' 0 --set 'Capacity' 0 --set 'Band-Steering' 0 --set 'Skip 2.4 Ghz Tests' 1", " --pull_report --local_lf_report_dir REPORT_PATH", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG " ] }, "GHOST":{ @@ -68,7 +83,7 @@ "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME", - " --ssid 'ssid_idx=0 ssid=NETGEAR59-5G security=WPA2 password=crispynest798 bssid=DUT_BSSID_5G'", + " --ssid 'ssid_idx=0 ssid=NETGEAR59 security=WPA2 password=crispynest798 bssid=DUT_BSSID_2G'", " --ssid 'ssid_idx=1 ssid=NETGEAR59-5G security=WPA2 password=crispynest798 bssid=DUT_BSSID_5G'", " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ]}, @@ -94,7 +109,8 @@ " --upstream UPSTREAM_PORT --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --set DUT_SET_NAME ", + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG " ] }, "CT-US-002_create_chamberview_dut_ATH10K_wan1":{ @@ -131,8 +147,9 @@ " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ", " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20' ", " --raw_line 'spatial_streams: 4' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)' ", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG " ] }, "CT-US-002_create_chamberview_dut_2":{ @@ -167,8 +184,9 @@ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct", " --upstream UPSTREAM_PORT --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan4 --test_tag 'ATH10K(9984)' ", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "CT-US-002_create_chamberview_dut_AX200_wan1":{ @@ -205,8 +223,9 @@ " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ", " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20'", " --raw_line 'spatial_streams: 4' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'AX200'", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG " ] }, "CT-US-002_create_chamberview_dut_auto":{ @@ -247,8 +266,9 @@ " --set 'Multi Band Performance' 0 --set 'Stability' 0 --set 'Multi-Station Throughput vs Pkt Size' 0,", " --set 'Throughput vs Pkt Size' 0 --set 'Capacity' 0 --set 'Band-Steering' 0 --set 'Skip 2.4 Ghz Tests' 1", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'AX200'", + " --set DUT_SET_NAME", " --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG", - " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME" + " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG" ] }, "GHOST":{"enabled":"TRUE","load_db":"skip","command":"ghost_profile.py","args":"",