From c1981ee7f3c2cec798b4ab4adf7c2ba9af8864b2 Mon Sep 17 00:00:00 2001 From: jitendracandela <78074038+jitendracandela@users.noreply.github.com> Date: Wed, 15 Jun 2022 20:29:06 +0530 Subject: [PATCH] Wifi 9597 (#612) * Added wifi6e comparasion in dfs and dfs_logread methods Signed-off-by: jitendracandela * Added upstream_resource in client_connect method Signed-off-by: jitendracandela * Replaced one client to max Signed-off-by: jitendracandela --- libs/apnos/apnos.py | 4 ++-- libs/lanforge/lf_tests.py | 2 +- .../wifi_capacity_test/wpa2_personal/test_bridge_mode.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/apnos/apnos.py b/libs/apnos/apnos.py index fd03288f8..67fdf83a2 100644 --- a/libs/apnos/apnos.py +++ b/libs/apnos/apnos.py @@ -633,7 +633,7 @@ class APNOS: client.close() command = f"cd ~/cicd-git/ && ./openwrt_ctl.py {self.owrt_args} -t {self.tty} --action " \ f"cmd --value \"{cmd}\" " - elif self.type.lower() == "wifi6": + elif self.type.lower() == "wifi6" or self.type.lower() == "wifi6e": cmd = f'cd && cd /sys/kernel/debug/ath11k/ && cd ipq* && cd mac0 && ls && echo 1 > dfs_simulate_radar' print("cmd: ", cmd) if self.mode: @@ -662,7 +662,7 @@ class APNOS: if self.mode: cmd = f"cd ~/cicd-git/ && ./openwrt_ctl.py {self.owrt_args} -t {self.tty} --action " \ f"cmd --value \"{cmd}\" " - elif self.type.lower() == "wifi6": + elif self.type.lower() == "wifi6" or self.type.lower() == "wifi6e": cmd = f'cd && cd /sys/kernel/debug/ath11k/ && cd ipq* && cd mac0 && logread | grep DFS' print("cmd: ", cmd) if self.mode: diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py index 48a156a24..307fb498a 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -537,7 +537,7 @@ class RunTest: self.client_connect = CreateStation(_host=self.lanforge_ip, _port=self.lanforge_port, _sta_list=station_name, _password=passkey, _ssid=ssid, _security=security) self.client_connect.station_profile.sta_mode = 0 - self.client_connect.upstream_resource = 1 + self.client_connect.upstream_resource = self.upstream_resource if mode == "BRIDGE": self.client_connect.upstream_port = self.upstream_port elif mode == "NAT": diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py index cee23074f..12fc75bdd 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py @@ -62,8 +62,8 @@ class TestWifiCapacityBRIDGEModeDualBand(object): max = int(get_apnos_max_clients[0]) sets = [["DUT_NAME", lf_tools.dut_name]] print("sets", sets) - lf_tools.add_stations(band="2G", num_stations=1, dut=lf_tools.dut_name, ssid_name=ssid_name) - lf_tools.add_stations(band="5G", num_stations=1, dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="2G", num_stations=max, dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations=max, dut=lf_tools.dut_name, ssid_name=ssid_name) # lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) lf_tools.Chamber_View() influx_tags = "wifi-capacity-tcp-download-bridge-wpa2-2.4G-5G"