From 1fbf6ced05494dcab9226711dfdfbde6db2da23a Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Thu, 7 Oct 2021 07:44:22 -0600 Subject: [PATCH] ct_us_X json naming fixes Signed-off-by: Chuck SmileyRekiere --- py-scripts/tools/ct_us_002_tests.json | 20 ++++++++++---------- py-scripts/tools/ct_us_003_tests.json | 24 ++++++++++++------------ py-scripts/tools/ct_us_004_tests.json | 24 ++++++++++++------------ 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/py-scripts/tools/ct_us_002_tests.json b/py-scripts/tools/ct_us_002_tests.json index 5f624a9c..af7403f3 100644 --- a/py-scripts/tools/ct_us_002_tests.json +++ b/py-scripts/tools/ct_us_002_tests.json @@ -86,7 +86,7 @@ } }, "suite_wc_dp":{ - "create_chamberview_dut_ATH10K_9984_":{ + "create_chamberview_dut_ATH10K_9984":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -97,7 +97,7 @@ " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ]}, - "create_chamberview_ATH10K_9984_":{ + "create_chamberview_ATH10K_9984":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", @@ -110,20 +110,20 @@ " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, - "wifi_capacity_ATH10K_9984_":{ + "wifi_capacity_ATH10K_9984":{ "enabled":"TRUE", "load_db":"skip", "command":"lf_wifi_capacity_test.py", "args":"", "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name ATH10K_9984__wc", + " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name ATH10K_9984_wc", " --upstream UPSTREAM_PORT --batch_size 1,5,15 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_'", " --test_rig TEST_RIG", " --set DUT_SET_NAME " ] }, - "create_chamberview_dut_ATH10K_9984__dp":{ + "create_chamberview_dut_ATH10K_9984_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -134,19 +134,19 @@ " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'", " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ]}, - "create_chamberview_ATH10K_9984__dp":{ + "create_chamberview_ATH10K_9984_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ATH10K_9984__dp", + " --create_scenario ATH10K_9984_dp", " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" " ] }, - "dataplane_ATH10K_9984_":{ + "dataplane_ATH10K_9984":{ "enabled":"TRUE", "load_db":"skip", "command":"lf_dataplane_test.py", @@ -157,7 +157,7 @@ " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ", " --raw_line 'cust_pkt_sz: 88;256;512;768;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_' ", + " --raw_line 'spatial_streams: 4' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984' ", " --set DUT_SET_NAME" ] }, @@ -193,7 +193,7 @@ "args_list":[ " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name AX200_wc", " --upstream UPSTREAM_PORT --batch_size 1 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", - " --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan4 --test_tag 'ATH10K_9984_' ", + " --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan4 --test_tag 'ATH10K_9984' ", " --set DUT_SET_NAME" ] }, diff --git a/py-scripts/tools/ct_us_003_tests.json b/py-scripts/tools/ct_us_003_tests.json index 420d98fb..38006885 100644 --- a/py-scripts/tools/ct_us_003_tests.json +++ b/py-scripts/tools/ct_us_003_tests.json @@ -136,7 +136,7 @@ } }, "suite_wc_dp":{ - "create_chamberview_dut_ATH10K_9984__wc":{ + "create_chamberview_dut_ATH10K_9984_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -148,19 +148,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "create_chamberview_ATH10K_9984__wc":{ + "create_chamberview_ATH10K_9984_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ATH10K_9984__wc ", + " --create_scenario ATH10K_9984_wc ", " --raw_line \"profile_link 1.1 STA-AUTO 32 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "wifi_capacity_ATH10K_9984_":{ + "wifi_capacity_ATH10K_9984":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -168,14 +168,14 @@ "command":"lf_wifi_capacity_test.py", "args":"", "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__wc", + " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984_wc", " --upstream 1.1.eth1 --batch_size 1,5,25,32 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", - " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_'", + " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984'", " --test_rig TEST_RIG ", " --set DUT_SET_NAME" ] }, - "create_chamberview_dut_ATH10K_9984__dp":{ + "create_chamberview_dut_ATH10K_9984_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -187,19 +187,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "create_chamberview_ATH10K_9984__dp":{ + "create_chamberview_ATH10K_9984_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ATH10K_9984__dp", + " --create_scenario ATH10K_9984_dp", " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "dataplane_ATH10K_9984_":{ + "dataplane_ATH10K_9984":{ "enabled":"TRUE", "load_db":"skip", "timeout":"600", @@ -207,12 +207,12 @@ "command":"lf_dataplane_test.py", "args":"", "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__dp", + " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984_dp", " --config_name test_con --upstream 1.1.eth1 --dut asus_5g --duration 30s --station 1.1.wlan1", " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ", " --raw_line 'cust_pkt_sz: 88;256;512;768;1024;MTU' ", " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'", - " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_' ", + " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984' ", " --test_rig TEST_RIG", " --set DUT_SET_NAME" ] diff --git a/py-scripts/tools/ct_us_004_tests.json b/py-scripts/tools/ct_us_004_tests.json index 534293d9..ebd9104d 100644 --- a/py-scripts/tools/ct_us_004_tests.json +++ b/py-scripts/tools/ct_us_004_tests.json @@ -145,7 +145,7 @@ " " ] }, - "create_chamberview_dut_ATH10K_9984__wc":{ + "create_chamberview_dut_ATH10K_9984_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -157,19 +157,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "create_chamberview_ATH10K_9984__wc":{ + "create_chamberview_ATH10K_9984_wc":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ATH10K_9984__wc ", + " --create_scenario ATH10K_9984_wc ", " --raw_line \"profile_link 1.1 STA-AUTO 32 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "wifi_capacity_ATH10K_9984_":{ + "wifi_capacity_ATH10K_9984":{ "enabled":"TRUE", "timeout":"600", "iterations":"1", @@ -177,14 +177,14 @@ "command":"lf_wifi_capacity_test.py", "args":"", "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__wc", + " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984_wc", " --upstream 1.1.eth2 --batch_size 1,5,25,32 --loop_iter 1 --protocol UDP-IPv4 --duration 6000", - " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_'", + " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984'", " --test_rig TEST_RIG ", " --set DUT_SET_NAME" ] }, - "create_chamberview_dut_ATH10K_9984__dp":{ + "create_chamberview_dut_ATH10K_9984_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview_dut.py", @@ -196,19 +196,19 @@ " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME" ] }, - "create_chamberview_ATH10K_9984__dp":{ + "create_chamberview_ATH10K_9984_dp":{ "enabled":"TRUE", "load_db":"skip", "command":"create_chamberview.py", "args":"", "args_list":[ " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario", - " --create_scenario ATH10K_9984__dp", + " --create_scenario ATH10K_9984_dp", " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ", " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\"" ] }, - "dataplane_ATH10K_9984_":{ + "dataplane_ATH10K_9984":{ "enabled":"TRUE", "load_db":"skip", "timeout":"600", @@ -216,12 +216,12 @@ "command":"lf_dataplane_test.py", "args":"", "args_list":[ - " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__dp", + " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984_dp", " --config_name test_con --upstream 1.1.eth2 --dut asus_5g --duration 30s --station 1.1.wlan1", " --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ", " --raw_line 'cust_pkt_sz: 88;256;512;768;1024;MTU' ", " --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'", - " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_' ", + " --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984' ", " --test_rig TEST_RIG", " --set DUT_SET_NAME" ]