From d95248a2f3e8be5189572c5ea775792d4b36ee4d Mon Sep 17 00:00:00 2001 From: Haricharan Jaka <87761091+haricharan-jaka@users.noreply.github.com> Date: Wed, 15 Jun 2022 00:33:50 +0530 Subject: [PATCH] Wifi 9420 (#608) * Added vlan id to rate limiting interop testcases Signed-off-by: haricharan-jaka * Added patch for search button on Android devices while running speed test Signed-off-by: haricharan-jaka * Removed unnecessary lines in verifyUploadDownloadSpeed Library func in Android Signed-off-by: haricharan-jaka * Removed unnecessary lines in verifyUploadDownloadSpeed Library func in Android Signed-off-by: haricharan-jaka --- libs/perfecto_libs/android_lib.py | 4 ++++ .../vlan_mode/rate_limiting/android/test_rate_limiting.py | 6 ++++++ .../vlan_mode/rate_limiting/iOS/test_rate_limiting.py | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/libs/perfecto_libs/android_lib.py b/libs/perfecto_libs/android_lib.py index a03923559..268f1db7c 100644 --- a/libs/perfecto_libs/android_lib.py +++ b/libs/perfecto_libs/android_lib.py @@ -601,6 +601,8 @@ def verifyUploadDownloadSpeed_android(request, setup_perfectoMobile, get_APToMob driver.implicitly_wait(2) elelSearch = driver.find_element_by_xpath("//*[@class='aajZCb']//*[@class='nz2CCf']/li[1]/div[2]") elelSearch.click() + print("Keyboard enter") + driver.press_keycode(66) except: try: time.sleep(2) @@ -7504,6 +7506,8 @@ def return_upload_download_speed_android(request, setup_perfectoMobile, get_APTo driver.implicitly_wait(2) elelSearch = driver.find_element_by_xpath("//*[@class='aajZCb']//*[@class='nz2CCf']/li[1]/div[2]") elelSearch.click() + print("Keyboard enter") + driver.press_keycode(66) except: try: time.sleep(2) diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/rate_limiting/android/test_rate_limiting.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/rate_limiting/android/test_rate_limiting.py index 07b42e7bd..b885c665c 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/rate_limiting/android/test_rate_limiting.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/rate_limiting/android/test_rate_limiting.py @@ -30,6 +30,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa2_2g_RL", "appliedRadios": ["2G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -38,6 +39,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa2_5g_RL", "appliedRadios": ["5G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -48,6 +50,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa_2g_RL", "appliedRadios": ["2G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -56,6 +59,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa_5g_RL", "appliedRadios": ["5G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -66,6 +70,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa3_2g_RL", "appliedRadios": ["2G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -74,6 +79,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa3_5g_RL", "appliedRadios": ["5G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/rate_limiting/iOS/test_rate_limiting.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/rate_limiting/iOS/test_rate_limiting.py index f5af688af..539b61dc3 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/rate_limiting/iOS/test_rate_limiting.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/rate_limiting/iOS/test_rate_limiting.py @@ -31,6 +31,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa2_2g_RL", "appliedRadios": ["2G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -39,6 +40,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa2_5g_RL", "appliedRadios": ["5G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -49,6 +51,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa_2g_RL", "appliedRadios": ["2G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -57,6 +60,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa_5g_RL", "appliedRadios": ["5G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -67,6 +71,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa3_2g_RL", "appliedRadios": ["2G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10 @@ -75,6 +80,7 @@ setup_params_general = { {"ssid_name": "ssid_wpa3_5g_RL", "appliedRadios": ["5G"], "security_key": "something", + "vlan": 100, "rate-limit": { "ingress-rate": 60, "egress-rate": 10