lf_snp_test.py : bug fix for different number of upload and download rates to be tested.

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-04-22 18:17:47 -06:00
parent 6e7f4e1fb1
commit ea18c5f114

View File

@@ -140,6 +140,7 @@ INCLUDE_IN_README
''' '''
import sys import sys
import os import os
import itertools
from pprint import pprint from pprint import pprint
@@ -2350,17 +2351,17 @@ LANforge GUI what is displayed in the Column and how to access the value with cl
for controller_packet_type in controller_packet_types: for controller_packet_type in controller_packet_types:
for controller_direction in controller_directions: for controller_direction in controller_directions:
for side_a_tx_min_bps_ul in controller_side_a_tx_min_bps: # looping though both A and B together, upload direction will select A, download direction will select B
for side_b_tx_min_bps_dl in controller_side_b_tx_min_bps: for side_a_tx_min_bps_ul, side_b_tx_min_bps_dl in itertools.zip_longest(controller_side_a_tx_min_bps, controller_side_b_tx_min_bps, fillvalue = 256000):
for controller_pdu in controller_pdus: for controller_pdu in controller_pdus:
logg.info("#####################################################") logg.info("###################################################################")
logg.info("# TEST RUNNING , TEST RUNNING ######################") logg.info("# TEST RUNNING direction:{} ul: {} , TEST RUNNING dl: {}"
logg.info("#####################################################") .format(controller_direction, side_a_tx_min_bps_ul, side_b_tx_min_bps_dl))
logg.info("####################################################################")
test_config = "AP=={} Band=={} chan_5ghz=={} chan_24ghz=={} wifi_mode=={} BW=={} encryption=={} ap_mode=={} clients=={} packet_type=={} direction=={} pdu=={}".format( test_config = "AP=={} Band=={} chan_5ghz=={} chan_24ghz=={} wifi_mode=={} BW=={} encryption=={} ap_mode=={} clients=={} packet_type=={} direction=={} pdu=={}".format(
controller_ap,controller_band,controller_chan_5ghz,controller_chan_24ghz,controller_wifimode,controller_chan_width,controller_data_encryption,controller_ap_mode,controller_client_density, controller_ap,controller_band,controller_chan_5ghz,controller_chan_24ghz,controller_wifimode,controller_chan_width,controller_data_encryption,controller_ap_mode,controller_client_density,
controller_packet_type,controller_direction,controller_pdu) controller_packet_type,controller_direction,controller_pdu)
test_keys = ['AP','Band','wifi_mode','chan_5ghz','chan_24ghz','BW','encryption','ap_mode','clients','packet_type','direction','pdu'] test_keys = ['AP','Band','wifi_mode','chan_5ghz','chan_24ghz','BW','encryption','ap_mode','clients','packet_type','direction','pdu']
logg.info("# controller run settings: {}".format(test_config)) logg.info("# controller run settings: {}".format(test_config))
if(args.no_controller): if(args.no_controller):
logg.info("################################################") logg.info("################################################")
@@ -2405,7 +2406,6 @@ LANforge GUI what is displayed in the Column and how to access the value with cl
__chan_5ghz_set = controller_chan_5ghz __chan_5ghz_set = controller_chan_5ghz
__chan_24ghz_set = controller_chan_24ghz __chan_24ghz_set = controller_chan_24ghz
__client_density = controller_client_density __client_density = controller_client_density
controller = CreateCtlr( controller = CreateCtlr(
_scheme=__scheme, _scheme=__scheme,
_port=__port, _port=__port,
@@ -2466,7 +2466,6 @@ LANforge GUI what is displayed in the Column and how to access the value with cl
logg.info("__ap_set: {} __band_set: {} __chan_width_set: {} __ap_mode_set: {} __tx_power_set: {} __chan_5ghz_set: {} __chan_24ghz_set: {}" logg.info("__ap_set: {} __band_set: {} __chan_width_set: {} __ap_mode_set: {} __tx_power_set: {} __chan_5ghz_set: {} __chan_24ghz_set: {}"
.format(__ap_set,__band_set, __chan_width_set, __ap_mode_set, __tx_power_set, __chan_5ghz_set, __chan_24ghz_set)) .format(__ap_set,__band_set, __chan_width_set, __ap_mode_set, __tx_power_set, __chan_5ghz_set, __chan_24ghz_set))
logg.info("controller_wifi_mode {}".format(controller_wifimode)) logg.info("controller_wifi_mode {}".format(controller_wifimode))
logg.info("radios {}".format(radios)) logg.info("radios {}".format(radios))
for radio_ in radios: for radio_ in radios:
radio_keys = ['radio','stations','ssid','ssid_pw','security','wifimode'] radio_keys = ['radio','stations','ssid','ssid_pw','security','wifimode']