From 872535258e7df1be05ce8834b372fe43f3e8b26b Mon Sep 17 00:00:00 2001 From: sushant Date: Wed, 1 Sep 2021 15:12:33 +0530 Subject: [PATCH] - chnaged dir format Signed-off-by: Sushant Bawiskar --- .../android/AccessPointConnection/__init__.py | 0 .../interOp/android/AirplaneMode/__init__.py | 0 .../android/OpenRoamingPassPoint/__init__.py | 0 .../android/PassPointConnection/__init__.py | 0 .../e2e/interOp/android/WifiMode/__init__.py | 0 tests/e2e/interOp/android/__init__.py | 0 .../android/client_connectivity/__init__.py | 0 .../test_AccessPointConnection_BridgeMode.py | 0 .../bridge_mode/android}/test_BridgeMode.py | 0 .../test_PassPointConnection_BridgeMode.py | 0 .../test_ToggleAirplaneMode_BridgeMode.py | 0 .../android}/test_WifiMode_BridgeMode.py | 0 .../test_AccessPointConnection_BridgeMode.py | 0 .../bridge_mode/iOS}/test_BridgeMode.py | 0 .../test_PassPointConnection_BridgeMode.py | 0 .../test_ToggleAirplaneMode_BridgeMode.py | 0 .../iOS}/test_ToggleWifiMode_Bridge.py | 0 .../android}/test_AccessPointConnection.py | 0 .../nat_mode/android}/test_NatMode.py | 36 +++++++++++++++++-- .../android}/test_PassPointConnection.py | 0 .../android}/test_ToggleAirplaneMode.py | 0 .../nat_mode/android}/test_ToggleWifiMode.py | 0 .../iOS}/test_AccessPointConnection.py | 0 .../nat_mode/iOS}/test_NatMode.py | 0 .../nat_mode/iOS}/test_PassPointConnection.py | 0 .../nat_mode/iOS}/test_ToggleAirplaneMode.py | 0 .../nat_mode/iOS}/test_ToggleWifiMode.py | 0 .../iOS/AccessPointConnection/__init__.py | 0 .../e2e/interOp/iOS/AirplaneMode/__init__.py | 0 .../iOS/OpenRoamingPassPoint/__init__.py | 0 tests/e2e/interOp/iOS/PassPoint/__init__.py | 0 tests/e2e/interOp/iOS/WifiMode/__init__.py | 0 tests/e2e/interOp/iOS/__init__.py | 0 .../iOS/client_connectivity/__init__.py | 0 .../android}/conftest.py | 0 .../android}/test_OpenRoaming_BridgeMode.py | 0 .../iOS}/conftest.py | 0 .../iOS}/test_OpenRoaming_BridgeMode.py | 0 .../iOS}/test_OpenRoaming_NatMode.py | 0 .../iOS}/test_OpenRoaming_vlan_mode.py | 0 40 files changed, 34 insertions(+), 2 deletions(-) delete mode 100644 tests/e2e/interOp/android/AccessPointConnection/__init__.py delete mode 100644 tests/e2e/interOp/android/AirplaneMode/__init__.py delete mode 100644 tests/e2e/interOp/android/OpenRoamingPassPoint/__init__.py delete mode 100644 tests/e2e/interOp/android/PassPointConnection/__init__.py delete mode 100644 tests/e2e/interOp/android/WifiMode/__init__.py delete mode 100644 tests/e2e/interOp/android/__init__.py delete mode 100644 tests/e2e/interOp/android/client_connectivity/__init__.py rename tests/e2e/interOp/{android/AccessPointConnection => client_connect_test/bridge_mode/android}/test_AccessPointConnection_BridgeMode.py (100%) rename tests/e2e/interOp/{android/client_connectivity => client_connect_test/bridge_mode/android}/test_BridgeMode.py (100%) rename tests/e2e/interOp/{android/PassPointConnection => client_connect_test/bridge_mode/android}/test_PassPointConnection_BridgeMode.py (100%) rename tests/e2e/interOp/{android/AirplaneMode => client_connect_test/bridge_mode/android}/test_ToggleAirplaneMode_BridgeMode.py (100%) rename tests/e2e/interOp/{android/WifiMode => client_connect_test/bridge_mode/android}/test_WifiMode_BridgeMode.py (100%) rename tests/e2e/interOp/{iOS/AccessPointConnection => client_connect_test/bridge_mode/iOS}/test_AccessPointConnection_BridgeMode.py (100%) rename tests/e2e/interOp/{iOS/client_connectivity => client_connect_test/bridge_mode/iOS}/test_BridgeMode.py (100%) rename tests/e2e/interOp/{iOS/PassPoint => client_connect_test/bridge_mode/iOS}/test_PassPointConnection_BridgeMode.py (100%) rename tests/e2e/interOp/{iOS/AirplaneMode => client_connect_test/bridge_mode/iOS}/test_ToggleAirplaneMode_BridgeMode.py (100%) rename tests/e2e/interOp/{iOS/WifiMode => client_connect_test/bridge_mode/iOS}/test_ToggleWifiMode_Bridge.py (100%) rename tests/e2e/interOp/{android/AccessPointConnection => client_connect_test/nat_mode/android}/test_AccessPointConnection.py (100%) rename tests/e2e/interOp/{android/client_connectivity => client_connect_test/nat_mode/android}/test_NatMode.py (85%) rename tests/e2e/interOp/{android/PassPointConnection => client_connect_test/nat_mode/android}/test_PassPointConnection.py (100%) rename tests/e2e/interOp/{android/AirplaneMode => client_connect_test/nat_mode/android}/test_ToggleAirplaneMode.py (100%) rename tests/e2e/interOp/{android/WifiMode => client_connect_test/nat_mode/android}/test_ToggleWifiMode.py (100%) rename tests/e2e/interOp/{iOS/AccessPointConnection => client_connect_test/nat_mode/iOS}/test_AccessPointConnection.py (100%) rename tests/e2e/interOp/{iOS/client_connectivity => client_connect_test/nat_mode/iOS}/test_NatMode.py (100%) rename tests/e2e/interOp/{iOS/PassPoint => client_connect_test/nat_mode/iOS}/test_PassPointConnection.py (100%) rename tests/e2e/interOp/{iOS/AirplaneMode => client_connect_test/nat_mode/iOS}/test_ToggleAirplaneMode.py (100%) rename tests/e2e/interOp/{iOS/WifiMode => client_connect_test/nat_mode/iOS}/test_ToggleWifiMode.py (100%) delete mode 100644 tests/e2e/interOp/iOS/AccessPointConnection/__init__.py delete mode 100644 tests/e2e/interOp/iOS/AirplaneMode/__init__.py delete mode 100644 tests/e2e/interOp/iOS/OpenRoamingPassPoint/__init__.py delete mode 100644 tests/e2e/interOp/iOS/PassPoint/__init__.py delete mode 100644 tests/e2e/interOp/iOS/WifiMode/__init__.py delete mode 100644 tests/e2e/interOp/iOS/__init__.py delete mode 100644 tests/e2e/interOp/iOS/client_connectivity/__init__.py rename tests/e2e/interOp/{android/OpenRoamingPassPoint => openroaming_test/android}/conftest.py (100%) rename tests/e2e/interOp/{android/OpenRoamingPassPoint => openroaming_test/android}/test_OpenRoaming_BridgeMode.py (100%) rename tests/e2e/interOp/{iOS/OpenRoamingPassPoint => openroaming_test/iOS}/conftest.py (100%) rename tests/e2e/interOp/{iOS/OpenRoamingPassPoint => openroaming_test/iOS}/test_OpenRoaming_BridgeMode.py (100%) rename tests/e2e/interOp/{iOS/OpenRoamingPassPoint => openroaming_test/iOS}/test_OpenRoaming_NatMode.py (100%) rename tests/e2e/interOp/{iOS/OpenRoamingPassPoint => openroaming_test/iOS}/test_OpenRoaming_vlan_mode.py (100%) diff --git a/tests/e2e/interOp/android/AccessPointConnection/__init__.py b/tests/e2e/interOp/android/AccessPointConnection/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/android/AirplaneMode/__init__.py b/tests/e2e/interOp/android/AirplaneMode/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/android/OpenRoamingPassPoint/__init__.py b/tests/e2e/interOp/android/OpenRoamingPassPoint/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/android/PassPointConnection/__init__.py b/tests/e2e/interOp/android/PassPointConnection/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/android/WifiMode/__init__.py b/tests/e2e/interOp/android/WifiMode/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/android/__init__.py b/tests/e2e/interOp/android/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/android/client_connectivity/__init__.py b/tests/e2e/interOp/android/client_connectivity/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/android/AccessPointConnection/test_AccessPointConnection_BridgeMode.py b/tests/e2e/interOp/client_connect_test/bridge_mode/android/test_AccessPointConnection_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/android/AccessPointConnection/test_AccessPointConnection_BridgeMode.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/android/test_AccessPointConnection_BridgeMode.py diff --git a/tests/e2e/interOp/android/client_connectivity/test_BridgeMode.py b/tests/e2e/interOp/client_connect_test/bridge_mode/android/test_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/android/client_connectivity/test_BridgeMode.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/android/test_BridgeMode.py diff --git a/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection_BridgeMode.py b/tests/e2e/interOp/client_connect_test/bridge_mode/android/test_PassPointConnection_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection_BridgeMode.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/android/test_PassPointConnection_BridgeMode.py diff --git a/tests/e2e/interOp/android/AirplaneMode/test_ToggleAirplaneMode_BridgeMode.py b/tests/e2e/interOp/client_connect_test/bridge_mode/android/test_ToggleAirplaneMode_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/android/AirplaneMode/test_ToggleAirplaneMode_BridgeMode.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/android/test_ToggleAirplaneMode_BridgeMode.py diff --git a/tests/e2e/interOp/android/WifiMode/test_WifiMode_BridgeMode.py b/tests/e2e/interOp/client_connect_test/bridge_mode/android/test_WifiMode_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/android/WifiMode/test_WifiMode_BridgeMode.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/android/test_WifiMode_BridgeMode.py diff --git a/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection_BridgeMode.py b/tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_AccessPointConnection_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection_BridgeMode.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_AccessPointConnection_BridgeMode.py diff --git a/tests/e2e/interOp/iOS/client_connectivity/test_BridgeMode.py b/tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/iOS/client_connectivity/test_BridgeMode.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_BridgeMode.py diff --git a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection_BridgeMode.py b/tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_PassPointConnection_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection_BridgeMode.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_PassPointConnection_BridgeMode.py diff --git a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode_BridgeMode.py b/tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_ToggleAirplaneMode_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode_BridgeMode.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_ToggleAirplaneMode_BridgeMode.py diff --git a/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode_Bridge.py b/tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_ToggleWifiMode_Bridge.py similarity index 100% rename from tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode_Bridge.py rename to tests/e2e/interOp/client_connect_test/bridge_mode/iOS/test_ToggleWifiMode_Bridge.py diff --git a/tests/e2e/interOp/android/AccessPointConnection/test_AccessPointConnection.py b/tests/e2e/interOp/client_connect_test/nat_mode/android/test_AccessPointConnection.py similarity index 100% rename from tests/e2e/interOp/android/AccessPointConnection/test_AccessPointConnection.py rename to tests/e2e/interOp/client_connect_test/nat_mode/android/test_AccessPointConnection.py diff --git a/tests/e2e/interOp/android/client_connectivity/test_NatMode.py b/tests/e2e/interOp/client_connect_test/nat_mode/android/test_NatMode.py similarity index 85% rename from tests/e2e/interOp/android/client_connectivity/test_NatMode.py rename to tests/e2e/interOp/client_connect_test/nat_mode/android/test_NatMode.py index ac06ed31b..655606d87 100644 --- a/tests/e2e/interOp/android/client_connectivity/test_NatMode.py +++ b/tests/e2e/interOp/client_connect_test/nat_mode/android/test_NatMode.py @@ -19,7 +19,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.ClientConnectivity] from android_lib import closeApp, set_APconnMobileDevice_android, verifyUploadDownloadSpeed_android,\ - Toggle_AirplaneMode_android, ForgetWifiConnection, openApp + Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, get_WifiIPAddress_and setup_params_general = { "mode": "NAT", @@ -44,7 +44,7 @@ setup_params_general = { indirect=True, scope="class" ) - + @pytest.mark.usefixtures("setup_profiles") class TestNatMode(object): @@ -207,3 +207,35 @@ class TestNatMode(object): # ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) + @pytest.mark.twog + @pytest.mark.open + @pytest.mark.test_ClientConnect_2g_OPEN_and + def test_ClientConnect_5g_OPEN(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_android): + + profile_data = setup_params_general["ssid_modes"]["open"][0] + ssidName = profile_data["ssid_name"] + ssidPassword = "[BLANK]" + print("SSID_NAME: " + ssidName) + print("SSID_PASS: " + ssidPassword) + + # if ssidName not in get_vif_state: + # allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + # pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + + report = setup_perfectoMobile_android[1] + driver = setup_perfectoMobile_android[0] + connData = get_APToMobileDevice_data + + # ip = False + set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + # print("ip", ip) + + # # # Set Wifi/AP Mode + # get_ip_and(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) + # + # # Toggle AirplaneMode + # Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) + + # get_ip_and + # ForgetWifi + ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) \ No newline at end of file diff --git a/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py b/tests/e2e/interOp/client_connect_test/nat_mode/android/test_PassPointConnection.py similarity index 100% rename from tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py rename to tests/e2e/interOp/client_connect_test/nat_mode/android/test_PassPointConnection.py diff --git a/tests/e2e/interOp/android/AirplaneMode/test_ToggleAirplaneMode.py b/tests/e2e/interOp/client_connect_test/nat_mode/android/test_ToggleAirplaneMode.py similarity index 100% rename from tests/e2e/interOp/android/AirplaneMode/test_ToggleAirplaneMode.py rename to tests/e2e/interOp/client_connect_test/nat_mode/android/test_ToggleAirplaneMode.py diff --git a/tests/e2e/interOp/android/WifiMode/test_ToggleWifiMode.py b/tests/e2e/interOp/client_connect_test/nat_mode/android/test_ToggleWifiMode.py similarity index 100% rename from tests/e2e/interOp/android/WifiMode/test_ToggleWifiMode.py rename to tests/e2e/interOp/client_connect_test/nat_mode/android/test_ToggleWifiMode.py diff --git a/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py b/tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_AccessPointConnection.py similarity index 100% rename from tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py rename to tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_AccessPointConnection.py diff --git a/tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py b/tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_NatMode.py similarity index 100% rename from tests/e2e/interOp/iOS/client_connectivity/test_NatMode.py rename to tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_NatMode.py diff --git a/tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py b/tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_PassPointConnection.py similarity index 100% rename from tests/e2e/interOp/iOS/PassPoint/test_PassPointConnection.py rename to tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_PassPointConnection.py diff --git a/tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py b/tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_ToggleAirplaneMode.py similarity index 100% rename from tests/e2e/interOp/iOS/AirplaneMode/test_ToggleAirplaneMode.py rename to tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_ToggleAirplaneMode.py diff --git a/tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py b/tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_ToggleWifiMode.py similarity index 100% rename from tests/e2e/interOp/iOS/WifiMode/test_ToggleWifiMode.py rename to tests/e2e/interOp/client_connect_test/nat_mode/iOS/test_ToggleWifiMode.py diff --git a/tests/e2e/interOp/iOS/AccessPointConnection/__init__.py b/tests/e2e/interOp/iOS/AccessPointConnection/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/iOS/AirplaneMode/__init__.py b/tests/e2e/interOp/iOS/AirplaneMode/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/iOS/OpenRoamingPassPoint/__init__.py b/tests/e2e/interOp/iOS/OpenRoamingPassPoint/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/iOS/PassPoint/__init__.py b/tests/e2e/interOp/iOS/PassPoint/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/iOS/WifiMode/__init__.py b/tests/e2e/interOp/iOS/WifiMode/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/iOS/__init__.py b/tests/e2e/interOp/iOS/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/iOS/client_connectivity/__init__.py b/tests/e2e/interOp/iOS/client_connectivity/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/e2e/interOp/android/OpenRoamingPassPoint/conftest.py b/tests/e2e/interOp/openroaming_test/android/conftest.py similarity index 100% rename from tests/e2e/interOp/android/OpenRoamingPassPoint/conftest.py rename to tests/e2e/interOp/openroaming_test/android/conftest.py diff --git a/tests/e2e/interOp/android/OpenRoamingPassPoint/test_OpenRoaming_BridgeMode.py b/tests/e2e/interOp/openroaming_test/android/test_OpenRoaming_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/android/OpenRoamingPassPoint/test_OpenRoaming_BridgeMode.py rename to tests/e2e/interOp/openroaming_test/android/test_OpenRoaming_BridgeMode.py diff --git a/tests/e2e/interOp/iOS/OpenRoamingPassPoint/conftest.py b/tests/e2e/interOp/openroaming_test/iOS/conftest.py similarity index 100% rename from tests/e2e/interOp/iOS/OpenRoamingPassPoint/conftest.py rename to tests/e2e/interOp/openroaming_test/iOS/conftest.py diff --git a/tests/e2e/interOp/iOS/OpenRoamingPassPoint/test_OpenRoaming_BridgeMode.py b/tests/e2e/interOp/openroaming_test/iOS/test_OpenRoaming_BridgeMode.py similarity index 100% rename from tests/e2e/interOp/iOS/OpenRoamingPassPoint/test_OpenRoaming_BridgeMode.py rename to tests/e2e/interOp/openroaming_test/iOS/test_OpenRoaming_BridgeMode.py diff --git a/tests/e2e/interOp/iOS/OpenRoamingPassPoint/test_OpenRoaming_NatMode.py b/tests/e2e/interOp/openroaming_test/iOS/test_OpenRoaming_NatMode.py similarity index 100% rename from tests/e2e/interOp/iOS/OpenRoamingPassPoint/test_OpenRoaming_NatMode.py rename to tests/e2e/interOp/openroaming_test/iOS/test_OpenRoaming_NatMode.py diff --git a/tests/e2e/interOp/iOS/OpenRoamingPassPoint/test_OpenRoaming_vlan_mode.py b/tests/e2e/interOp/openroaming_test/iOS/test_OpenRoaming_vlan_mode.py similarity index 100% rename from tests/e2e/interOp/iOS/OpenRoamingPassPoint/test_OpenRoaming_vlan_mode.py rename to tests/e2e/interOp/openroaming_test/iOS/test_OpenRoaming_vlan_mode.py