From b3e4ecc751f01fc6eea0a6a2e65c16908a91799f Mon Sep 17 00:00:00 2001 From: jitendracandela Date: Thu, 6 Feb 2025 16:11:54 +0530 Subject: [PATCH] set BE radio as priority for WiFi-7 Signed-off-by: jitendracandela --- lf_libs/lf_libs.py | 48 +++++++++++++-------------- lf_libs/lf_tests.py | 79 +++++++++++++++++++++++++-------------------- 2 files changed, 68 insertions(+), 59 deletions(-) diff --git a/lf_libs/lf_libs.py b/lf_libs/lf_libs.py index bd3970fc..55f5ac8b 100644 --- a/lf_libs/lf_libs.py +++ b/lf_libs/lf_libs.py @@ -514,18 +514,18 @@ class lf_libs: r_val[dut]["upstream"] = upstream else: r_val.pop(dut) - 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, - "ax210_radios": self.ax210_radios + dict_all_radios_2g = {"be200_radios": self.be200_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 = {"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, - "ax210_radios": self.ax210_radios + dict_all_radios_5g = {"be200_radios": self.be200_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 } dict_all_radios_6g = {"be200_radios": self.be200_radios, @@ -851,8 +851,8 @@ class lf_libs: """Setup sniff radio""" sniff_radio = None if band == "twog": - all_radio_2g = (self.wave2_2g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + - self.be200_radios + self.ax210_radios) + all_radio_2g = (self.be200_radios + self.ax210_radios + self.ax200_radios + self.mtk_radios + + self.wave2_2g_radios + self.wave1_radios) logging.info("All 2g radios" + str(all_radio_2g)) left_radio = list(set(all_radio_2g) - set(list(station_radio_data.keys()))) if len(left_radio) == 0: @@ -861,8 +861,8 @@ class lf_libs: else: sniff_radio = left_radio[0] elif band == "fiveg": - all_radio_5g = (self.wave2_5g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios - + self.be200_radios + self.ax210_radios) + all_radio_5g = (self.be200_radios + self.ax210_radios + self.ax200_radios + self.mtk_radios + + self.wave2_5g_radios + self.wave1_radios) logging.info("All 5g radios" + str(all_radio_5g)) left_radio = list(set(all_radio_5g) - set(list(station_radio_data.keys()))) if len(left_radio) == 0: @@ -1743,20 +1743,20 @@ class lf_libs: radio_dict_2g = {} radio_dict_5g = {} 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, - "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 = { - "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, - "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, diff --git a/lf_libs/lf_tests.py b/lf_libs/lf_tests.py index ae8edd4c..cadc1d07 100644 --- a/lf_libs/lf_tests.py +++ b/lf_libs/lf_tests.py @@ -1207,17 +1207,21 @@ class lf_tests(lf_libs): ' password=' + dut_data[identifier]["ssid_data"][idx_]["password"] + ' bssid=' + str(dut_data[identifier]["ssid_data"][idx_]["bssid"]).upper()]) self.update_duts(identifier=identifier, ssid_data=ssid_data) - dict_all_radios_2g = {"wave2_2g_radios": self.wave2_2g_radios, - "wave1_radios": self.wave1_radios, "mtk_radios": self.mtk_radios, + dict_all_radios_2g = {"be200_radios": self.be200_radios, + "ax210_radios": self.ax210_radios, "ax200_radios": self.ax200_radios, - "be200_radios": self.be200_radios, - "ax210_radios": self.ax210_radios} + "mtk_radios": self.mtk_radios, + "wave2_2g_radios": self.wave2_2g_radios, + "wave1_radios": self.wave1_radios + } - dict_all_radios_5g = {"wave2_5g_radios": self.wave2_5g_radios, - "wave1_radios": self.wave1_radios, "mtk_radios": self.mtk_radios, + dict_all_radios_5g = {"be200_radios": self.be200_radios, + "ax210_radios": self.ax210_radios, "ax200_radios": self.ax200_radios, - "be200_radios": self.be200_radios, - "ax210_radios": self.ax210_radios} + "mtk_radios": self.mtk_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} @@ -1797,11 +1801,11 @@ class lf_tests(lf_libs): # clean l3 traffics which won't get cleaned by deleting old scenario in CV self.client_disconnect(clean_l3_traffic=True) - all_radio_5g = (self.wave2_5g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + - self.be200_radios + self.ax210_radios) + all_radio_5g = (self.be200_radios + self.ax210_radios + self.ax200_radios + + + self.mtk_radios + self.wave2_5g_radios + self.wave1_radios) 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 + - self.be200_radios + self.ax210_radios) + all_radio_2g = (self.be200_radios + self.ax210_radios + self.ax200_radios + + + self.mtk_radios + self.wave2_2g_radios + self.wave1_radios) logging.info("All 2g radios" + str(all_radio_2g)) radio = all_radio_5g[:2] if band == "5G" else all_radio_2g[:2] 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") self.client_disconnect(clear_all_sta=True, clean_l3_traffic=True) 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 + - self.be200_radios + self.ax210_radios) + all_radio_5g = (self.be200_radios + self.ax210_radios + self.ax200_radios + + + self.mtk_radios + self.wave2_5g_radios + self.wave1_radios) 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 + - self.be200_radios + self.ax210_radios) + all_radio_2g = (self.be200_radios + self.ax210_radios + self.ax200_radios + + + self.mtk_radios + self.wave2_2g_radios + self.wave1_radios) logging.info("All 2g radios" + str(all_radio_2g)) if len(all_radio_5g) < 3: pytest.fail("3 Radios are not available") @@ -2703,12 +2707,12 @@ class lf_tests(lf_libs): batch_size = batch_size if band == "twog": station_name = self.twog_prefix - radio_prefix = (self.wave2_2g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + - self.be200_radios + self.ax210_radios) + radio_prefix = (self.be200_radios + self.ax210_radios + self.ax200_radios + + + self.mtk_radios + self.wave2_2g_radios + self.wave1_radios) elif band == "fiveg": station_name = self.fiveg_prefix - radio_prefix = (self.wave2_5g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + - self.be200_radios + self.ax210_radios) + radio_prefix = (self.be200_radios + self.ax210_radios + self.ax200_radios + + + self.mtk_radios + self.wave2_5g_radios + self.wave1_radios) print("station_name:", station_name) print("radio:", radio_prefix) @@ -2994,14 +2998,18 @@ class lf_tests(lf_libs): copy_num_sta = num_sta # 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, - "mtk_radios": self.mtk_radios, "ax200_radios": self.ax200_radios, - "be200_radios": self.be200_radios, - "ax210_radios": self.ax210_radios} - 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, - "ax210_radios": self.ax210_radios} + dict_all_radios_2g = {"be200_radios": self.be200_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 = {"be200_radios": self.be200_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, "ax200_radios": 1, "ax210_radios": 1, "be200_radios": 1} radio_name_2g = [] @@ -3169,10 +3177,11 @@ class lf_tests(lf_libs): logging.info("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, - "be200_radios": self.be200_radios, - "ax210_radios": self.ax210_radios} + "mtk_radios": self.mtk_radios, + } selected_ax_radio = None for radio in dict_all_radios_ax: if len(dict_all_radios_ax[radio]) > 0: @@ -3733,11 +3742,11 @@ class lf_tests(lf_libs): dut_data=dut_data) sta_list = sta_list + list(station_result.keys()) else: - all_radio_5g = (self.wave2_5g_radios + self.wave1_radios + self.mtk_radios + self.ax200_radios + - self.be200_radios + self.ax210_radios) + all_radio_5g = (self.be200_radios + self.ax210_radios + self.ax200_radios + + + self.mtk_radios + self.wave2_5g_radios + self.wave1_radios) 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 + - self.be200_radios + self.ax210_radios) + all_radio_2g = (self.be200_radios + self.ax210_radios + self.ax200_radios + + + self.mtk_radios + self.wave2_2g_radios + self.wave1_radios) logging.info("All 2g radios" + str(all_radio_2g)) if band == "twog": radio_prefix = all_radio_2g