scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 11:18:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

set BE radio as priority for WiFi-7

Browse Source 
Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
This commit is contained in:
jitendracandela
2025-02-06 16:11:54 +05:30
parent bd73543d5c
commit b3e4ecc751
2 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lf_libs/lf_libs.py
View File

@@ -514,18 +514,18 @@ class lf_libs:
r_val[dut]["upstream"] = upstream r_val[dut]["upstream"] = upstream
else: else:
r_val.pop(dut) r_val.pop(dut)
dict_all_radios_2g = {"wave2_2g_radios": self.wave2_2g_radios, dict_all_radios_2g = {"be200_radios": self.be200_radios,
"wave1_radios": self.wave1_radios, "mtk_radios": self.mtk_radios, "ax210_radios": self.ax210_radios, "ax200_radios": self.ax200_radios,
"ax200_radios": self.ax200_radios, "mtk_radios": self.mtk_radios,
"be200_radios": self.be200_radios, "wave2_2g_radios": self.wave2_2g_radios,
"ax210_radios": self.ax210_radios "wave1_radios": self.wave1_radios
} }
dict_all_radios_5g = {"wave2_5g_radios": self.wave2_5g_radios, dict_all_radios_5g = {"be200_radios": self.be200_radios,
"wave1_radios": self.wave1_radios, "mtk_radios": self.mtk_radios, "ax210_radios": self.ax210_radios, "ax200_radios": self.ax200_radios,
"ax200_radios": self.ax200_radios, "mtk_radios": self.mtk_radios,
"be200_radios": self.be200_radios, "wave2_5g_radios": self.wave2_5g_radios,
"ax210_radios": self.ax210_radios "wave1_radios": self.wave1_radios
} }
dict_all_radios_6g = {"be200_radios": self.be200_radios, dict_all_radios_6g = {"be200_radios": self.be200_radios,
@@ -851,8 +851,8 @@ class lf_libs:
"""Setup sniff radio""" """Setup sniff radio"""
sniff_radio = None sniff_radio = None
if band == "twog": if band == "twog":
all_radio_2g = (self.wave2_2g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + all_radio_2g = (self.be200_radios + self.ax210_radios + self.ax200_radios + self.mtk_radios
self.be200_radios + self.ax210_radios) + self.wave2_2g_radios + self.wave1_radios)
logging.info("All 2g radios" + str(all_radio_2g)) logging.info("All 2g radios" + str(all_radio_2g))
left_radio = list(set(all_radio_2g) - set(list(station_radio_data.keys()))) left_radio = list(set(all_radio_2g) - set(list(station_radio_data.keys())))
if len(left_radio) == 0: if len(left_radio) == 0:
@@ -861,8 +861,8 @@ class lf_libs:
else: else:
sniff_radio = left_radio[0] sniff_radio = left_radio[0]
elif band == "fiveg": elif band == "fiveg":
all_radio_5g = (self.wave2_5g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios all_radio_5g = (self.be200_radios + self.ax210_radios + self.ax200_radios + self.mtk_radios +
+ self.be200_radios + self.ax210_radios) self.wave2_5g_radios + self.wave1_radios)
logging.info("All 5g radios" + str(all_radio_5g)) logging.info("All 5g radios" + str(all_radio_5g))
left_radio = list(set(all_radio_5g) - set(list(station_radio_data.keys()))) left_radio = list(set(all_radio_5g) - set(list(station_radio_data.keys())))
if len(left_radio) == 0: if len(left_radio) == 0:
@@ -1743,20 +1743,20 @@ class lf_libs:
radio_dict_2g = {} radio_dict_2g = {}
radio_dict_5g = {} radio_dict_5g = {}
dict_all_radios_2g = { dict_all_radios_2g = {
"wave2_2g_radios": self.wave2_2g_radios,
"wave1_radios": self.wave1_radios,
"mtk_radios": self.mtk_radios,
"ax200_radios": self.ax200_radios,
"be200_radios": self.be200_radios, "be200_radios": self.be200_radios,
"ax210_radios": self.ax210_radios "ax210_radios": self.ax210_radios,
"ax200_radios": self.ax200_radios,
"mtk_radios": self.mtk_radios,
"wave2_2g_radios": self.wave2_2g_radios,
"wave1_radios": self.wave1_radios
} }
dict_all_radios_5g = { dict_all_radios_5g = {
"wave2_5g_radios": self.wave2_5g_radios,
"wave1_radios": self.wave1_radios,
"mtk_radios": self.mtk_radios,
"ax200_radios": self.ax200_radios,
"be200_radios": self.be200_radios, "be200_radios": self.be200_radios,
"ax210_radios": self.ax210_radios "ax210_radios": self.ax210_radios,
"ax200_radios": self.ax200_radios,
"mtk_radios": self.mtk_radios,
"wave2_5g_radios": self.wave2_5g_radios,
"wave1_radios": self.wave1_radios
} }
max_station_per_radio = { max_station_per_radio = {
"wave2_2g_radios": 64, "wave2_2g_radios": 64,

79
lf_libs/lf_tests.py
View File

@@ -1207,17 +1207,21 @@ class lf_tests(lf_libs):
' password=' + dut_data[identifier]["ssid_data"][idx_]["password"] + ' password=' + dut_data[identifier]["ssid_data"][idx_]["password"] +
' bssid=' + str(dut_data[identifier]["ssid_data"][idx_]["bssid"]).upper()]) ' bssid=' + str(dut_data[identifier]["ssid_data"][idx_]["bssid"]).upper()])
self.update_duts(identifier=identifier, ssid_data=ssid_data) self.update_duts(identifier=identifier, ssid_data=ssid_data)
dict_all_radios_2g = {"wave2_2g_radios": self.wave2_2g_radios, dict_all_radios_2g = {"be200_radios": self.be200_radios,
"wave1_radios": self.wave1_radios, "mtk_radios": self.mtk_radios, "ax210_radios": self.ax210_radios,
"ax200_radios": self.ax200_radios, "ax200_radios": self.ax200_radios,
"be200_radios": self.be200_radios, "mtk_radios": self.mtk_radios,
"ax210_radios": self.ax210_radios} "wave2_2g_radios": self.wave2_2g_radios,
"wave1_radios": self.wave1_radios
}
dict_all_radios_5g = {"wave2_5g_radios": self.wave2_5g_radios, dict_all_radios_5g = {"be200_radios": self.be200_radios,
"wave1_radios": self.wave1_radios, "mtk_radios": self.mtk_radios, "ax210_radios": self.ax210_radios,
"ax200_radios": self.ax200_radios, "ax200_radios": self.ax200_radios,
"be200_radios": self.be200_radios, "mtk_radios": self.mtk_radios,
"ax210_radios": self.ax210_radios} "wave2_5g_radios": self.wave2_5g_radios,
"wave1_radios": self.wave1_radios,
}
dict_all_radios_6g = {"be200_radios": self.be200_radios, "ax210_radios": self.ax210_radios} dict_all_radios_6g = {"be200_radios": self.be200_radios, "ax210_radios": self.ax210_radios}
@@ -1797,11 +1801,11 @@ class lf_tests(lf_libs):
# clean l3 traffics which won't get cleaned by deleting old scenario in CV # clean l3 traffics which won't get cleaned by deleting old scenario in CV
self.client_disconnect(clean_l3_traffic=True) self.client_disconnect(clean_l3_traffic=True)
all_radio_5g = (self.wave2_5g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + all_radio_5g = (self.be200_radios + self.ax210_radios + self.ax200_radios +
self.be200_radios + self.ax210_radios) + self.mtk_radios + self.wave2_5g_radios + self.wave1_radios)
logging.info("All 5g radios" + str(all_radio_5g)) logging.info("All 5g radios" + str(all_radio_5g))
all_radio_2g = (self.wave2_2g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + all_radio_2g = (self.be200_radios + self.ax210_radios + self.ax200_radios +
self.be200_radios + self.ax210_radios) + self.mtk_radios + self.wave2_2g_radios + self.wave1_radios)
logging.info("All 2g radios" + str(all_radio_2g)) logging.info("All 2g radios" + str(all_radio_2g))
radio = all_radio_5g[:2] if band == "5G" else all_radio_2g[:2] radio = all_radio_5g[:2] if band == "5G" else all_radio_2g[:2]
logging.info("Radios: " + str(radio)) logging.info("Radios: " + str(radio))
@@ -2426,11 +2430,11 @@ class lf_tests(lf_libs):
"of data_rates 40% of throughput_1 and 40% of throughput_4 as throughput_7") "of data_rates 40% of throughput_1 and 40% of throughput_4 as throughput_7")
self.client_disconnect(clear_all_sta=True, clean_l3_traffic=True) self.client_disconnect(clear_all_sta=True, clean_l3_traffic=True)
sta = list(map(lambda i: f"sta000{i}", range(3))) sta = list(map(lambda i: f"sta000{i}", range(3)))
all_radio_5g = (self.wave2_5g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + all_radio_5g = (self.be200_radios + self.ax210_radios + self.ax200_radios +
self.be200_radios + self.ax210_radios) + self.mtk_radios + self.wave2_5g_radios + self.wave1_radios)
logging.info("All 5g radios" + str(all_radio_5g)) logging.info("All 5g radios" + str(all_radio_5g))
all_radio_2g = (self.wave2_2g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + all_radio_2g = (self.be200_radios + self.ax210_radios + self.ax200_radios +
self.be200_radios + self.ax210_radios) + self.mtk_radios + self.wave2_2g_radios + self.wave1_radios)
logging.info("All 2g radios" + str(all_radio_2g)) logging.info("All 2g radios" + str(all_radio_2g))
if len(all_radio_5g) < 3: if len(all_radio_5g) < 3:
pytest.fail("3 Radios are not available") pytest.fail("3 Radios are not available")
@@ -2703,12 +2707,12 @@ class lf_tests(lf_libs):
batch_size = batch_size batch_size = batch_size
if band == "twog": if band == "twog":
station_name = self.twog_prefix station_name = self.twog_prefix
radio_prefix = (self.wave2_2g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + radio_prefix = (self.be200_radios + self.ax210_radios + self.ax200_radios +
self.be200_radios + self.ax210_radios) + self.mtk_radios + self.wave2_2g_radios + self.wave1_radios)
elif band == "fiveg": elif band == "fiveg":
station_name = self.fiveg_prefix station_name = self.fiveg_prefix
radio_prefix = (self.wave2_5g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + radio_prefix = (self.be200_radios + self.ax210_radios + self.ax200_radios +
self.be200_radios + self.ax210_radios) + self.mtk_radios + self.wave2_5g_radios + self.wave1_radios)
print("station_name:", station_name) print("station_name:", station_name)
print("radio:", radio_prefix) print("radio:", radio_prefix)
@@ -2994,14 +2998,18 @@ class lf_tests(lf_libs):
copy_num_sta = num_sta copy_num_sta = num_sta
# selecting radio(s) based on the requested bands of the client(s) # selecting radio(s) based on the requested bands of the client(s)
dict_all_radios_2g = {"wave2_2g_radios": self.wave2_2g_radios, "wave1_radios": self.wave1_radios, dict_all_radios_2g = {"be200_radios": self.be200_radios,
"mtk_radios": self.mtk_radios, "ax200_radios": self.ax200_radios, "ax210_radios": self.ax210_radios, "ax200_radios": self.ax200_radios,
"be200_radios": self.be200_radios, "mtk_radios": self.mtk_radios,
"ax210_radios": self.ax210_radios} "wave2_2g_radios": self.wave2_2g_radios,
dict_all_radios_5g = {"wave2_5g_radios": self.wave2_5g_radios, "wave1_radios": self.wave1_radios, "wave1_radios": self.wave1_radios
"mtk_radios": self.mtk_radios, "ax200_radios": self.ax200_radios, }
"be200_radios": self.be200_radios, dict_all_radios_5g = {"be200_radios": self.be200_radios,
"ax210_radios": self.ax210_radios} "ax210_radios": self.ax210_radios, "ax200_radios": self.ax200_radios,
"mtk_radios": self.mtk_radios,
"wave2_5g_radios": self.wave2_5g_radios,
"wave1_radios": self.wave1_radios
}
max_station_per_radio = {"wave2_2g_radios": 64, "wave2_5g_radios": 64, "wave1_radios": 64, "mtk_radios": 19, max_station_per_radio = {"wave2_2g_radios": 64, "wave2_5g_radios": 64, "wave1_radios": 64, "mtk_radios": 19,
"ax200_radios": 1, "ax210_radios": 1, "be200_radios": 1} "ax200_radios": 1, "ax210_radios": 1, "be200_radios": 1}
radio_name_2g = [] radio_name_2g = []
@@ -3169,10 +3177,11 @@ class lf_tests(lf_libs):
logging.info("AP does not support AX mode, so skipping this test.") logging.info("AP does not support AX mode, so skipping this test.")
pytest.skip("AP does not support AX mode, so skipping this test") pytest.skip("AP does not support AX mode, so skipping this test")
dict_all_radios_ax = {"mtk_radios": self.mtk_radios, dict_all_radios_ax = {"be200_radios": self.be200_radios,
"ax210_radios": self.ax210_radios,
"ax200_radios": self.ax200_radios, "ax200_radios": self.ax200_radios,
"be200_radios": self.be200_radios, "mtk_radios": self.mtk_radios,
"ax210_radios": self.ax210_radios} }
selected_ax_radio = None selected_ax_radio = None
for radio in dict_all_radios_ax: for radio in dict_all_radios_ax:
if len(dict_all_radios_ax[radio]) > 0: if len(dict_all_radios_ax[radio]) > 0:
@@ -3733,11 +3742,11 @@ class lf_tests(lf_libs):
dut_data=dut_data) dut_data=dut_data)
sta_list = sta_list + list(station_result.keys()) sta_list = sta_list + list(station_result.keys())
else: else:
all_radio_5g = (self.wave2_5g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + all_radio_5g = (self.be200_radios + self.ax210_radios + self.ax200_radios +
self.be200_radios + self.ax210_radios) + self.mtk_radios + self.wave2_5g_radios + self.wave1_radios)
logging.info("All 5g radios" + str(all_radio_5g)) logging.info("All 5g radios" + str(all_radio_5g))
all_radio_2g = (self.wave2_2g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + all_radio_2g = (self.be200_radios + self.ax210_radios + self.ax200_radios +
self.be200_radios + self.ax210_radios) + self.mtk_radios + self.wave2_2g_radios + self.wave1_radios)
logging.info("All 2g radios" + str(all_radio_2g)) logging.info("All 2g radios" + str(all_radio_2g))
if band == "twog": if band == "twog":
radio_prefix = all_radio_2g radio_prefix = all_radio_2g