diff --git a/tests/e2e/interOp/captive_portal/nat_mode/android/test_captive_portal_modes.py b/tests/e2e/interOp/captive_portal/nat_mode/android/test_captive_portal_modes.py index df58fbef0..78716a891 100644 --- a/tests/e2e/interOp/captive_portal/nat_mode/android/test_captive_portal_modes.py +++ b/tests/e2e/interOp/captive_portal/nat_mode/android/test_captive_portal_modes.py @@ -21,8 +21,8 @@ if 'perfecto_libs' not in sys.path: from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, \ get_ip_address_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, captive_portal_and -pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.captive_portal - ,pytest.mark.regression_interop, pytest.mark.nat] +pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.internal_captive_portal + ,pytest.mark.regression_interop, pytest.mark.nat, pytest.mark.ow_sanity_interop] setup_params_general = { "mode": "NAT", diff --git a/tests/e2e/interOp/captive_portal/nat_mode/ios/test_captive_portal_modes.py b/tests/e2e/interOp/captive_portal/nat_mode/ios/test_captive_portal_modes.py index 7fc7f575a..ee1f24ebe 100644 --- a/tests/e2e/interOp/captive_portal/nat_mode/ios/test_captive_portal_modes.py +++ b/tests/e2e/interOp/captive_portal/nat_mode/ios/test_captive_portal_modes.py @@ -23,7 +23,7 @@ from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnecti verifyUploadDownloadSpeediOS, get_ip_address_ios, captive_portal_ios, wifi_connect, wifi_disconnect_and_forget pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, - pytest.mark.captive_portal, pytest.mark.regression_interop, pytest.mark.nat] + pytest.mark.internal_captive_portal, pytest.mark.regression_interop, pytest.mark.nat, pytest.mark.ow_sanity_interop] setup_params_general = { "mode": "NAT", diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_BridgeMode.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_BridgeMode.py index 938af2c72..6c58f4291 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_BridgeMode.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_BridgeMode.py @@ -1,213 +1,213 @@ -from logging import exception -import unittest -import warnings -from perfecto.test import TestResultFactory -import pytest -import sys -import time -from selenium.common.exceptions import NoSuchElementException -from selenium.webdriver.common.by import By -from appium import webdriver -from selenium.common.exceptions import NoSuchElementException - -import sys -import allure - -if 'perfecto_libs' not in sys.path: - sys.path.append(f'../libs/perfecto_libs') - -pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, - pytest.mark.ClientConnectivity] - -from android_lib import closeApp, set_APconnMobileDevice_android, verifyUploadDownloadSpeed_android, \ - Toggle_AirplaneMode_android, ForgetWifiConnection, openApp - -setup_params_general = { - "mode": "BRIDGE", - "ssid_modes": { - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], - "security_key": "something"}], - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], - "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], - "security_key": "something"}]}, - "rf": {}, - "radius": False -} - - -@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") -@pytest.mark.parametrize( - 'setup_profiles', - [setup_params_general], - indirect=True, - scope="class" -) -@pytest.mark.usefixtures("setup_profiles") -class TestBridgeMode(object): - - @pytest.mark.fiveg - @pytest.mark.wpa2_personal - def test_ClientConnectivity_5g_WPA2_Personal_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, - setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] - ssidName = profile_data["ssid_name"] - ssidPassword = profile_data["security_key"] - print("SSID_NAME: " + ssidName) - print("SSID_PASS: " + ssidPassword) - - if ssidName not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - - report = setup_perfectoMobile_android[1] - driver = setup_perfectoMobile_android[0] - connData = get_APToMobileDevice_data - - # Set Wifi/AP Mode - set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) - - # Toggle AirplaneMode - assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - - # ForgetWifi - ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) - - @pytest.mark.twog - @pytest.mark.wpa2_personal - def test_ClientConnectivity_2g_WPA2_Personal_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, - setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] - ssidName = profile_data["ssid_name"] - ssidPassword = profile_data["security_key"] - print("SSID_NAME: " + ssidName) - print("SSID_PASS: " + ssidPassword) - - if ssidName not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - - report = setup_perfectoMobile_android[1] - driver = setup_perfectoMobile_android[0] - connData = get_APToMobileDevice_data - - # Set Wifi/AP Mode - set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) - - # Toggle AirplaneMode - assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - - # ForgetWifi - ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) - - @pytest.mark.twog - @pytest.mark.wpa - def test_ClientConnectivity_2g_WPA_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, - setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa"][0] - ssidName = profile_data["ssid_name"] - ssidPassword = profile_data["security_key"] - print("SSID_NAME: " + ssidName) - print("SSID_PASS: " + ssidPassword) - - if ssidName not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - - report = setup_perfectoMobile_android[1] - driver = setup_perfectoMobile_android[0] - connData = get_APToMobileDevice_data - - # Set Wifi/AP Mode - set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) - - # Toggle AirplaneMode - assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - - # ForgetWifi - ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) - - @pytest.mark.fiveg - @pytest.mark.wpa - def test_ClientConnectivity_5g_WPA_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, - setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa"][1] - ssidName = profile_data["ssid_name"] - ssidPassword = profile_data["security_key"] - print("SSID_NAME: " + ssidName) - print("SSID_PASS: " + ssidPassword) - - if ssidName not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - - report = setup_perfectoMobile_android[1] - driver = setup_perfectoMobile_android[0] - connData = get_APToMobileDevice_data - - # Set Wifi/AP Mode - set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) - - # Toggle AirplaneMode - assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - - # ForgetWifi - ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) - - @pytest.mark.twog - @pytest.mark.open - def test_ClientConnectivity_2g_OPEN_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, - setup_perfectoMobile_android): - - profile_data = setup_params_general["ssid_modes"]["open"][0] - ssidName = profile_data["ssid_name"] - ssidPassword = "[BLANK]" - print("SSID_NAME: " + ssidName) - print("SSID_PASS: " + ssidPassword) - if ssidName not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - - report = setup_perfectoMobile_android[1] - driver = setup_perfectoMobile_android[0] - connData = get_APToMobileDevice_data - - # Set Wifi/AP Mode - set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) - - # Toggle AirplaneMode - assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - - # ForgetWifi - ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) - - @pytest.mark.fiveg - @pytest.mark.open - def test_ClientConnectivity_5g_OPEN_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, - setup_perfectoMobile_android): - - profile_data = setup_params_general["ssid_modes"]["open"][1] - ssidName = profile_data["ssid_name"] - ssidPassword = "[BLANK]" - print("SSID_NAME: " + ssidName) - print("SSID_PASS: " + ssidPassword) - - if ssidName not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - - report = setup_perfectoMobile_android[1] - driver = setup_perfectoMobile_android[0] - connData = get_APToMobileDevice_data - - # Set Wifi/AP Mode - set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) - - # Toggle AirplaneMode - assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - - # ForgetWifi - ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) +# from logging import exception +# import unittest +# import warnings +# from perfecto.test import TestResultFactory +# import pytest +# import sys +# import time +# from selenium.common.exceptions import NoSuchElementException +# from selenium.webdriver.common.by import By +# from appium import webdriver +# from selenium.common.exceptions import NoSuchElementException +# +# import sys +# import allure +# +# if 'perfecto_libs' not in sys.path: +# sys.path.append(f'../libs/perfecto_libs') +# +# pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, +# pytest.mark.ClientConnectivity] +# +# from android_lib import closeApp, set_APconnMobileDevice_android, verifyUploadDownloadSpeed_android, \ +# Toggle_AirplaneMode_android, ForgetWifiConnection, openApp +# +# setup_params_general = { +# "mode": "BRIDGE", +# "ssid_modes": { +# "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, +# {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], +# "security_key": "something"}], +# "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], +# "wpa2_personal": [ +# {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, +# {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], +# "security_key": "something"}]}, +# "rf": {}, +# "radius": False +# } +# +# +# @allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") +# @pytest.mark.parametrize( +# 'setup_profiles', +# [setup_params_general], +# indirect=True, +# scope="class" +# ) +# @pytest.mark.usefixtures("setup_profiles") +# class TestBridgeMode(object): +# +# @pytest.mark.fiveg +# @pytest.mark.wpa2_personal +# def test_ClientConnectivity_5g_WPA2_Personal_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, +# setup_perfectoMobile_android): +# profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] +# ssidName = profile_data["ssid_name"] +# ssidPassword = profile_data["security_key"] +# print("SSID_NAME: " + ssidName) +# print("SSID_PASS: " + ssidPassword) +# +# if ssidName not in get_vif_state: +# allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) +# pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") +# +# report = setup_perfectoMobile_android[1] +# driver = setup_perfectoMobile_android[0] +# connData = get_APToMobileDevice_data +# +# # Set Wifi/AP Mode +# set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) +# +# # Toggle AirplaneMode +# assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) +# +# # ForgetWifi +# ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) +# +# @pytest.mark.twog +# @pytest.mark.wpa2_personal +# def test_ClientConnectivity_2g_WPA2_Personal_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, +# setup_perfectoMobile_android): +# profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] +# ssidName = profile_data["ssid_name"] +# ssidPassword = profile_data["security_key"] +# print("SSID_NAME: " + ssidName) +# print("SSID_PASS: " + ssidPassword) +# +# if ssidName not in get_vif_state: +# allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) +# pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") +# +# report = setup_perfectoMobile_android[1] +# driver = setup_perfectoMobile_android[0] +# connData = get_APToMobileDevice_data +# +# # Set Wifi/AP Mode +# set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) +# +# # Toggle AirplaneMode +# assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) +# +# # ForgetWifi +# ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) +# +# @pytest.mark.twog +# @pytest.mark.wpa +# def test_ClientConnectivity_2g_WPA_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, +# setup_perfectoMobile_android): +# profile_data = setup_params_general["ssid_modes"]["wpa"][0] +# ssidName = profile_data["ssid_name"] +# ssidPassword = profile_data["security_key"] +# print("SSID_NAME: " + ssidName) +# print("SSID_PASS: " + ssidPassword) +# +# if ssidName not in get_vif_state: +# allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) +# pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") +# +# report = setup_perfectoMobile_android[1] +# driver = setup_perfectoMobile_android[0] +# connData = get_APToMobileDevice_data +# +# # Set Wifi/AP Mode +# set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) +# +# # Toggle AirplaneMode +# assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) +# +# # ForgetWifi +# ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) +# +# @pytest.mark.fiveg +# @pytest.mark.wpa +# def test_ClientConnectivity_5g_WPA_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, +# setup_perfectoMobile_android): +# profile_data = setup_params_general["ssid_modes"]["wpa"][1] +# ssidName = profile_data["ssid_name"] +# ssidPassword = profile_data["security_key"] +# print("SSID_NAME: " + ssidName) +# print("SSID_PASS: " + ssidPassword) +# +# if ssidName not in get_vif_state: +# allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) +# pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") +# +# report = setup_perfectoMobile_android[1] +# driver = setup_perfectoMobile_android[0] +# connData = get_APToMobileDevice_data +# +# # Set Wifi/AP Mode +# set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) +# +# # Toggle AirplaneMode +# assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) +# +# # ForgetWifi +# ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) +# +# @pytest.mark.twog +# @pytest.mark.open +# def test_ClientConnectivity_2g_OPEN_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, +# setup_perfectoMobile_android): +# +# profile_data = setup_params_general["ssid_modes"]["open"][0] +# ssidName = profile_data["ssid_name"] +# ssidPassword = "[BLANK]" +# print("SSID_NAME: " + ssidName) +# print("SSID_PASS: " + ssidPassword) +# if ssidName not in get_vif_state: +# allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) +# pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") +# +# report = setup_perfectoMobile_android[1] +# driver = setup_perfectoMobile_android[0] +# connData = get_APToMobileDevice_data +# +# # Set Wifi/AP Mode +# set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) +# +# # Toggle AirplaneMode +# assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) +# +# # ForgetWifi +# ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) +# +# @pytest.mark.fiveg +# @pytest.mark.open +# def test_ClientConnectivity_5g_OPEN_Bridge(self, request, get_vif_state, get_APToMobileDevice_data, +# setup_perfectoMobile_android): +# +# profile_data = setup_params_general["ssid_modes"]["open"][1] +# ssidName = profile_data["ssid_name"] +# ssidPassword = "[BLANK]" +# print("SSID_NAME: " + ssidName) +# print("SSID_PASS: " + ssidPassword) +# +# if ssidName not in get_vif_state: +# allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) +# pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") +# +# report = setup_perfectoMobile_android[1] +# driver = setup_perfectoMobile_android[0] +# connData = get_APToMobileDevice_data +# +# # Set Wifi/AP Mode +# set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) +# +# # Toggle AirplaneMode +# assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) +# +# # ForgetWifi +# ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_enterprise_ttls.py index c23ce8237..20c6e330f 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_enterprise_ttls.py @@ -18,7 +18,7 @@ if 'perfecto_libs' not in sys.path: sys.path.append(f'../libs/perfecto_libs') pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.client_connect - ,pytest.mark.interop_uc_sanity, pytest.mark.bridge, pytest.mark.enterprise] + ,pytest.mark.interop_uc_sanity, pytest.mark.bridge, pytest.mark.enterprise, pytest.mark.ow_sanity_interop] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, get_ip_address_eap_and diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_general_security_modes.py index 86a89b439..109ae9e4c 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/android/test_general_security_modes.py @@ -18,7 +18,7 @@ if 'perfecto_libs' not in sys.path: sys.path.append(f'../libs/perfecto_libs') pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.client_connect - ,pytest.mark.interop_uc_sanity, pytest.mark.bridge] + ,pytest.mark.interop_uc_sanity, pytest.mark.bridge, pytest.mark.ow_sanity_interop] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, get_ip_address_and diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_enterprise_ttls.py index 23731e04c..3270ab83d 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_enterprise_ttls.py @@ -23,7 +23,7 @@ from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnecti verifyUploadDownloadSpeediOS, get_ip_address_eap_ios pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_connect - ,pytest.mark.interop_uc_sanity, pytest.mark.bridge, pytest.mark.enterprise] + ,pytest.mark.interop_uc_sanity, pytest.mark.bridge, pytest.mark.enterprise, pytest.mark.ow_sanity_interop] setup_params_enterprise = { "mode": "BRIDGE", diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_general_security_modes.py index dc8f56f90..aab85e3f6 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/client_connect_test/iOS/test_general_security_modes.py @@ -23,7 +23,7 @@ from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnecti verifyUploadDownloadSpeediOS, get_ip_address_ios pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, - pytest.mark.client_connect, pytest.mark.interop_uc_sanity, pytest.mark.bridge] + pytest.mark.client_connect, pytest.mark.interop_uc_sanity, pytest.mark.bridge, pytest.mark.ow_sanity_interop] setup_params_general = { "mode": "BRIDGE", diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/multi_psk/android/test_multipsk_wpa.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/multi_psk/android/test_multipsk_wpa.py index f7a33991d..a99896e63 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/multi_psk/android/test_multipsk_wpa.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/multi_psk/android/test_multipsk_wpa.py @@ -193,6 +193,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa @pytest.mark.twog + @pytest.mark.two_vlan def test_multi_psk_wpa_2g_2vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] @@ -261,6 +262,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa @pytest.mark.fiveg + @pytest.mark.two_vlan def test_multi_psk_wpa_5g_2vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] @@ -330,6 +332,7 @@ class TestMultipskBridge(object): #-------------4 Vlans---------------------------------- @pytest.mark.wpa @pytest.mark.twog + @pytest.mark.four_vlan def test_multi_psk_wpa_2g_4vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] @@ -446,6 +449,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa @pytest.mark.fiveg + @pytest.mark.four_vlan def test_multi_psk_wpa_5g_4vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] @@ -565,6 +569,7 @@ class TestMultipskBridge(object): # -------------8 Vlans---------------------------------- @pytest.mark.wpa @pytest.mark.twog + @pytest.mark.eight_vlan def test_multi_psk_wpa_2g_8vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] @@ -777,6 +782,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa @pytest.mark.fiveg + @pytest.mark.eight_vlan def test_multi_psk_wpa_5g_8vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] @@ -992,6 +998,7 @@ class TestMultipskBridge(object): # -------------16 Vlans---------------------------------- @pytest.mark.wpa @pytest.mark.twog + @pytest.mark.sixteen_vlan def test_multi_psk_wpa_2g_16vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] @@ -1397,6 +1404,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa @pytest.mark.fiveg + @pytest.mark.sixteen_vlan def test_multi_psk_wpa_5g_16vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/multi_psk/android/test_multipsk_wpa2.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/multi_psk/android/test_multipsk_wpa2.py index ae2d18278..e479ba94b 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/multi_psk/android/test_multipsk_wpa2.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/multi_psk/android/test_multipsk_wpa2.py @@ -193,6 +193,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.two_vlan def test_multi_psk_wpa2_2g_2vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -261,6 +262,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.two_vlan def test_multi_psk_wpa2_5g_2vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -330,6 +332,7 @@ class TestMultipskBridge(object): #-------------4 Vlans---------------------------------- @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.four_vlan def test_multi_psk_wpa2_2g_4vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -446,6 +449,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.four_vlan def test_multi_psk_wpa2_5g_4vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -565,6 +569,7 @@ class TestMultipskBridge(object): # -------------8 Vlans---------------------------------- @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.eight_vlan def test_multi_psk_wpa2_2g_8vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -777,6 +782,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.eight_vlan def test_multi_psk_wpa2_5g_8vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] @@ -992,6 +998,7 @@ class TestMultipskBridge(object): # -------------16 Vlans---------------------------------- @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.sixteen_vlan def test_multi_psk_wpa2_2g_16vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -1397,6 +1404,7 @@ class TestMultipskBridge(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.sixteen_vlan def test_multi_psk_wpa2_5g_16vlans(self, request, get_vif_state, get_ap_logs, lf_tools, get_configuration, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/android/test_rate_limiting.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/android/test_rate_limiting.py index 535fafda7..baaec8211 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/android/test_rate_limiting.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/android/test_rate_limiting.py @@ -105,6 +105,7 @@ class TestRateLimitingBridge(object): @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -137,6 +138,7 @@ class TestRateLimitingBridge(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/iOS/test_rate_limiting.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/iOS/test_rate_limiting.py index 83c665d31..555f176fa 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/iOS/test_rate_limiting.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/rate_limiting/iOS/test_rate_limiting.py @@ -107,6 +107,7 @@ class TestRateLimitingBridge(object): @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -139,6 +140,7 @@ class TestRateLimitingBridge(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/rate_limiting/android/test_rate_limiting.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/rate_limiting/android/test_rate_limiting.py index fbfde3dc0..d38069730 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/rate_limiting/android/test_rate_limiting.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/rate_limiting/android/test_rate_limiting.py @@ -105,6 +105,7 @@ class TestRateLimitingNAT(object): @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -137,6 +138,7 @@ class TestRateLimitingNAT(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/rate_limiting/iOS/test_rate_limiting.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/rate_limiting/iOS/test_rate_limiting.py index 746d8db2e..97406e5f5 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/rate_limiting/iOS/test_rate_limiting.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/rate_limiting/iOS/test_rate_limiting.py @@ -106,6 +106,7 @@ class TestRateLimitingNAT(object): @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -138,6 +139,7 @@ class TestRateLimitingNAT(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] 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 8887d238a..07b42e7bd 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 @@ -105,6 +105,7 @@ class TestRateLimitingVLAN(object): @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -137,6 +138,7 @@ class TestRateLimitingVLAN(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] 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 addc155ab..f5af688af 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 @@ -107,6 +107,7 @@ class TestRateLimitingVLAN(object): @pytest.mark.wpa2_personal @pytest.mark.twog + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_2g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] @@ -139,6 +140,7 @@ class TestRateLimitingVLAN(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg + @pytest.mark.ow_sanity_interop def test_rate_limiting_wpa2_5g(self, request, get_vif_state, get_ap_logs, get_ToggleAirplaneMode_data, setup_perfectoMobile_iOS): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]