From 7254523ebca8d71e0baff9b2c19d75e41bcebfbe Mon Sep 17 00:00:00 2001
From: Saurabh Goyal <saurabh.goyal@candelatech.com>
Date: Mon, 9 Aug 2021 11:41:05 +0530
Subject: [PATCH] Added Open Security

Signed-off-by: Saurabh Goyal <saurabh.goyal@candelatech.com>
---
 .../test_PassPointConnection.py               | 115 +++++++++---------
 1 file changed, 58 insertions(+), 57 deletions(-)

diff --git a/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py b/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py
index 10355ee27..23f23bba1 100644
--- a/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py
+++ b/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py
@@ -44,62 +44,6 @@ setup_params_general = {
 
 @pytest.mark.usefixtures("setup_profiles")
 class TestPassPointConnection(object):
-    @pytest.mark.open
-    @pytest.mark.fiveg
-    def test_ToogleAirplaneMode_5g_OPEN(self, request, get_vif_state, get_ToggleAirplaneMode_data,
-                                        setup_perfectoMobile_android):
-
-        profile_data = setup_params_general["ssid_modes"]["open"][1]
-        ssidName = profile_data["ssid_name"]
-        ssidPassword = "[BLANK]"
-        print("SSID_NAME: " + ssidName)
-        print("SSID_PASS: " + ssidPassword)
-
-        if ssidName not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-
-        report = setup_perfectoMobile_android[1]
-        driver = setup_perfectoMobile_android[0]
-        connData = get_ToggleAirplaneMode_data
-
-        # Set Wifi/AP Mode
-        set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData)
-
-        # Toggle AirplaneMode
-        assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData)
-
-        # ForgetWifi
-        ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData)
-
-    @pytest.mark.open
-    @pytest.mark.twog
-    def test_ToogleAirplaneMode_2g_OPEN(self, request, get_vif_state, get_ToggleAirplaneMode_data,
-                                        setup_perfectoMobile_android):
-
-        profile_data = setup_params_general["ssid_modes"]["open"][0]
-        ssidName = profile_data["ssid_name"]
-        ssidPassword = "[BLANK]"
-        print("SSID_NAME: " + ssidName)
-        print("SSID_PASS: " + ssidPassword)
-
-        if ssidName not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-
-        report = setup_perfectoMobile_android[1]
-        driver = setup_perfectoMobile_android[0]
-        connData = get_ToggleAirplaneMode_data
-
-        # Set Wifi/AP Mode
-        set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData)
-
-        # Toggle AirplaneMode
-        assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData)
-
-        # ForgetWifi
-        ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData)
-
 
     @pytest.mark.fiveg
     @pytest.mark.wpa2_personal
@@ -219,4 +163,61 @@ class TestPassPointConnection(object):
         assert Toggle_WifiMode_android(request, setup_perfectoMobile_android, ssidName, connData)
 
         #ForgetWifi
-        ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData)
\ No newline at end of file
+        ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData)
+
+    @pytest.mark.open
+    @pytest.mark.fiveg
+    def test_PassPointConnection_5g_OPEN(self, request, get_vif_state, get_ToggleAirplaneMode_data,
+                                        setup_perfectoMobile_android):
+
+        profile_data = setup_params_general["ssid_modes"]["open"][1]
+        ssidName = profile_data["ssid_name"]
+        ssidPassword = "[BLANK]"
+        print("SSID_NAME: " + ssidName)
+        print("SSID_PASS: " + ssidPassword)
+
+        if ssidName not in get_vif_state:
+            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
+            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
+
+        report = setup_perfectoMobile_android[1]
+        driver = setup_perfectoMobile_android[0]
+        connData = get_ToggleAirplaneMode_data
+
+        # Set Wifi/AP Mode
+        set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData)
+
+        # Toggle AirplaneMode
+        assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData)
+
+        # ForgetWifi
+        ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData)
+
+    @pytest.mark.open
+    @pytest.mark.twog
+    def test_PassPointConnection_2g_OPEN(self, request, get_vif_state, get_ToggleAirplaneMode_data,
+                                        setup_perfectoMobile_android):
+
+        profile_data = setup_params_general["ssid_modes"]["open"][0]
+        ssidName = profile_data["ssid_name"]
+        ssidPassword = "[BLANK]"
+        print("SSID_NAME: " + ssidName)
+        print("SSID_PASS: " + ssidPassword)
+
+        if ssidName not in get_vif_state:
+            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
+            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
+
+        report = setup_perfectoMobile_android[1]
+        driver = setup_perfectoMobile_android[0]
+        connData = get_ToggleAirplaneMode_data
+
+        # Set Wifi/AP Mode
+        set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData)
+
+        # Toggle AirplaneMode
+        assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData)
+
+        # ForgetWifi
+        ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData)
+