diff --git a/lf_tx_power.py b/lf_tx_power.py index a61cf737..c512801a 100755 --- a/lf_tx_power.py +++ b/lf_tx_power.py @@ -1120,7 +1120,8 @@ def main(): cs.ap_dot11_dual_band_5ghz_shutdown() elif args.band == "6g": cs.ap_dot11_6ghz_shutdown() - cs.ap_dot11_5ghz_shutdown() + elif args.band == "5g": + cs.ap_dot11_5ghz_shutdown() cs.ap_dot11_24ghz_shutdown() @@ -1134,8 +1135,8 @@ def main(): cs.ap_dot11_dual_band_5ghz_shutdown() elif args.band == '6g': cs.ap_dot11_6ghz_shutdown() - - cs.ap_dot11_5ghz_shutdown() + elif args.band == '5g': + cs.ap_dot11_5ghz_shutdown() cs.ap_dot11_24ghz_shutdown() # manual @@ -1145,8 +1146,8 @@ def main(): cs.ap_dot11_dual_band_5ghz_radio_role_manual_client_serving() elif args.band == '6g': cs.ap_dot11_6ghz_radio_role_manual_client_serving() - - cs.ap_dot11_5ghz_radio_role_manual_client_serving() + elif args.band == '5g': + cs.ap_dot11_5ghz_radio_role_manual_client_serving() cs.ap_dot11_24ghz_radio_role_manual_client_serving() else: @@ -1273,7 +1274,7 @@ def main(): pss = cs.config_no_ap_dot11_dual_band_6ghz_shutdown() logg.info(pss) # enable 6g operation status - pss = cs.config_ap_no_dot11_6ghz_shutdown() + pss = cs.config_ap_no_dot11_dual_band_6ghz_shutdown() logg.info(pss) # enable 5g wlan to show scans pss = cs.config_no_ap_dot11_5ghz_shutdown() @@ -1287,7 +1288,7 @@ def main(): pss = cs.config_no_ap_dot11_dual_band_5ghz_shutdown() logg.info(pss) # enable 5g operation status - pss = cs.config_ap_no_dot11_5ghz_shutdown() + pss = cs.config_ap_no_dot11_dual_band_5ghz_shutdown() logg.info(pss) elif args.band == '6g': # enable 6g wlan diff --git a/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json b/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json index c1aa8a02..636fdff4 100644 --- a/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json +++ b/py-scripts/tools/ct_tests_json/ct_9136_tx_power_tests.json @@ -8,8 +8,7 @@ "Batch nss : 1 2 ", "Batch tx power (optional, can run all passed in on command line) : 1 2 3 4 5 6 7 8 ", "sample command from tools directory:", - " ./lf_check.py --json_rig ./ct_rig_json/ct_9136_WLC1_lanforge.json --json_dut ./ct_dut_json/ct_9136_dut.json", - " --json_test ./ct_tests_json/ct_9136_tx_power_tests.json --suite suite_tx_power --path '/home/lanforge/html-reports/ct-us-9136" + " ./lf_check.py --json_rig ./ct_rig_json/ct_9136_WLC1_lanforge.json --json_dut ./ct_dut_json/ct_9136_dut.json --json_test ./ct_tests_json/ct_9136_tx_power_tests.json --suite suite_tx_power --path '/home/lanforge/html-reports/ct-us-9136" ] }, "test_suites":{ @@ -49,13 +48,8 @@ ] }, "tx_power_batch_override_24g_AX210":{ - "NOTE":["Basic script 24g use existing station, ", - "Batches are ignored if values entered on command line", - "USE_BATCH_CHANNEL for channel batch", - "USE_BATCH_NSS for nss batch", - "USE_BATCH_BANDWIDTH for bandwidth batch", - "USE_BATCH_TX_POWER for tx_power batch"], - "enabled":"FALSE", + "NOTE":["Basic script 24g use existing station"], + "enabled":"TRUE", "load_db":"skip", "timeout":"180", "command":"lf_tx_power.py", @@ -63,17 +57,17 @@ "args_list":[ " --scheme ssh --dest localhost --port 8887", " --user admin --passwd Cisco123 --prompt WLC1", - " --series 9800 --band 6g --module cc_module_9800_3504", + " --series 9800 --band 24g --module cc_module_9800_3504", " --timeout 3 --ap USE_DUT_NAME --ap_band_slot_24g 0", " use_ssid_idx=0 --wlan SSID_USED --wlan_id 3 --wlan_ssid SSID_USED", " --tag_policy RM204-TB1-AP5 --policy_profile default-policy-profile", - " --create_station", - " use_ssid_idx=0 --radio wiphy3 --station sta0002 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", - " --pathloss 59 --antenna_gain 0", - " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", - " --vht160 --ieee80211w optional --wifi_mode auto", - " --channel '5' --nss '5' --bandwidth '20' --txpower '6'", - " --outfile tx_power_override_24g_2B24 --no_cleanup_station --no_cleanup --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5", + " --pathloss 59 --antenna_gain 0 --lfmgr LF_MGR_IP", + " --upstream_port UPSTREAM_ALIAS --lfresource 1", + " use_ssid_idx=0 --radio wiphy3 --create_station --station sta0002 --ssid SSID_USED --ssidpw SSID_PW_USED --security SECURITY_USED", + " --vht160 --ieee80211w optional", + " --channel '5' --nss '2' --bandwidth '20' --txpower '6'", + " --outfile tx_power_override --no_cleanup_station --no_cleanup", + " --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5", " --local_lf_report_dir REPORT_PATH" ] }, @@ -112,12 +106,7 @@ ] }, "tx_power_batch_override_5g_AX210":{ - "NOTE":["Basic script 5g use existing station, ", - "Batches are ignored if values entered on command line", - "USE_BATCH_CHANNEL for channel batch", - "USE_BATCH_NSS for nss batch", - "USE_BATCH_BANDWIDTH for bandwidth batch", - "USE_BATCH_TX_POWER for tx_power batch"], + "NOTE":["Basic script 5g use existing station"], "enabled":"FALSE", "load_db":"skip", "timeout":"180", @@ -135,7 +124,7 @@ " --pathloss 59 --antenna_gain 0", " --lfmgr LF_MGR_IP --upstream_port eth2 --lfresource 1", " --vht160 --ieee80211w optional --wifi_mode auto", - " --channel '36 100' --nss '1 2' --bandwidth '40 160' --txpower '4 8'", + " --channel '100' --nss '2' --bandwidth '40' --txpower '4'", " --outfile tx_power_5g_2B24 --no_cleanup_station --no_cleanup", " --testbed_id Cisco-WLC1-AP5 --testbed_location RM204-TB1-AP5", " --local_lf_report_dir REPORT_PATH" @@ -177,13 +166,8 @@ ] }, "tx_power_batch_override_6g_AX210":{ - "NOTE":["Basic script 6g use existing station, ", - "Batches are ignored if values entered on command line", - "USE_BATCH_CHANNEL for channel batch", - "USE_BATCH_NSS for nss batch", - "USE_BATCH_BANDWIDTH for bandwidth batch", - "USE_BATCH_TX_POWER for tx_power batch"], - "enabled":"TRUE", + "NOTE":["Basic script 6g use existing station"], + "enabled":"FALSE", "load_db":"skip", "timeout":"180", "command":"lf_tx_power.py",