From 19d5c803098ff8dd07b2dd30223e421291f3e7c3 Mon Sep 17 00:00:00 2001 From: Haricharan Jaka <87761091+haricharan-jaka@users.noreply.github.com> Date: Wed, 2 Mar 2022 21:40:18 +0530 Subject: [PATCH] Wifi 7173 (#398) * changed scroll_up_pixel function to scroll_up in Android lib Signed-off-by: haricharan-jaka * changed names of functions for Client Reconnect in Android lib Signed-off-by: haricharan-jaka * Added pixel code in all of Pixel functions related to Scroll up patch Signed-off-by: haricharan-jaka * changed names of functions for Client Reconnect in Ios lib Signed-off-by: haricharan-jaka * Changed Client reconnect functions name in Test cases of Android Signed-off-by: haricharan-jaka * Changed Client reconnect functions name in Test cases of iOS Signed-off-by: haricharan-jaka * Added Pixel Sanity patch by adding extra scroll up if needed Signed-off-by: haricharan-jaka --- libs/perfecto_libs/android_lib.py | 183 ++++++++++-------- libs/perfecto_libs/iOS_lib.py | 6 +- .../android/test_enterprise_ttls.py | 26 +-- .../android/test_general_security_modes.py | 50 ++--- .../iOS/test_enterprise_ttls.py | 26 +-- .../iOS/test_general_securtiy_modes.py | 50 ++--- .../android/test_enterprise_ttls.py | 26 +-- .../android/test_general_security_modes.py | 50 ++--- .../iOS/test_enterprise_ttls.py | 26 +-- .../iOS/test_general_security_modes.py | 50 ++--- .../android/test_enterprise_ttls.py | 26 +-- .../android/test_general_security_modes.py | 50 ++--- .../iOS/test_enterprise_ttls.py | 26 +-- .../iOS/test_general_security_modes.py | 50 ++--- .../android/test_enterprise_ttls.py | 26 +-- .../android/test_general_security_modes.py | 50 ++--- .../iOS/test_enterprise_ttls.py | 26 +-- .../iOS/test_general_security_modes.py | 50 ++--- .../android/test_enterprise_ttls.py | 26 +-- .../android/test_general_security_modes.py | 50 ++--- .../iOS/test_enterprise_ttls.py | 26 +-- .../iOS/test_general_security_modes.py | 50 ++--- .../android/test_enterprise_ttls.py | 26 +-- .../android/test_general_security_modes.py | 50 ++--- .../iOS/test_enterprise_ttls.py | 26 +-- .../iOS/test_general_security_modes.py | 50 ++--- 26 files changed, 559 insertions(+), 542 deletions(-) diff --git a/libs/perfecto_libs/android_lib.py b/libs/perfecto_libs/android_lib.py index 6ef8dd2fb..741791a76 100644 --- a/libs/perfecto_libs/android_lib.py +++ b/libs/perfecto_libs/android_lib.py @@ -1678,7 +1678,7 @@ def get_ip_address_and(request, WifiName, WifiPass, setup_perfectoMobile, connDa print("couldn't find wifi in available ssid") if not ssid_found: ssid_not_found = False - for k in range(3): + for k in range(5): available_ssids = get_all_available_ssids(driver, deviceModelName) print("active_ssid_list: ", available_ssids) allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) @@ -2224,7 +2224,7 @@ def wifi_connect(request, WifiName, WifiPass, setup_perfectoMobile, connData): # This is To get all available ssids # ------------------------------------------------------ try: - for k in range(3): + for k in range(5): available_ssids = get_all_available_ssids(driver, deviceModelName) print("active_ssid_list: ", available_ssids) #allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) @@ -2241,21 +2241,22 @@ def wifi_connect(request, WifiName, WifiPass, setup_perfectoMobile, connData): print("couldn't find wifi in available ssid") if not ssid_found: ssid_not_found = False - for k in range(3): + for k in range(5): + available_ssids = get_all_available_ssids(driver, deviceModelName) + print("active_ssid_list: ", available_ssids) + allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) try: - report.step_start("Selecting Wifi: " + WifiName) - wifi_selection_element = WebDriverWait(driver, 35).until( - EC.presence_of_element_located( - (MobileBy.XPATH, "//*[@text='" + WifiName + "']"))) - wifi_selection_element.click() - ssid_not_found = False - check_if_no_internet_popup(driver) - break - except Exception as e: - ssid_not_found = True - print("Exception on Selecting Wifi Network. Please check wifi Name or signal") - scroll_up_pixel(setup_perfectoMobile) - if ssid_not_found: + if WifiName not in available_ssids: + scroll_up(setup_perfectoMobile) + time.sleep(2) + else: + ssid_not_found = True + print(WifiName + " : Found in Device") + # allure.attach(name= body=str(WifiName+" : Found in Device")) + break + except: + print("couldn't find wifi in available ssid") + if not ssid_not_found: print("could not found " + WifiName + " in device") # allure.attach(name= body=str("could not found" + WifiName + " in device")) closeApp(connData["appPackage-android"], setup_perfectoMobile) @@ -2308,14 +2309,7 @@ def wifi_connect(request, WifiName, WifiPass, setup_perfectoMobile, connData): # ------------------------------------------------------- try: report.step_start("Verify if Wifi is Connected") - try: - WifiInternetErrMsg = WebDriverWait(driver, 35).until( - EC.presence_of_element_located((MobileBy.XPATH, - "//*[@resource-id='android:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) - except: - print("Not able to verify the connected WiFi. Scrolling up.") - scroll_up_pixel(setup_perfectoMobile) - WifiInternetErrMsg = WebDriverWait(driver, 35).until( + WifiInternetErrMsg = WebDriverWait(driver, 35).until( EC.presence_of_element_located((MobileBy.XPATH, "//*[@resource-id='android:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) ssid_with_internet = True @@ -2324,7 +2318,10 @@ def wifi_connect(request, WifiName, WifiPass, setup_perfectoMobile, connData): check_if_no_internet_popup(driver) except: try: - check_if_no_internet_popup(driver) + print("Not able to verify the connected WiFi. Scrolling up.") + scroll_up(setup_perfectoMobile) + scroll_up(setup_perfectoMobile) + # check_if_no_internet_popup(driver) WifiInternetErrMsg = WebDriverWait(driver, 35).until( EC.presence_of_element_located((MobileBy.XPATH, "//*[@resource-id='com.android.settings:id/summary' and @text='Connected without internet']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) @@ -2333,9 +2330,11 @@ def wifi_connect(request, WifiName, WifiPass, setup_perfectoMobile, connData): except: try: report.step_start("Verify if Wifi is Connected") + print("Verifying after scrolling") + scroll_up(setup_perfectoMobile) WifiInternetErrMsg = WebDriverWait(driver, 60).until(EC.presence_of_element_located(( MobileBy.XPATH, - "//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) + "//*[@resource-id='android:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) ssid_with_internet = True print("Wifi Successfully Connected") except NoSuchElementException: @@ -3526,7 +3525,7 @@ def get_ip_address_eap_and(request, WifiName, User, ttls_passwd, setup_perfectoM print("couldn't find wifi in available ssid") if not ssid_found: ssid_not_found = False - for k in range(3): + for k in range(5): available_ssids = get_all_available_ssids(driver, deviceModelName) print("active_ssid_list: ", available_ssids) allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) @@ -4140,7 +4139,7 @@ def wifi_connect_eap(request, WifiName, User, ttls_passwd, setup_perfectoMobile, # This is To get all available ssids # ------------------------------------------------------ try: - for k in range(3): + for k in range(5): available_ssids = get_all_available_ssids(driver, deviceModelName) print("active_ssid_list: ", available_ssids) allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) @@ -4157,21 +4156,22 @@ def wifi_connect_eap(request, WifiName, User, ttls_passwd, setup_perfectoMobile, print("couldn't find wifi in available ssid") if not ssid_found: ssid_not_found = False - for k in range(3): + for k in range(5): + available_ssids = get_all_available_ssids(driver, deviceModelName) + print("active_ssid_list: ", available_ssids) + allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) try: - report.step_start("Selecting Wifi: " + WifiName) - wifi_selection_element = WebDriverWait(driver, 35).until( - EC.presence_of_element_located( - (MobileBy.XPATH, "//*[@text='" + WifiName + "']"))) - wifi_selection_element.click() - ssid_not_found = False - check_if_no_internet_popup(driver) - break - except Exception as e: - ssid_not_found = True - print("Exception on Selecting Wifi Network. Please check wifi Name or signal") - scroll_up_pixel(setup_perfectoMobile) - if ssid_not_found: + if WifiName not in available_ssids: + scroll_up(setup_perfectoMobile) + time.sleep(2) + else: + ssid_not_found = True + print(WifiName + " : Found in Device") + # allure.attach(name= body=str(WifiName+" : Found in Device")) + break + except: + print("couldn't find wifi in available ssid") + if not ssid_not_found: print("could not found " + WifiName + " in device") # allure.attach(name= body=str("could not found" + WifiName + " in device")) closeApp(connData["appPackage-android"], setup_perfectoMobile) @@ -4271,7 +4271,10 @@ def wifi_connect_eap(request, WifiName, User, ttls_passwd, setup_perfectoMobile, check_if_no_internet_popup(driver) except: try: - check_if_no_internet_popup(driver) + print("Not able to verify the connected WiFi. Scrolling up.") + scroll_up(setup_perfectoMobile) + scroll_up(setup_perfectoMobile) + # check_if_no_internet_popup(driver) WifiInternetErrMsg = WebDriverWait(driver, 35).until( EC.presence_of_element_located((MobileBy.XPATH, "//*[@resource-id='com.android.settings:id/summary' and @text='Connected without internet']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) @@ -4280,9 +4283,11 @@ def wifi_connect_eap(request, WifiName, User, ttls_passwd, setup_perfectoMobile, except: try: report.step_start("Verify if Wifi is Connected") + print("Verifying after scrolling") + scroll_up(setup_perfectoMobile) WifiInternetErrMsg = WebDriverWait(driver, 60).until(EC.presence_of_element_located(( MobileBy.XPATH, - "//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) + "//*[@resource-id='android:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) ssid_with_internet = True print("Wifi Successfully Connected") except NoSuchElementException: @@ -5029,7 +5034,7 @@ def scroll_up(setup_perfectoMobile): time.sleep(1) -def get_ip_add_and(request, WifiName, WifiPass, setup_perfectoMobile, connData): +def gets_ip_add_and_does_not_forget_ssid(request, WifiName, WifiPass, setup_perfectoMobile, connData): print("\n-------------------------------------") print("Select Wifi/AccessPoint Connection") print("-------------------------------------") @@ -5419,7 +5424,7 @@ def get_ip_add_and(request, WifiName, WifiPass, setup_perfectoMobile, connData): # This is To get all available ssids # ------------------------------------------------------ try: - for k in range(3): + for k in range(5): available_ssids = get_all_available_ssids(driver, deviceModelName) print("active_ssid_list: ", available_ssids) allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) @@ -5436,21 +5441,22 @@ def get_ip_add_and(request, WifiName, WifiPass, setup_perfectoMobile, connData): print("couldn't find wifi in available ssid") if not ssid_found: ssid_not_found = False - for k in range(3): + for k in range(5): + available_ssids = get_all_available_ssids(driver, deviceModelName) + print("active_ssid_list: ", available_ssids) + allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) try: - report.step_start("Selecting Wifi: " + WifiName) - wifi_selection_element = WebDriverWait(driver, 35).until( - EC.presence_of_element_located( - (MobileBy.XPATH, "//*[@text='" + WifiName + "']"))) - wifi_selection_element.click() - ssid_not_found = False - check_if_no_internet_popup(driver) - break - except Exception as e: - ssid_not_found = True - print("Exception on Selecting Wifi Network. Please check wifi Name or signal") - scroll_up_pixel(setup_perfectoMobile) - if ssid_not_found: + if WifiName not in available_ssids: + scroll_up(setup_perfectoMobile) + time.sleep(2) + else: + ssid_not_found = True + print(WifiName + " : Found in Device") + # allure.attach(name= body=str(WifiName+" : Found in Device")) + break + except: + print("couldn't find wifi in available ssid") + if not ssid_not_found: print("could not found " + WifiName + " in device") # allure.attach(name= body=str("could not found" + WifiName + " in device")) closeApp(connData["appPackage-android"], setup_perfectoMobile) @@ -5514,18 +5520,23 @@ def get_ip_add_and(request, WifiName, WifiPass, setup_perfectoMobile, connData): check_if_no_internet_popup(driver) except: try: - check_if_no_internet_popup(driver) + print("Not able to verify the connected WiFi. Scrolling up.") + scroll_up(setup_perfectoMobile) + scroll_up(setup_perfectoMobile) + # check_if_no_internet_popup(driver) WifiInternetErrMsg = WebDriverWait(driver, 35).until( EC.presence_of_element_located((MobileBy.XPATH, - "//*[@resource-id='com.android.settings:id/summary' and @text='Connected without internet']/parent::*/android.widget.TextView[@text='"+ WifiName + "']"))) + "//*[@resource-id='com.android.settings:id/summary' and @text='Connected without internet']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) print("Wifi Successfully Connected without internet") check_if_no_internet_popup(driver) except: try: report.step_start("Verify if Wifi is Connected") + print("Verifying after scrolling") + scroll_up(setup_perfectoMobile) WifiInternetErrMsg = WebDriverWait(driver, 60).until(EC.presence_of_element_located(( MobileBy.XPATH, - "//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) + "//*[@resource-id='android:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) ssid_with_internet = True print("Wifi Successfully Connected") except NoSuchElementException: @@ -5604,7 +5615,7 @@ def get_ip_add_and(request, WifiName, WifiPass, setup_perfectoMobile, connData): closeApp(connData["appPackage-android"], setup_perfectoMobile) return ip_address_element_text, ssid_with_internet #----------------------------------Gets ip address of the enterprise ssid and does not forget it------------------ -def get_ip_add_eap_and(request, WifiName, User, ttls_passwd, setup_perfectoMobile, connData): +def gets_ip_add_eap_and_does_not_forget_ssid(request, WifiName, User, ttls_passwd, setup_perfectoMobile, connData): print("\n-------------------------------------") print("Select Wifi/AccessPoint Connection") print("-------------------------------------") @@ -6030,7 +6041,7 @@ def get_ip_add_eap_and(request, WifiName, User, ttls_passwd, setup_perfectoMobil # This is To get all available ssids # ------------------------------------------------------ try: - for k in range(3): + for k in range(5): available_ssids = get_all_available_ssids(driver, deviceModelName) print("active_ssid_list: ", available_ssids) allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) @@ -6047,21 +6058,22 @@ def get_ip_add_eap_and(request, WifiName, User, ttls_passwd, setup_perfectoMobil print("couldn't find wifi in available ssid") if not ssid_found: ssid_not_found = False - for k in range(3): + for k in range(5): + available_ssids = get_all_available_ssids(driver, deviceModelName) + print("active_ssid_list: ", available_ssids) + allure.attach(name="Available SSIDs in device: ", body=str(available_ssids)) try: - report.step_start("Selecting Wifi: " + WifiName) - wifi_selection_element = WebDriverWait(driver, 35).until( - EC.presence_of_element_located( - (MobileBy.XPATH, "//*[@text='" + WifiName + "']"))) - wifi_selection_element.click() - ssid_not_found = False - check_if_no_internet_popup(driver) - break - except Exception as e: - ssid_not_found = True - print("Exception on Selecting Wifi Network. Please check wifi Name or signal") - scroll_up_pixel(setup_perfectoMobile) - if ssid_not_found: + if WifiName not in available_ssids: + scroll_up(setup_perfectoMobile) + time.sleep(2) + else: + ssid_not_found = True + print(WifiName + " : Found in Device") + # allure.attach(name= body=str(WifiName+" : Found in Device")) + break + except: + print("couldn't find wifi in available ssid") + if not ssid_not_found: print("could not found " + WifiName + " in device") # allure.attach(name= body=str("could not found" + WifiName + " in device")) closeApp(connData["appPackage-android"], setup_perfectoMobile) @@ -6165,18 +6177,23 @@ def get_ip_add_eap_and(request, WifiName, User, ttls_passwd, setup_perfectoMobil check_if_no_internet_popup(driver) except: try: - check_if_no_internet_popup(driver) + print("Not able to verify the connected WiFi. Scrolling up.") + scroll_up(setup_perfectoMobile) + scroll_up(setup_perfectoMobile) + # check_if_no_internet_popup(driver) WifiInternetErrMsg = WebDriverWait(driver, 35).until( EC.presence_of_element_located((MobileBy.XPATH, - "//*[@resource-id='com.android.settings:id/summary' and @text='Connected without internet']/parent::*/android.widget.TextView[@text='"+ WifiName + "']"))) + "//*[@resource-id='com.android.settings:id/summary' and @text='Connected without internet']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) print("Wifi Successfully Connected without internet") check_if_no_internet_popup(driver) except: try: report.step_start("Verify if Wifi is Connected") + print("Verifying after scrolling") + scroll_up(setup_perfectoMobile) WifiInternetErrMsg = WebDriverWait(driver, 60).until(EC.presence_of_element_located(( MobileBy.XPATH, - "//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) + "//*[@resource-id='android:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) ssid_with_internet = True print("Wifi Successfully Connected") except NoSuchElementException: @@ -6256,7 +6273,7 @@ def get_ip_add_eap_and(request, WifiName, User, ttls_passwd, setup_perfectoMobil #-----------------------------ip address check------------------------------------------------ -def get_ip_add_check_and(request, WifiName, WifiPass, setup_perfectoMobile, connData): +def gets_ip_add_for_checking_and_forgets_ssid(request, WifiName, WifiPass, setup_perfectoMobile, connData): print("\n-------------------------------------") print("Select Wifi/AccessPoint Connection") print("-------------------------------------") diff --git a/libs/perfecto_libs/iOS_lib.py b/libs/perfecto_libs/iOS_lib.py index bb7946cdf..e1c5bf0a2 100644 --- a/libs/perfecto_libs/iOS_lib.py +++ b/libs/perfecto_libs/iOS_lib.py @@ -2483,7 +2483,7 @@ def ssid_Visible(driver,WifiName): return True #--------------------------------Gets ip address from ssid but it won't get disconnected from it------------------ -def get_ip_add_ios(request, WifiName, WifiPass, setup_perfectoMobile, connData): +def gets_ip_add_and_does_not_forget_ssid_ios(request, WifiName, WifiPass, setup_perfectoMobile, connData): print("\n-------------------------------------") print("Select Wifi/Get IP Address IOS Connection") print("-------------------------------------") @@ -2727,7 +2727,7 @@ def get_ip_add_ios(request, WifiName, WifiPass, setup_perfectoMobile, connData): closeApp(connData["bundleId-iOS-Settings"], setup_perfectoMobile) return ip_address_element_text, is_internet #----------------Gets ip address of Enterprise ssids and won't forget it--------------- -def get_ip_add_eap_ios(request, WifiName, User, ttls_passwd, setup_perfectoMobile, connData): +def gets_ip_add_eap_and_does_not_forget_ssid_ios(request, WifiName, User, ttls_passwd, setup_perfectoMobile, connData): print("\n-------------------------------------") print("Get IP Address Enterprise IOS Connection") print("-------------------------------------") @@ -2999,7 +2999,7 @@ def get_ip_add_eap_ios(request, WifiName, User, ttls_passwd, setup_perfectoMobil #------------------Gets the ip address of already connected ssid--------------------------------------- -def get_ip_add_check_ios(request, WifiName, WifiPass, setup_perfectoMobile, connData): +def gets_ip_add_for_checking_and_forgets_ssid_ios(request, WifiName, WifiPass, setup_perfectoMobile, connData): print("\n-------------------------------------") print("Select Wifi/Get IP Address IOS Connection") print("-------------------------------------") diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py index 02adfd689..cf7904e3a 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py @@ -21,7 +21,7 @@ pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.client_reconnect, pytest.mark.enterprise] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_eap_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_eap_and_does_not_forget_ssid setup_params_enterprise = { "mode": "BRIDGE", @@ -84,7 +84,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -96,7 +96,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -129,7 +129,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -141,7 +141,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -174,7 +174,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -186,7 +186,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -219,7 +219,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -231,7 +231,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -264,7 +264,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -276,7 +276,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -309,7 +309,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -321,7 +321,7 @@ class TestToggleAirplaneModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/android/test_general_security_modes.py index 792224b27..a4516acf8 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/android/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.ToggleAirplaneMode, pytest.mark.client_reconnect] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_and_does_not_forget_ssid setup_params_general = { "mode": "BRIDGE", @@ -82,7 +82,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -94,7 +94,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -125,7 +125,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -137,7 +137,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -169,7 +169,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -181,7 +181,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -213,7 +213,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -225,7 +225,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -257,7 +257,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -269,7 +269,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -301,7 +301,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -313,7 +313,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -387,7 +387,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -399,7 +399,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -431,7 +431,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -443,7 +443,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -475,7 +475,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -487,7 +487,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -519,7 +519,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -531,7 +531,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -563,7 +563,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -575,7 +575,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -607,7 +607,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -619,7 +619,7 @@ class TestToggleAirplaneModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py index 842d22516..16e51a459 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_eap_ios, get_ip_add_check_ios, wifi_connect_eap, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_eap_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect_eap, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect , pytest.mark.bridge, pytest.mark.enterprise, pytest.mark.ToggleAirplaneMode] @@ -85,7 +85,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -97,7 +97,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -131,7 +131,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -143,7 +143,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -179,7 +179,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: @@ -192,7 +192,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -226,7 +226,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -238,7 +238,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -273,7 +273,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -285,7 +285,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -319,7 +319,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -331,7 +331,7 @@ class TestToggleAirplaneModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/iOS/test_general_securtiy_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/iOS/test_general_securtiy_modes.py index afd80b955..164192c5b 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/iOS/test_general_securtiy_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_airplane_mode_test/iOS/test_general_securtiy_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_ios, get_ip_add_check_ios, wifi_connect, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect, pytest.mark.bridge, pytest.mark.ToggleAirplaneMode] @@ -84,7 +84,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -96,7 +96,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -126,7 +126,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -138,7 +138,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -168,7 +168,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -180,7 +180,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -210,7 +210,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -222,7 +222,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -252,7 +252,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -264,7 +264,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -294,7 +294,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -306,7 +306,7 @@ class TestToggleAirplaneModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -383,7 +383,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -395,7 +395,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -426,7 +426,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -438,7 +438,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -469,7 +469,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -481,7 +481,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -512,7 +512,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -524,7 +524,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -556,7 +556,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -568,7 +568,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -600,7 +600,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -612,7 +612,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py index 02e147a45..15f08f79f 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py @@ -21,7 +21,7 @@ pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.client_reconnect, pytest.mark.enterprise] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_WifiMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_eap_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_eap_and_does_not_forget_ssid setup_params_enterprise = { "mode": "BRIDGE", @@ -84,7 +84,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -96,7 +96,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, identity, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -129,7 +129,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -141,7 +141,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, identity, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -174,7 +174,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -186,7 +186,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, identity, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -219,7 +219,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -231,7 +231,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, identity, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -264,7 +264,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -276,7 +276,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, identity, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -309,7 +309,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -321,7 +321,7 @@ class TestToggleWifiModeAndroidBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, identity, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/android/test_general_security_modes.py index 1b67dda4f..4a9d5ea27 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/android/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.ToggleWifiMode, pytest.mark.client_reconnect] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_WifiMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_and_does_not_forget_ssid setup_params_general = { "mode": "BRIDGE", @@ -82,7 +82,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -94,7 +94,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -125,7 +125,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -137,7 +137,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -169,7 +169,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -181,7 +181,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -213,7 +213,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -225,7 +225,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -257,7 +257,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -269,7 +269,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -301,7 +301,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -313,7 +313,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -387,7 +387,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -399,7 +399,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -431,7 +431,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -443,7 +443,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -475,7 +475,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -487,7 +487,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -519,7 +519,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -531,7 +531,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -563,7 +563,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -575,7 +575,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -607,7 +607,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -619,7 +619,7 @@ class TestToggleWifiModeAndroidBridgeModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py index 06921ca64..f97886b4e 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_eap_ios, get_ip_add_check_ios, wifi_connect_eap, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_eap_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect_eap, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect , pytest.mark.bridge, pytest.mark.enterprise, pytest.mark.ToggleWifiMode] @@ -86,7 +86,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -98,7 +98,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -132,7 +132,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -144,7 +144,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -180,7 +180,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: @@ -193,7 +193,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -227,7 +227,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -239,7 +239,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -274,7 +274,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -286,7 +286,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -320,7 +320,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -332,7 +332,7 @@ class TestToggleWifiModeBridgeModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py index 2632d7a1e..cb20df9d4 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/bridge_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_ios, get_ip_add_check_ios, wifi_connect, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect, pytest.mark.bridge, pytest.mark.ToggleWifiMode] @@ -84,7 +84,7 @@ class TestToggleWifiModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -96,7 +96,7 @@ class TestToggleWifiModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -126,7 +126,7 @@ class TestToggleWifiModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -138,7 +138,7 @@ class TestToggleWifiModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -168,7 +168,7 @@ class TestToggleWifiModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -180,7 +180,7 @@ class TestToggleWifiModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -210,7 +210,7 @@ class TestToggleWifiModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -222,7 +222,7 @@ class TestToggleWifiModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -252,7 +252,7 @@ class TestToggleWifiModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -264,7 +264,7 @@ class TestToggleWifiModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -294,7 +294,7 @@ class TestToggleWifiModeSuiteOneBridge(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -306,7 +306,7 @@ class TestToggleWifiModeSuiteOneBridge(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -384,7 +384,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -396,7 +396,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -427,7 +427,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -439,7 +439,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -470,7 +470,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -482,7 +482,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -513,7 +513,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -525,7 +525,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -557,7 +557,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -569,7 +569,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -601,7 +601,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -613,7 +613,7 @@ class TestToggleAirplaneModeSuiteBridgeTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py index fa136339a..d2f40b609 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py @@ -21,7 +21,7 @@ pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.client_reconnect, pytest.mark.enterprise] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_eap_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_eap_and_does_not_forget_ssid setup_params_enterprise = { "mode": "NAT", @@ -84,7 +84,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -96,7 +96,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -129,7 +129,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -141,7 +141,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -174,7 +174,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -186,7 +186,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -219,7 +219,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -231,7 +231,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -264,7 +264,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -276,7 +276,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -309,7 +309,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -321,7 +321,7 @@ class TestToggleAirplaneModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/android/test_general_security_modes.py index 773f00e07..35760e5c8 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/android/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.ToggleAirplaneMode, pytest.mark.client_reconnect] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_and_does_not_forget_ssid setup_params_general = { "mode": "NAT", @@ -82,7 +82,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -94,7 +94,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -125,7 +125,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -137,7 +137,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -169,7 +169,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -181,7 +181,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -213,7 +213,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -225,7 +225,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -257,7 +257,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -269,7 +269,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -301,7 +301,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -313,7 +313,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -387,7 +387,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -399,7 +399,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -431,7 +431,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -443,7 +443,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -475,7 +475,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -487,7 +487,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -519,7 +519,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -531,7 +531,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -563,7 +563,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -575,7 +575,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -607,7 +607,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -619,7 +619,7 @@ class TestToggleAirplaneModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py index 24d304b66..f6157767a 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_eap_ios, get_ip_add_check_ios, wifi_connect_eap, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_eap_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect_eap, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect ,pytest.mark.ToggleAirplaneMode, pytest.mark.nat, pytest.mark.enterprise] @@ -85,7 +85,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -97,7 +97,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -131,7 +131,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -143,7 +143,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -179,7 +179,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: @@ -192,7 +192,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -226,7 +226,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -238,7 +238,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -273,7 +273,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -285,7 +285,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -319,7 +319,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -331,7 +331,7 @@ class TestToggleAirplaneModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_general_security_modes.py index c1b9f6188..a7a0826c6 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_airplane_mode_test/iOS/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_ios, get_ip_add_check_ios, wifi_connect, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect, pytest.mark.ToggleAirplaneMode, pytest.mark.nat] @@ -86,7 +86,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -98,7 +98,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -128,7 +128,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -140,7 +140,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -170,7 +170,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -182,7 +182,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -212,7 +212,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -224,7 +224,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -254,7 +254,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -266,7 +266,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -296,7 +296,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -308,7 +308,7 @@ class TestToggleAirplaneModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -385,7 +385,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -397,7 +397,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -428,7 +428,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -440,7 +440,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -471,7 +471,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -483,7 +483,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -514,7 +514,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -526,7 +526,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -558,7 +558,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -570,7 +570,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -602,7 +602,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -614,7 +614,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py index 935b22681..731a39a42 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py @@ -21,7 +21,7 @@ pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.client_reconnect, pytest.mark.enterprise] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_WifiMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_eap_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_eap_and_does_not_forget_ssid setup_params_enterprise = { "mode": "NAT", @@ -84,7 +84,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -96,7 +96,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -129,7 +129,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -141,7 +141,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -174,7 +174,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -186,7 +186,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -219,7 +219,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -231,7 +231,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -264,7 +264,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -276,7 +276,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -309,7 +309,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -321,7 +321,7 @@ class TestToggleWifiModeAndroidNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/android/test_general_security_modes.py index 64eca27a3..e77be3bc6 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/android/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.ToggleWifiMode, pytest.mark.client_reconnect] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_WifiMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_and_does_not_forget_ssid setup_params_general = { "mode": "NAT", @@ -82,7 +82,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -94,7 +94,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -125,7 +125,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -137,7 +137,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -169,7 +169,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -181,7 +181,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -213,7 +213,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -225,7 +225,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -257,7 +257,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -269,7 +269,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -301,7 +301,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -313,7 +313,7 @@ class TestToggleWifiModeAndroidNatModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -387,7 +387,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -399,7 +399,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -431,7 +431,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -443,7 +443,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -475,7 +475,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -487,7 +487,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -519,7 +519,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -531,7 +531,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -563,7 +563,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -575,7 +575,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -607,7 +607,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -619,7 +619,7 @@ class TestToggleWifiModeAndroidNatModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py index 960b130e3..2abc67ebf 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_eap_ios, get_ip_add_check_ios, wifi_connect_eap, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_eap_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect_eap, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect , pytest.mark.nat, pytest.mark.enterprise, pytest.mark.ToggleWifiMode] @@ -85,7 +85,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -97,7 +97,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -131,7 +131,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -143,7 +143,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -179,7 +179,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: @@ -192,7 +192,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -226,7 +226,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -238,7 +238,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -273,7 +273,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -285,7 +285,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -319,7 +319,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -331,7 +331,7 @@ class TestToggleWifiModeNatModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py index 5105d60a8..ab23852a4 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/nat_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_ios, get_ip_add_check_ios, wifi_connect, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect, pytest.mark.nat, pytest.mark.ToggleWifiMode] @@ -86,7 +86,7 @@ class TestToggleWifiModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -98,7 +98,7 @@ class TestToggleWifiModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -128,7 +128,7 @@ class TestToggleWifiModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -140,7 +140,7 @@ class TestToggleWifiModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -170,7 +170,7 @@ class TestToggleWifiModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -182,7 +182,7 @@ class TestToggleWifiModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -212,7 +212,7 @@ class TestToggleWifiModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -224,7 +224,7 @@ class TestToggleWifiModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -254,7 +254,7 @@ class TestToggleWifiModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -266,7 +266,7 @@ class TestToggleWifiModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -296,7 +296,7 @@ class TestToggleWifiModeSuiteOneNat(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -308,7 +308,7 @@ class TestToggleWifiModeSuiteOneNat(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -386,7 +386,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -398,7 +398,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -429,7 +429,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -441,7 +441,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -472,7 +472,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -484,7 +484,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -515,7 +515,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -527,7 +527,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -559,7 +559,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -571,7 +571,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -603,7 +603,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -615,7 +615,7 @@ class TestToggleAirplaneModeSuiteNatTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py index 5b3c708d5..c3a420c08 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/android/test_enterprise_ttls.py @@ -21,7 +21,7 @@ pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.client_reconnect, pytest.mark.enterprise, pytest.mark.vlan] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_eap_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_eap_and_does_not_forget_ssid setup_params_enterprise = { "mode": "VLAN", @@ -84,7 +84,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -96,7 +96,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -129,7 +129,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -141,7 +141,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -174,7 +174,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -186,7 +186,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -219,7 +219,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -231,7 +231,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -264,7 +264,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -276,7 +276,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -309,7 +309,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -321,7 +321,7 @@ class TestToggleAirplaneModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/android/test_general_security_modes.py index f6352a531..08fcaea4b 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/android/test_general_security_modes.py @@ -21,7 +21,7 @@ pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.client_reconnect, pytest.mark.vlan] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_and_does_not_forget_ssid setup_params_general = { "mode": "VLAN", @@ -83,7 +83,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -95,7 +95,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -126,7 +126,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -138,7 +138,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -170,7 +170,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -182,7 +182,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -214,7 +214,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -226,7 +226,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -258,7 +258,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -270,7 +270,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -302,7 +302,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -314,7 +314,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -388,7 +388,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -400,7 +400,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -432,7 +432,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -444,7 +444,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -476,7 +476,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -488,7 +488,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -520,7 +520,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -532,7 +532,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -564,7 +564,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -576,7 +576,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -608,7 +608,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -620,7 +620,7 @@ class TestToggleAirplaneModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py index 18383e55f..d967b2d07 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/iOS/test_enterprise_ttls.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_eap_ios, get_ip_add_check_ios, wifi_connect_eap, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_eap_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect_eap, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect ,pytest.mark.ToggleAirplaneMode, pytest.mark.vlan, pytest.mark.enterprise] @@ -85,7 +85,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -97,7 +97,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -131,7 +131,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -143,7 +143,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -179,7 +179,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: @@ -192,7 +192,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -226,7 +226,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -238,7 +238,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -273,7 +273,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -285,7 +285,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -319,7 +319,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -331,7 +331,7 @@ class TestToggleAirplaneModeVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/iOS/test_general_security_modes.py index 9bc6990b8..ed2d9a168 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_airplane_mode_test/iOS/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - get_ip_add_ios, get_ip_add_check_ios + gets_ip_add_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect, pytest.mark.ToggleAirplaneMode, pytest.mark.vlan] @@ -84,7 +84,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -96,7 +96,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -126,7 +126,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -138,7 +138,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -168,7 +168,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -180,7 +180,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -210,7 +210,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -222,7 +222,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -252,7 +252,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -264,7 +264,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -294,7 +294,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -306,7 +306,7 @@ class TestToggleAirplaneModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -383,7 +383,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -395,7 +395,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -426,7 +426,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -438,7 +438,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -469,7 +469,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -481,7 +481,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -512,7 +512,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -524,7 +524,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -556,7 +556,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -568,7 +568,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -600,7 +600,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -612,7 +612,7 @@ class TestToggleAirplaneModeSuiteVLANTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py index 4f863f443..348706c58 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/android/test_enterprise_ttls.py @@ -21,7 +21,7 @@ pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.client_reconnect, pytest.mark.enterprise] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_WifiMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_eap_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_eap_and_does_not_forget_ssid setup_params_enterprise = { "mode": "VLAN", @@ -84,7 +84,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -96,7 +96,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -129,7 +129,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -141,7 +141,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -174,7 +174,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -186,7 +186,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -219,7 +219,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -231,7 +231,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -264,7 +264,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -276,7 +276,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -309,7 +309,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_and(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -321,7 +321,7 @@ class TestToggleWifiModeAndroidVlanModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ttls_passwd, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ttls_passwd, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/android/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/android/test_general_security_modes.py index 07907d5b7..daa972d74 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/android/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/android/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.ToggleWifiMode, pytest.mark.client_reconnect] from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_WifiMode_android, ForgetWifiConnection, openApp,\ - get_ip_add_check_and, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, get_ip_add_and + gets_ip_add_for_checking_and_forgets_ssid, verifyUploadDownloadSpeed_android, wifi_connect, wifi_disconnect_and_forget, gets_ip_add_and_does_not_forget_ssid setup_params_general = { "mode": "VLAN", @@ -82,7 +82,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -94,7 +94,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -125,7 +125,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -137,7 +137,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -169,7 +169,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -181,7 +181,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -213,7 +213,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -225,7 +225,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -257,7 +257,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -269,7 +269,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -301,7 +301,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -313,7 +313,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteOne(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -387,7 +387,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -399,7 +399,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -431,7 +431,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -443,7 +443,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -475,7 +475,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -487,7 +487,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -519,7 +519,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -531,7 +531,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -563,7 +563,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -575,7 +575,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True @@ -607,7 +607,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) # if is_internet: if ip: @@ -619,7 +619,7 @@ class TestToggleWifiModeAndroidVlanModeSuiteTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData) - ip_check, is_internet_check = get_ip_add_check_and(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py index 169950fa2..86e6789ae 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/iOS/test_enterprise_ttls.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_eap_ios, get_ip_add_check_ios, wifi_connect_eap, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_eap_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect_eap, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect , pytest.mark.vlan, pytest.mark.enterprise, pytest.mark.ToggleWifiMode] @@ -85,7 +85,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -97,7 +97,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -131,7 +131,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -143,7 +143,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -179,7 +179,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: @@ -192,7 +192,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -226,7 +226,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -238,7 +238,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -273,7 +273,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -285,7 +285,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -319,7 +319,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): connData = get_ToggleAirplaneMode_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_eap_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_eap_and_does_not_forget_ssid_ios(request, ssidName, identity, ttls_passwd, setup_perfectoMobile_iOS, connData) if is_internet: if ip: @@ -331,7 +331,7 @@ class TestToggleWifiModeVLANModeEnterpriseTTLSSuiteA(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True diff --git a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py index 17c6706ad..36ac3c511 100644 --- a/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py +++ b/tests/e2e/interOp/validation_of_operating_modes/vlan_mode/toggle_wifi_mode_test/iOS/test_general_security_modes.py @@ -20,7 +20,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, \ Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown,\ - verifyUploadDownloadSpeediOS, get_ip_add_ios, get_ip_add_check_ios, wifi_connect, wifi_disconnect_and_forget + verifyUploadDownloadSpeediOS, gets_ip_add_and_does_not_forget_ssid_ios, gets_ip_add_for_checking_and_forgets_ssid_ios, wifi_connect, wifi_disconnect_and_forget pytestmark = [pytest.mark.regression, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.client_reconnect, pytest.mark.vlan, pytest.mark.ToggleWifiMode] @@ -85,7 +85,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -97,7 +97,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -127,7 +127,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -139,7 +139,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -169,7 +169,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -181,7 +181,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -211,7 +211,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -223,7 +223,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -253,7 +253,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -265,7 +265,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -295,7 +295,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -307,7 +307,7 @@ class TestToggleWifiModeSuiteOneVLAN(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -385,7 +385,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -397,7 +397,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -428,7 +428,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -440,7 +440,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_AirplaneMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -471,7 +471,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -483,7 +483,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -514,7 +514,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -526,7 +526,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -558,7 +558,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -570,7 +570,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True @@ -602,7 +602,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): connData = get_APToMobileDevice_data # Set Wifi/AP Mode - ip, is_internet = get_ip_add_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) + ip, is_internet = gets_ip_add_and_does_not_forget_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) # if is_internet: if ip: @@ -614,7 +614,7 @@ class TestToggleAirplaneModeSuiteVlanTwo(object): # wifi_connect(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) Toggle_WifiMode_iOS(request, setup_perfectoMobile_iOS, connData) - ip_check, is_internet_check = get_ip_add_check_ios(request, ssidName, ssidPassword, + ip_check, is_internet_check = gets_ip_add_for_checking_and_forgets_ssid_ios(request, ssidName, ssidPassword, setup_perfectoMobile_iOS, connData) if (ip_check == ip): assert True