diff --git a/libs/cloudsdk/README.md b/libs/cloudsdk/README.md
index 577d811e9..09428a9f9 100644
--- a/libs/cloudsdk/README.md
+++ b/libs/cloudsdk/README.md
@@ -35,27 +35,27 @@ Now your cloud sdk code is downloaded with all of the dependencies and you can s
 Alternatively you can use provided dockerfiles to develop\lint your code:
 
 ```shell
-docker build -t wlan-cloud-test -f dockerfile .
-docker build -t wlan-cloud-lint -f dockerfile-lint .
+docker build -t wlan-cloud-test -f Dockerfile .
+docker build -t wlan-cloud-lint -f Dockerfile-lint .
 ```
 
 and then you can do something like this to lint your code:
 
 ```shell
-docker run -it --rm -v %path_to_this_dir%/tests wlan-tip-lint -d protected-access *py # for now
-docker run -it --rm -v %path_to_this_dir%/tests wlan-tip-lint *py # for future
+docker run -it --rm -v %path_to_this_dir%/old_pytest wlan-tip-lint -d protected-access *py # for now
+docker run -it --rm -v %path_to_this_dir%/old_pytest wlan-tip-lint *py # for future
 ```
 
 to have a better output (sorted by line numbers) you can do something like this:
 
 ```shell
-docker run -it --rm --entrypoint sh -v %path_to_this_dir%/tests wlan-tip-lint -- -c 'pylint *py | sort -t ":" -k 2,2n'
+docker run -it --rm --entrypoint sh -v %path_to_this_dir%/old_pytest wlan-tip-lint -- -c 'pylint *py | sort -t ":" -k 2,2n'
 ```
 
 and you can use something like this to develop your code:
 
 ```shell
-docker run -it -v %path_to_this_dir%/tests wlan-tip-test
+docker run -it -v %path_to_this_dir%/old_pytest wlan-tip-test
 ```
 
 ### General guidelines
diff --git a/libs/cloudsdk/cloudsdk.py b/libs/cloudsdk/cloudsdk.py
index 827df19b9..6fba635b2 100644
--- a/libs/cloudsdk/cloudsdk.py
+++ b/libs/cloudsdk/cloudsdk.py
@@ -61,14 +61,14 @@ class ConfigureCloudSDK:
 
 
 """
-    Library for cloudsdk_tests generic usages, it instantiate the bearer and credentials.
+    Library for cloud_controller_tests generic usages, it instantiate the bearer and credentials.
     It provides the connectivity to the cloud.
 """
 
 
 class CloudSDK(ConfigureCloudSDK):
     """
-    constructor for cloudsdk_tests library : can be used from pytest framework
+    constructor for cloud_controller_tests library : can be used from pytest framework
     """
 
     def __init__(self, testbed=None, customer_id=None):
diff --git a/tests/conftest.py b/tests/conftest.py
index c2c6420e4..d36f25383 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -26,6 +26,7 @@ import logging
 from configuration import APNOS_CREDENTIAL_DATA
 from configuration import RADIUS_SERVER_DATA
 from configuration import TEST_CASES
+from configuration import Controller
 from configuration import NOLA
 from testrail_api import APIClient
 from reporting import Reporting
@@ -138,17 +139,23 @@ Instantiate Objects for Test session
 
 
 @pytest.fixture(scope="session")
-def instantiate_cloudsdk(testrun_session):
+def instantiate_cloudsdk(request, testrun_session):
     try:
-        sdk_client = CloudSDK(testbed=NOLA[testrun_session]["cloudsdk_url"],
-                              customer_id=NOLA[testrun_session]["customer_id"])
+        sdk_client = CloudSDK(testbed=Controller["url"],
+                              customer_id=2)
+
+        def teardown_session():
+            print("\nTest session Completed")
+            sdk_client.disconnect_cloudsdk()
+
+        request.addfinalizer(teardown_session)
     except Exception as e:
         print(e)
         sdk_client = False
     yield sdk_client
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="class")
 def instantiate_profile(instantiate_cloudsdk):
     try:
         profile_object = ProfileUtility(sdk_client=instantiate_cloudsdk)
@@ -157,6 +164,61 @@ def instantiate_profile(instantiate_cloudsdk):
     yield profile_object
 
 
+@pytest.fixture(scope="session")
+def instantiate_testrail(request):
+    if request.config.getoption("--skip-testrail"):
+        tr_client = Reporting()
+    else:
+        tr_client = APIClient(request.config.getini("tr_url"), request.config.getini("tr_user"),
+                              request.config.getini("tr_pass"), request.config.getini("tr_project_id"))
+    yield tr_client
+
+
+@pytest.fixture(scope="session")
+def instantiate_firmware(instantiate_cloudsdk, instantiate_jFrog):
+    try:
+        firmware_client = FirmwareUtility(jfrog_credentials=instantiate_jFrog, sdk_client=instantiate_cloudsdk)
+    except:
+        firmware_client = False
+    yield firmware_client
+
+
+@pytest.fixture(scope="session")
+def instantiate_jFrog(request):
+    jfrog_cred = {
+        "user": request.config.getini("jfrog-user-id"),
+        "password": request.config.getini("jfrog-user-password")
+    }
+    yield jfrog_cred
+
+
+@pytest.fixture(scope="session")
+def instantiate_project(request, instantiate_testrail, testrun_session, get_latest_firmware):
+    if request.config.getoption("--skip-testrail"):
+        rid = "skip testrails"
+    else:
+        projId = instantiate_testrail.get_project_id(project_name=request.config.getini("tr_project_id"))
+        test_run_name = request.config.getini("tr_prefix") + testrun_session + "_" + str(
+            datetime.date.today()) + "_" + get_latest_firmware
+        instantiate_testrail.create_testrun(name=test_run_name, case_ids=list(TEST_CASES.values()), project_id=projId,
+                                            milestone_id=request.config.getini("milestone"),
+                                            description="Automated Nightly Sanity test run for new firmware build")
+        rid = instantiate_testrail.get_run_id(
+            test_run_name=request.config.getini("tr_prefix") + testrun_session + "_" + str(
+                datetime.date.today()) + "_" + get_latest_firmware)
+    yield rid
+
+
+@pytest.fixture(scope="session")
+def setup_lanforge(request):
+    yield True
+
+
+@pytest.fixture(scope="session")
+def setup_perfecto_devices(request):
+    yield True
+
+
 @pytest.fixture(scope="session")
 def setup_profile_data(testrun_session):
     profile_data = {}
@@ -216,9 +278,39 @@ def get_equipment_id(testrun_session):
 
 
 @pytest.fixture(scope="class")
-def setup_profiles(create_profiles, instantiate_profile, get_equipment_id):
+def get_current_profile_cloud(instantiate_profile):
+    ssid_names = []
+    print(instantiate_profile.profile_creation_ids["ssid"])
+    for i in instantiate_profile.profile_creation_ids["ssid"]:
+        ssid_names.append(instantiate_profile.get_ssid_name_by_profile_id(profile_id=i))
+    yield ssid_names
+
+
+@pytest.fixture(scope="class")
+def setup_profiles(create_profiles, instantiate_profile, get_equipment_id, get_current_profile_cloud):
     instantiate_profile.push_profile_old_method(equipment_id=get_equipment_id)
     print(create_profiles)
+    ap_ssh = APNOS(APNOS_CREDENTIAL_DATA)
+    get_current_profile_cloud.sort()
+    for i in range(0, 18):
+        vif_config = list(ap_ssh.get_vif_config_ssids())
+        vif_config.sort()
+        print(vif_config)
+        print(get_current_profile_cloud)
+        if get_current_profile_cloud == vif_config:
+            break
+        time.sleep(10)
+    ap_ssh = APNOS(APNOS_CREDENTIAL_DATA)
+    for i in range(0, 18):
+        vif_state = list(ap_ssh.get_vif_state_ssids())
+        vif_state.sort()
+        vif_config = list(ap_ssh.get_vif_config_ssids())
+        vif_config.sort()
+        print(vif_config)
+        print(vif_state)
+        if vif_state == vif_config:
+            break
+        time.sleep(10)
     yield "set(markers)"
 
 
@@ -226,7 +318,12 @@ def setup_profiles(create_profiles, instantiate_profile, get_equipment_id):
 def create_profiles(request, get_security_flags, get_markers, instantiate_profile, setup_profile_data):
     profile_id = {"ssid": [], "rf": None, "radius": None, "equipment_ap": None}
     mode = str(request._parent_request.param)
-    instantiate_profile.cleanup_profiles()
+    instantiate_profile.delete_profile_by_name(profile_name="Equipment-AP-" + mode)
+    for i in setup_profile_data[mode]:
+        for j in setup_profile_data[mode][i]:
+            instantiate_profile.delete_profile_by_name(
+                profile_name=setup_profile_data[mode][i][j]['profile_name'])
+    instantiate_profile.delete_profile_by_name(profile_name="Automation-Radius-Profile-" + mode)
     instantiate_profile.get_default_profiles()
     # if get_markers["wifi5"]:
     #     # Create Radius Profile
@@ -239,7 +336,7 @@ def create_profiles(request, get_security_flags, get_markers, instantiate_profil
     instantiate_profile.set_rf_profile()
     if get_markers["radius"]:
         radius_info = RADIUS_SERVER_DATA
-        radius_info["name"] = "Automation-Radius-Profile"
+        radius_info["name"] = "Automation-Radius-Profile-" + mode
         instantiate_profile.create_radius_profile(radius_info=radius_info)
     for i in get_security_flags:
         if get_markers[i] and i == "open":
@@ -289,3 +386,46 @@ def create_profiles(request, get_security_flags, get_markers, instantiate_profil
     }
     instantiate_profile.set_ap_profile(profile_data=profile_data)
     yield profile_id
+
+
+@pytest.fixture(scope="function")
+def get_lanforge_data(request):
+    lanforge_data = {
+        "lanforge_ip": request.config.getini("lanforge-ip-address"),
+        "lanforge-port-number": request.config.getini("lanforge-port-number"),
+        "lanforge_2dot4g": request.config.getini("lanforge-2dot4g-radio"),
+        "lanforge_5g": request.config.getini("lanforge-5g-radio"),
+        "lanforge_2dot4g_prefix": request.config.getini("lanforge-2dot4g-prefix"),
+        "lanforge_5g_prefix": request.config.getini("lanforge-5g-prefix"),
+        "lanforge_2dot4g_station": request.config.getini("lanforge-2dot4g-station"),
+        "lanforge_5g_station": request.config.getini("lanforge-5g-station"),
+        "lanforge_bridge_port": request.config.getini("lanforge-bridge-port"),
+        "lanforge_vlan_port": "eth1.100",
+        "vlan": 100
+    }
+    yield lanforge_data
+
+
+@pytest.fixture(scope="session")
+def get_latest_firmware(testrun_session, instantiate_firmware):
+    try:
+        latest_firmware = instantiate_firmware.get_latest_fw_version(testrun_session)
+    except:
+        latest_firmware = False
+    yield latest_firmware
+
+
+@pytest.fixture(scope="function")
+def update_ssid(request, instantiate_profile, setup_profile_data):
+    requested_profile = str(request.param).replace(" ", "").split(",")
+    profile = setup_profile_data[requested_profile[0]][requested_profile[1]][requested_profile[2]]
+    status = instantiate_profile.update_ssid_name(profile_name=profile["profile_name"],
+                                                  new_profile_name=requested_profile[3])
+    setup_profile_data[requested_profile[0]][requested_profile[1]][requested_profile[2]]["profile_name"] = \
+        requested_profile[3]
+    setup_profile_data[requested_profile[0]][requested_profile[1]][requested_profile[2]]["ssid_name"] = \
+        requested_profile[3]
+    time.sleep(90)
+    yield status
+
+
diff --git a/tests/controller/__init__.py b/tests/controller/__init__.py
index e69de29bb..8b1378917 100644
--- a/tests/controller/__init__.py
+++ b/tests/controller/__init__.py
@@ -0,0 +1 @@
+
diff --git a/tests/dockerfile b/tests/dockerfile
deleted file mode 100644
index 782cd092e..000000000
--- a/tests/dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM python:alpine3.12
-WORKDIR /tests
-COPY . /tests
-
-RUN mkdir ~/.pip \
-    && echo "[global]" > ~/.pip/pip.conf \
-    && echo "index-url = https://pypi.org/simple" >> ~/.pip/pip.conf \
-    && echo "extra-index-url = https://tip-read:tip-read@tip.jfrog.io/artifactory/api/pypi/tip-wlan-python-pypi-local/simple" >> ~/.pip/pip.conf
-RUN pip3 install -r requirements.txt
-
-ENTRYPOINT [ "/bin/sh" ]
diff --git a/tests/dockerfile-lint b/tests/dockerfile-lint
deleted file mode 100644
index bcab34e7f..000000000
--- a/tests/dockerfile-lint
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM wlan-tip-tests
-RUN pip3 install pylint
-ENTRYPOINT [ "pylint" ]
diff --git a/tests/e2e/advanced/ap_co-existence/__init__.py b/tests/e2e/advanced/ap_co-existence/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/advanced/downlink_mu_mimo_performance/__init__.py b/tests/e2e/advanced/downlink_mu_mimo_performance/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/advanced/maximum_connection/__init__.py b/tests/e2e/advanced/maximum_connection/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/advanced/multi_station_performance/__init__.py b/tests/e2e/advanced/multi_station_performance/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/advanced/rate_vs_range/__init__.py b/tests/e2e/advanced/rate_vs_range/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/advanced/receiver_sensitivity/__init__.py b/tests/e2e/advanced/receiver_sensitivity/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/advanced/spatial_consistency/__init__.py b/tests/e2e/advanced/spatial_consistency/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/basic/client_connectivity/test_bridge_mode.py b/tests/e2e/basic/client_connectivity/test_bridge_mode.py
index 34e069f63..c56519852 100644
--- a/tests/e2e/basic/client_connectivity/test_bridge_mode.py
+++ b/tests/e2e/basic/client_connectivity/test_bridge_mode.py
@@ -25,7 +25,7 @@ import time
 
 
 @pytest.mark.sanity
-@pytest.mark.bridges
+@pytest.mark.bridge
 @pytest.mark.parametrize(
         'setup_profiles',
         (["BRIDGE"]),
@@ -36,335 +36,333 @@ class TestBridgeModeClientConnectivity(object):
 
     @pytest.mark.wpa
     @pytest.mark.twog
-    def test_everything(self):
-        assert True
-#     @pytest.mark.wpa
-#     @pytest.mark.twog
-#     def test_client_wpa_2g(self, request, get_lanforge_data, setup_profile_data, instantiate_testrail,
-#                            instantiate_project):
-#         profile_data = setup_profile_data["BRIDGE"]["WPA"]["2G"]
-#         station_names = []
-#         for i in range(0, int(request.config.getini("num_stations"))):
-#             station_names.append(get_lanforge_data["lanforge_2dot4g_prefix"] + "0" + str(i))
-#         print(profile_data, get_lanforge_data)
-#         staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
-#                                  debug_=False)
-#         staConnect.sta_mode = 0
-#         staConnect.upstream_resource = 1
-#         staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
-#         staConnect.radio = get_lanforge_data["lanforge_2dot4g"]
-#         staConnect.resource = 1
-#         staConnect.dut_ssid = profile_data["ssid_name"]
-#         staConnect.dut_passwd = profile_data["security_key"]
-#         staConnect.dut_security = "wpa"
-#         staConnect.station_names = station_names
-#         staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
-#         staConnect.runtime_secs = 10
-#         staConnect.bringup_time_sec = 60
-#         staConnect.cleanup_on_exit = True
-#         # staConnect.cleanup()
-#         staConnect.setup()
-#         staConnect.start()
-#         print("napping %f sec" % staConnect.runtime_secs)
-#         time.sleep(staConnect.runtime_secs)
-#         staConnect.stop()
-#         staConnect.cleanup()
-#         run_results = staConnect.get_result_list()
-#         for result in run_results:
-#             print("test result: " + result)
-#         # result = 'pass'
-#         print("Single Client Connectivity :", staConnect.passes)
-#         if staConnect.passes():
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_wpa_bridge"], run_id=instantiate_project,
-#                                                  status_id=1,
-#                                                  msg='2G WPA Client Connectivity Passed successfully - bridge mode')
-#         else:
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_wpa_bridge"], run_id=instantiate_project,
-#                                                  status_id=5,
-#                                                  msg='2G WPA Client Connectivity Failed - bridge mode')
-#         assert staConnect.passes()
-#         # C2420
-#
-#     @pytest.mark.wpa
-#     @pytest.mark.fiveg
-#     def test_client_wpa_5g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
-#                            instantiate_testrail):
-#         profile_data = setup_profile_data["BRIDGE"]["WPA"]["5G"]
-#         station_names = []
-#         for i in range(0, int(request.config.getini("num_stations"))):
-#             station_names.append(get_lanforge_data["lanforge_5g_prefix"] + "0" + str(i))
-#         staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
-#                                  debug_=False)
-#         staConnect.sta_mode = 0
-#         staConnect.upstream_resource = 1
-#         staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
-#         staConnect.radio = get_lanforge_data["lanforge_5g"]
-#         staConnect.resource = 1
-#         staConnect.dut_ssid = profile_data["ssid_name"]
-#         staConnect.dut_passwd = profile_data["security_key"]
-#         staConnect.dut_security = "wpa"
-#         staConnect.station_names = station_names
-#         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-#         staConnect.runtime_secs = 10
-#         staConnect.bringup_time_sec = 60
-#         staConnect.cleanup_on_exit = True
-#         # staConnect.cleanup()
-#         staConnect.setup()
-#         staConnect.start()
-#         print("napping %f sec" % staConnect.runtime_secs)
-#         time.sleep(staConnect.runtime_secs)
-#         staConnect.stop()
-#         staConnect.cleanup()
-#         run_results = staConnect.get_result_list()
-#         for result in run_results:
-#             print("test result: " + result)
-#         # result = 'pass'
-#         print("Single Client Connectivity :", staConnect.passes)
-#         if staConnect.passes():
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_wpa_bridge"], run_id=instantiate_project,
-#                                                  status_id=1,
-#                                                  msg='5G WPA Client Connectivity Passed successfully - bridge mode')
-#         else:
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_wpa_bridge"], run_id=instantiate_project,
-#                                                  status_id=5,
-#                                                  msg='5G WPA Client Connectivity Failed - bridge mode')
-#         assert staConnect.passes()
-#         # C2419
-#
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.twog
-#     def test_client_wpa2_personal_2g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
-#                                      instantiate_testrail):
-#         profile_data = setup_profile_data["BRIDGE"]["WPA2_P"]["2G"]
-#         station_names = []
-#         for i in range(0, int(request.config.getini("num_stations"))):
-#             station_names.append(get_lanforge_data["lanforge_2dot4g_prefix"] + "0" + str(i))
-#         staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
-#                                  debug_=False)
-#         staConnect.sta_mode = 0
-#         staConnect.upstream_resource = 1
-#         staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
-#         staConnect.radio = get_lanforge_data["lanforge_2dot4g"]
-#         staConnect.resource = 1
-#         staConnect.dut_ssid = profile_data["ssid_name"]
-#         staConnect.dut_passwd = profile_data["security_key"]
-#         staConnect.dut_security = "wpa2"
-#         staConnect.station_names = station_names
-#         staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
-#         staConnect.runtime_secs = 10
-#         staConnect.bringup_time_sec = 60
-#         staConnect.cleanup_on_exit = True
-#         # staConnect.cleanup()
-#         staConnect.setup()
-#         staConnect.start()
-#         print("napping %f sec" % staConnect.runtime_secs)
-#         time.sleep(staConnect.runtime_secs)
-#         staConnect.stop()
-#         staConnect.cleanup()
-#         run_results = staConnect.get_result_list()
-#         for result in run_results:
-#             print("test result: " + result)
-#         # result = 'pass'
-#         print("Single Client Connectivity :", staConnect.passes)
-#         if staConnect.passes():
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_wpa2_bridge"], run_id=instantiate_project,
-#                                                  status_id=1,
-#                                                  msg='2G WPA2 Client Connectivity Passed successfully - bridge mode')
-#         else:
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_wpa2_bridge"], run_id=instantiate_project,
-#                                                  status_id=5,
-#                                                  msg='2G WPA2 Client Connectivity Failed - bridge mode')
-#         assert staConnect.passes()
-#         # C2237
-#
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     def test_client_wpa2_personal_5g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
-#                                      instantiate_testrail):
-#         profile_data = setup_profile_data["BRIDGE"]["WPA2_P"]["5G"]
-#         station_names = []
-#         for i in range(0, int(request.config.getini("num_stations"))):
-#             station_names.append(get_lanforge_data["lanforge_5g_prefix"] + "0" + str(i))
-#         staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
-#                                  debug_=False)
-#         staConnect.sta_mode = 0
-#         staConnect.upstream_resource = 1
-#         staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
-#         staConnect.radio = get_lanforge_data["lanforge_5g"]
-#         staConnect.resource = 1
-#         staConnect.dut_ssid = profile_data["ssid_name"]
-#         staConnect.dut_passwd = profile_data["security_key"]
-#         staConnect.dut_security = "wpa2"
-#         staConnect.station_names = station_names
-#         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-#         staConnect.runtime_secs = 10
-#         staConnect.bringup_time_sec = 60
-#         staConnect.cleanup_on_exit = True
-#         # staConnect.cleanup()
-#         staConnect.setup()
-#         staConnect.start()
-#         print("napping %f sec" % staConnect.runtime_secs)
-#         time.sleep(staConnect.runtime_secs)
-#         staConnect.stop()
-#         staConnect.cleanup()
-#         run_results = staConnect.get_result_list()
-#         for result in run_results:
-#             print("test result: " + result)
-#         # result = 'pass'
-#         print("Single Client Connectivity :", staConnect.passes)
-#         if staConnect.passes():
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_wpa2_bridge"], run_id=instantiate_project,
-#                                                  status_id=1,
-#                                                  msg='5G WPA2 Client Connectivity Passed successfully - bridge mode')
-#         else:
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_wpa2_bridge"], run_id=instantiate_project,
-#                                                  status_id=5,
-#                                                  msg='5G WPA2 Client Connectivity Failed - bridge mode')
-#         assert staConnect.passes()
-#         # C2236
-#
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.twog
-#     def test_client_wpa2_enterprise_2g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
-#                                        instantiate_testrail):
-#         profile_data = setup_profile_data["BRIDGE"]["WPA2_E"]["2G"]
-#         station_names = []
-#         for i in range(0, int(request.config.getini("num_stations"))):
-#             station_names.append(get_lanforge_data["lanforge_2dot4g_prefix"] + "0" + str(i))
-#         eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
-#         eap_connect.upstream_resource = 1
-#         eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
-#         eap_connect.security = "wpa2"
-#         eap_connect.sta_list = station_names
-#         eap_connect.station_names = station_names
-#         eap_connect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
-#         eap_connect.ssid = profile_data["ssid_name"]
-#         eap_connect.radio = get_lanforge_data["lanforge_2dot4g"]
-#         eap_connect.eap = "TTLS"
-#         eap_connect.identity = "nolaradius"
-#         eap_connect.ttls_passwd = "nolastart"
-#         eap_connect.runtime_secs = 10
-#         eap_connect.setup()
-#         eap_connect.start()
-#         print("napping %f sec" % eap_connect.runtime_secs)
-#         time.sleep(eap_connect.runtime_secs)
-#         eap_connect.stop()
-#         try:
-#             eap_connect.cleanup()
-#             eap_connect.cleanup()
-#         except:
-#             pass
-#         run_results = eap_connect.get_result_list()
-#         for result in run_results:
-#             print("test result: " + result)
-#         # result = 'pass'
-#         print("Single Client Connectivity :", eap_connect.passes)
-#         if eap_connect.passes():
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_eap_bridge"], run_id=instantiate_project,
-#                                                  status_id=1,
-#                                                  msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
-#                                                      'bridge mode')
-#         else:
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_eap_bridge"], run_id=instantiate_project,
-#                                                  status_id=5,
-#                                                  msg='5G WPA2 ENTERPRISE Client Connectivity Failed - bridge mode')
-#         assert eap_connect.passes()
-#         # C5214
-#
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.fiveg
-#     def test_client_wpa2_enterprise_5g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
-#                                        instantiate_testrail):
-#         profile_data = setup_profile_data["BRIDGE"]["WPA2_E"]["5G"]
-#         station_names = []
-#         for i in range(0, int(request.config.getini("num_stations"))):
-#             station_names.append(get_lanforge_data["lanforge_5g_prefix"] + "0" + str(i))
-#         eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
-#         eap_connect.upstream_resource = 1
-#         eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
-#         eap_connect.security = "wpa2"
-#         eap_connect.sta_list = station_names
-#         eap_connect.station_names = station_names
-#         eap_connect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-#         eap_connect.ssid = profile_data["ssid_name"]
-#         eap_connect.radio = get_lanforge_data["lanforge_5g"]
-#         eap_connect.eap = "TTLS"
-#         eap_connect.identity = "nolaradius"
-#         eap_connect.ttls_passwd = "nolastart"
-#         eap_connect.runtime_secs = 10
-#         eap_connect.setup()
-#         eap_connect.start()
-#         print("napping %f sec" % eap_connect.runtime_secs)
-#         time.sleep(eap_connect.runtime_secs)
-#         eap_connect.stop()
-#         try:
-#             eap_connect.cleanup()
-#             eap_connect.cleanup()
-#         except:
-#             pass
-#         run_results = eap_connect.get_result_list()
-#         for result in run_results:
-#             print("test result: " + result)
-#         # result = 'pass'
-#         print("Single Client Connectivity :", eap_connect.passes)
-#         if eap_connect.passes():
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_eap_bridge"], run_id=instantiate_project,
-#                                                  status_id=1,
-#                                                  msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
-#                                                      'bridge mode')
-#         else:
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_eap_bridge"], run_id=instantiate_project,
-#                                                  status_id=5,
-#                                                  msg='5G WPA2 ENTERPRISE Client Connectivity Failed - bridge mode')
-#         assert eap_connect.passes()
-#
-#     @pytest.mark.modify_ssid
-#     @pytest.mark.parametrize(
-#         'update_ssid',
-#         (["BRIDGE, WPA, 5G, Sanity-updated-5G-WPA-BRIDGE"]),
-#         indirect=True
-#     )
-#     def test_modify_ssid(self, request, update_ssid, get_lanforge_data, setup_profile_data, instantiate_testrail,
-#                          instantiate_project):
-#         profile_data = setup_profile_data["BRIDGE"]["WPA"]["5G"]
-#         station_names = []
-#         for i in range(0, int(request.config.getini("num_stations"))):
-#             station_names.append(get_lanforge_data["lanforge_5g_prefix"] + "0" + str(i))
-#         staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
-#                                  debug_=False)
-#         staConnect.sta_mode = 0
-#         staConnect.upstream_resource = 1
-#         staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
-#         staConnect.radio = get_lanforge_data["lanforge_5g"]
-#         staConnect.resource = 1
-#         staConnect.dut_ssid = profile_data["ssid_name"]
-#         staConnect.dut_passwd = profile_data["security_key"]
-#         staConnect.dut_security = "wpa"
-#         staConnect.station_names = station_names
-#         staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
-#         staConnect.runtime_secs = 10
-#         staConnect.bringup_time_sec = 60
-#         staConnect.cleanup_on_exit = True
-#         # staConnect.cleanup()
-#         staConnect.setup()
-#         staConnect.start()
-#         print("napping %f sec" % staConnect.runtime_secs)
-#         time.sleep(staConnect.runtime_secs)
-#         staConnect.stop()
-#         staConnect.cleanup()
-#         run_results = staConnect.get_result_list()
-#         for result in run_results:
-#             print("test result: " + result)
-#         # result = 'pass'
-#         print("Single Client Connectivity :", staConnect.passes)
-#         if staConnect.passes():
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["bridge_ssid_update"], run_id=instantiate_project,
-#                                                  status_id=1,
-#                                                  msg='5G WPA Client Connectivity Passed successfully - bridge mode '
-#                                                      'updated ssid')
-#         else:
-#             instantiate_testrail.update_testrail(case_id=TEST_CASES["bridge_ssid_update"], run_id=instantiate_project,
-#                                                  status_id=5,
-#                                                  msg='5G WPA Client Connectivity Failed - bridge mode updated ssid')
-#         assert staConnect.passes()
-#
+    def test_client_wpa_2g(self, request, get_lanforge_data, setup_profile_data, instantiate_testrail,
+                           instantiate_project):
+        profile_data = setup_profile_data["BRIDGE"]["WPA"]["2G"]
+        station_names = []
+        for i in range(0, int(request.config.getini("num_stations"))):
+            station_names.append(get_lanforge_data["lanforge_2dot4g_prefix"] + "0" + str(i))
+        print(profile_data, get_lanforge_data)
+        staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
+                                 debug_=False)
+        staConnect.sta_mode = 0
+        staConnect.upstream_resource = 1
+        staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
+        staConnect.radio = get_lanforge_data["lanforge_2dot4g"]
+        staConnect.resource = 1
+        staConnect.dut_ssid = profile_data["ssid_name"]
+        staConnect.dut_passwd = profile_data["security_key"]
+        staConnect.dut_security = "wpa"
+        staConnect.station_names = station_names
+        staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
+        staConnect.runtime_secs = 10
+        staConnect.bringup_time_sec = 60
+        staConnect.cleanup_on_exit = True
+        # staConnect.cleanup()
+        staConnect.setup()
+        staConnect.start()
+        print("napping %f sec" % staConnect.runtime_secs)
+        time.sleep(staConnect.runtime_secs)
+        staConnect.stop()
+        staConnect.cleanup()
+        run_results = staConnect.get_result_list()
+        for result in run_results:
+            print("test result: " + result)
+        # result = 'pass'
+        print("Single Client Connectivity :", staConnect.passes)
+        if staConnect.passes():
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_wpa_bridge"], run_id=instantiate_project,
+                                                 status_id=1,
+                                                 msg='2G WPA Client Connectivity Passed successfully - bridge mode')
+        else:
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_wpa_bridge"], run_id=instantiate_project,
+                                                 status_id=5,
+                                                 msg='2G WPA Client Connectivity Failed - bridge mode')
+        assert staConnect.passes()
+        # C2420
+
+    @pytest.mark.wpa
+    @pytest.mark.fiveg
+    def test_client_wpa_5g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
+                           instantiate_testrail):
+        profile_data = setup_profile_data["BRIDGE"]["WPA"]["5G"]
+        station_names = []
+        for i in range(0, int(request.config.getini("num_stations"))):
+            station_names.append(get_lanforge_data["lanforge_5g_prefix"] + "0" + str(i))
+        staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
+                                 debug_=False)
+        staConnect.sta_mode = 0
+        staConnect.upstream_resource = 1
+        staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
+        staConnect.radio = get_lanforge_data["lanforge_5g"]
+        staConnect.resource = 1
+        staConnect.dut_ssid = profile_data["ssid_name"]
+        staConnect.dut_passwd = profile_data["security_key"]
+        staConnect.dut_security = "wpa"
+        staConnect.station_names = station_names
+        staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
+        staConnect.runtime_secs = 10
+        staConnect.bringup_time_sec = 60
+        staConnect.cleanup_on_exit = True
+        # staConnect.cleanup()
+        staConnect.setup()
+        staConnect.start()
+        print("napping %f sec" % staConnect.runtime_secs)
+        time.sleep(staConnect.runtime_secs)
+        staConnect.stop()
+        staConnect.cleanup()
+        run_results = staConnect.get_result_list()
+        for result in run_results:
+            print("test result: " + result)
+        # result = 'pass'
+        print("Single Client Connectivity :", staConnect.passes)
+        if staConnect.passes():
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_wpa_bridge"], run_id=instantiate_project,
+                                                 status_id=1,
+                                                 msg='5G WPA Client Connectivity Passed successfully - bridge mode')
+        else:
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_wpa_bridge"], run_id=instantiate_project,
+                                                 status_id=5,
+                                                 msg='5G WPA Client Connectivity Failed - bridge mode')
+        assert staConnect.passes()
+        # C2419
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    def test_client_wpa2_personal_2g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
+                                     instantiate_testrail):
+        profile_data = setup_profile_data["BRIDGE"]["WPA2_P"]["2G"]
+        station_names = []
+        for i in range(0, int(request.config.getini("num_stations"))):
+            station_names.append(get_lanforge_data["lanforge_2dot4g_prefix"] + "0" + str(i))
+        staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
+                                 debug_=False)
+        staConnect.sta_mode = 0
+        staConnect.upstream_resource = 1
+        staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
+        staConnect.radio = get_lanforge_data["lanforge_2dot4g"]
+        staConnect.resource = 1
+        staConnect.dut_ssid = profile_data["ssid_name"]
+        staConnect.dut_passwd = profile_data["security_key"]
+        staConnect.dut_security = "wpa2"
+        staConnect.station_names = station_names
+        staConnect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
+        staConnect.runtime_secs = 10
+        staConnect.bringup_time_sec = 60
+        staConnect.cleanup_on_exit = True
+        # staConnect.cleanup()
+        staConnect.setup()
+        staConnect.start()
+        print("napping %f sec" % staConnect.runtime_secs)
+        time.sleep(staConnect.runtime_secs)
+        staConnect.stop()
+        staConnect.cleanup()
+        run_results = staConnect.get_result_list()
+        for result in run_results:
+            print("test result: " + result)
+        # result = 'pass'
+        print("Single Client Connectivity :", staConnect.passes)
+        if staConnect.passes():
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_wpa2_bridge"], run_id=instantiate_project,
+                                                 status_id=1,
+                                                 msg='2G WPA2 Client Connectivity Passed successfully - bridge mode')
+        else:
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_wpa2_bridge"], run_id=instantiate_project,
+                                                 status_id=5,
+                                                 msg='2G WPA2 Client Connectivity Failed - bridge mode')
+        assert staConnect.passes()
+        # C2237
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    def test_client_wpa2_personal_5g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
+                                     instantiate_testrail):
+        profile_data = setup_profile_data["BRIDGE"]["WPA2_P"]["5G"]
+        station_names = []
+        for i in range(0, int(request.config.getini("num_stations"))):
+            station_names.append(get_lanforge_data["lanforge_5g_prefix"] + "0" + str(i))
+        staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
+                                 debug_=False)
+        staConnect.sta_mode = 0
+        staConnect.upstream_resource = 1
+        staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
+        staConnect.radio = get_lanforge_data["lanforge_5g"]
+        staConnect.resource = 1
+        staConnect.dut_ssid = profile_data["ssid_name"]
+        staConnect.dut_passwd = profile_data["security_key"]
+        staConnect.dut_security = "wpa2"
+        staConnect.station_names = station_names
+        staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
+        staConnect.runtime_secs = 10
+        staConnect.bringup_time_sec = 60
+        staConnect.cleanup_on_exit = True
+        # staConnect.cleanup()
+        staConnect.setup()
+        staConnect.start()
+        print("napping %f sec" % staConnect.runtime_secs)
+        time.sleep(staConnect.runtime_secs)
+        staConnect.stop()
+        staConnect.cleanup()
+        run_results = staConnect.get_result_list()
+        for result in run_results:
+            print("test result: " + result)
+        # result = 'pass'
+        print("Single Client Connectivity :", staConnect.passes)
+        if staConnect.passes():
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_wpa2_bridge"], run_id=instantiate_project,
+                                                 status_id=1,
+                                                 msg='5G WPA2 Client Connectivity Passed successfully - bridge mode')
+        else:
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_wpa2_bridge"], run_id=instantiate_project,
+                                                 status_id=5,
+                                                 msg='5G WPA2 Client Connectivity Failed - bridge mode')
+        assert staConnect.passes()
+        # C2236
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.twog
+    @pytest.mark.radius
+    def test_client_wpa2_enterprise_2g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
+                                       instantiate_testrail):
+        profile_data = setup_profile_data["BRIDGE"]["WPA2_E"]["2G"]
+        station_names = []
+        for i in range(0, int(request.config.getini("num_stations"))):
+            station_names.append(get_lanforge_data["lanforge_2dot4g_prefix"] + "0" + str(i))
+        eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
+        eap_connect.upstream_resource = 1
+        eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
+        eap_connect.security = "wpa2"
+        eap_connect.sta_list = station_names
+        eap_connect.station_names = station_names
+        eap_connect.sta_prefix = get_lanforge_data["lanforge_2dot4g_prefix"]
+        eap_connect.ssid = profile_data["ssid_name"]
+        eap_connect.radio = get_lanforge_data["lanforge_2dot4g"]
+        eap_connect.eap = "TTLS"
+        eap_connect.identity = "nolaradius"
+        eap_connect.ttls_passwd = "nolastart"
+        eap_connect.runtime_secs = 10
+        eap_connect.setup()
+        eap_connect.start()
+        print("napping %f sec" % eap_connect.runtime_secs)
+        time.sleep(eap_connect.runtime_secs)
+        eap_connect.stop()
+        try:
+            eap_connect.cleanup()
+            eap_connect.cleanup()
+        except:
+            pass
+        run_results = eap_connect.get_result_list()
+        for result in run_results:
+            print("test result: " + result)
+        # result = 'pass'
+        print("Single Client Connectivity :", eap_connect.passes)
+        if eap_connect.passes():
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_eap_bridge"], run_id=instantiate_project,
+                                                 status_id=1,
+                                                 msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
+                                                     'bridge mode')
+        else:
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["2g_eap_bridge"], run_id=instantiate_project,
+                                                 status_id=5,
+                                                 msg='5G WPA2 ENTERPRISE Client Connectivity Failed - bridge mode')
+        assert eap_connect.passes()
+        # C5214
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.fiveg
+    @pytest.mark.radius
+    def test_client_wpa2_enterprise_5g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
+                                       instantiate_testrail):
+        profile_data = setup_profile_data["BRIDGE"]["WPA2_E"]["5G"]
+        station_names = []
+        for i in range(0, int(request.config.getini("num_stations"))):
+            station_names.append(get_lanforge_data["lanforge_5g_prefix"] + "0" + str(i))
+        eap_connect = EAPConnect(get_lanforge_data["lanforge_ip"], get_lanforge_data["lanforge-port-number"])
+        eap_connect.upstream_resource = 1
+        eap_connect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
+        eap_connect.security = "wpa2"
+        eap_connect.sta_list = station_names
+        eap_connect.station_names = station_names
+        eap_connect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
+        eap_connect.ssid = profile_data["ssid_name"]
+        eap_connect.radio = get_lanforge_data["lanforge_5g"]
+        eap_connect.eap = "TTLS"
+        eap_connect.identity = "nolaradius"
+        eap_connect.ttls_passwd = "nolastart"
+        eap_connect.runtime_secs = 10
+        eap_connect.setup()
+        eap_connect.start()
+        print("napping %f sec" % eap_connect.runtime_secs)
+        time.sleep(eap_connect.runtime_secs)
+        eap_connect.stop()
+        try:
+            eap_connect.cleanup()
+            eap_connect.cleanup()
+        except:
+            pass
+        run_results = eap_connect.get_result_list()
+        for result in run_results:
+            print("test result: " + result)
+        # result = 'pass'
+        print("Single Client Connectivity :", eap_connect.passes)
+        if eap_connect.passes():
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_eap_bridge"], run_id=instantiate_project,
+                                                 status_id=1,
+                                                 msg='5G WPA2 ENTERPRISE Client Connectivity Passed successfully - '
+                                                     'bridge mode')
+        else:
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["5g_eap_bridge"], run_id=instantiate_project,
+                                                 status_id=5,
+                                                 msg='5G WPA2 ENTERPRISE Client Connectivity Failed - bridge mode')
+        assert eap_connect.passes()
+
+    @pytest.mark.modify_ssid
+    @pytest.mark.parametrize(
+        'update_ssid',
+        (["BRIDGE, WPA, 5G, Sanity-updated-5G-WPA-BRIDGE"]),
+        indirect=True
+    )
+    def test_modify_ssid(self, request, update_ssid, get_lanforge_data, setup_profile_data, instantiate_testrail,
+                         instantiate_project):
+        profile_data = setup_profile_data["BRIDGE"]["WPA"]["5G"]
+        station_names = []
+        for i in range(0, int(request.config.getini("num_stations"))):
+            station_names.append(get_lanforge_data["lanforge_5g_prefix"] + "0" + str(i))
+        staConnect = StaConnect2(get_lanforge_data["lanforge_ip"], int(get_lanforge_data["lanforge-port-number"]),
+                                 debug_=False)
+        staConnect.sta_mode = 0
+        staConnect.upstream_resource = 1
+        staConnect.upstream_port = get_lanforge_data["lanforge_bridge_port"]
+        staConnect.radio = get_lanforge_data["lanforge_5g"]
+        staConnect.resource = 1
+        staConnect.dut_ssid = profile_data["ssid_name"]
+        staConnect.dut_passwd = profile_data["security_key"]
+        staConnect.dut_security = "wpa"
+        staConnect.station_names = station_names
+        staConnect.sta_prefix = get_lanforge_data["lanforge_5g_prefix"]
+        staConnect.runtime_secs = 10
+        staConnect.bringup_time_sec = 60
+        staConnect.cleanup_on_exit = True
+        # staConnect.cleanup()
+        staConnect.setup()
+        staConnect.start()
+        print("napping %f sec" % staConnect.runtime_secs)
+        time.sleep(staConnect.runtime_secs)
+        staConnect.stop()
+        staConnect.cleanup()
+        run_results = staConnect.get_result_list()
+        for result in run_results:
+            print("test result: " + result)
+        # result = 'pass'
+        print("Single Client Connectivity :", staConnect.passes)
+        if staConnect.passes():
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["bridge_ssid_update"], run_id=instantiate_project,
+                                                 status_id=1,
+                                                 msg='5G WPA Client Connectivity Passed successfully - bridge mode '
+                                                     'updated ssid')
+        else:
+            instantiate_testrail.update_testrail(case_id=TEST_CASES["bridge_ssid_update"], run_id=instantiate_project,
+                                                 status_id=5,
+                                                 msg='5G WPA Client Connectivity Failed - bridge mode updated ssid')
+        assert staConnect.passes()
+
diff --git a/tests/e2e/basic/client_connectivity/test_nat_mode.py b/tests/e2e/basic/client_connectivity/test_nat_mode.py
index 21f4de59c..f04a55e1e 100644
--- a/tests/e2e/basic/client_connectivity/test_nat_mode.py
+++ b/tests/e2e/basic/client_connectivity/test_nat_mode.py
@@ -220,6 +220,7 @@ class TestNatModeClientConnectivity(object):
 
     @pytest.mark.wpa2_enterprise
     @pytest.mark.twog
+    @pytest.mark.radius
     def test_client_wpa2_enterprise_2g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
                                        instantiate_testrail):
         profile_data = setup_profile_data["NAT"]["WPA2_E"]["2G"]
@@ -268,6 +269,7 @@ class TestNatModeClientConnectivity(object):
 
     @pytest.mark.wpa2_enterprise
     @pytest.mark.fiveg
+    @pytest.mark.radius
     def test_client_wpa2_enterprise_5g(self, request, get_lanforge_data, setup_profile_data, instantiate_project,
                                        instantiate_testrail):
         profile_data = setup_profile_data["NAT"]["WPA2_E"]["5G"]
diff --git a/tests/e2e/basic/client_connectivity/test_vlan_mode.py b/tests/e2e/basic/client_connectivity/test_vlan_mode.py
index 901398e87..7599150b8 100644
--- a/tests/e2e/basic/client_connectivity/test_vlan_mode.py
+++ b/tests/e2e/basic/client_connectivity/test_vlan_mode.py
@@ -215,6 +215,7 @@ class TestVlanModeClientConnectivity(object):
 
     @pytest.mark.wpa2_enterprise
     @pytest.mark.twog
+    @pytest.mark.radius
     def test_client_wpa2_enterprise_2g(self, request, get_lanforge_data, setup_profile_data, instantiate_project, instantiate_testrail):
         profile_data = setup_profile_data["VLAN"]["WPA2_E"]["2G"]
         station_names = []
@@ -262,6 +263,7 @@ class TestVlanModeClientConnectivity(object):
 
     @pytest.mark.wpa2_enterprise
     @pytest.mark.fiveg
+    @pytest.mark.radius
     def test_client_wpa2_enterprise_5g(self, request, get_lanforge_data, setup_profile_data, instantiate_project, instantiate_testrail):
         profile_data = setup_profile_data["VLAN"]["WPA2_E"]["5G"]
         station_names = []
diff --git a/tests/e2e/interOp/client_connectivity/__init__.py b/tests/e2e/interOp/client_connectivity/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/setup_connectivity.py b/tests/setup_connectivity.py
index 70fed87fb..14746bc49 100644
--- a/tests/setup_connectivity.py
+++ b/tests/setup_connectivity.py
@@ -1,8 +1,9 @@
 import pytest
 
 
-@pytest.mark.order(1)
+@pytest.mark.sanity
 class TestConnection:
+
     @pytest.mark.test_cloud_connectivity
     def test_cloud_connectivity(self, instantiate_cloudsdk):
         assert instantiate_cloudsdk
@@ -12,9 +13,9 @@ class TestConnection:
         assert instantiate_cloudsdk
 
     @pytest.mark.test_lanforge_connectivity
-    def test_lanforge_connectivity(self):
+    def test_lanforge_connectivity(self, setup_lanforge):
         assert "instantiate_cloudsdk"
 
     @pytest.mark.test_perfecto_connectivity
-    def test_perfecto_connectivity(self):
+    def test_perfecto_connectivity(self, setup_perfecto_devices):
         assert "instantiate_cloudsdk"
diff --git a/tests/setup_e2e_tests.py b/tests/setup_e2e_tests.py
index 4c9216087..60e5933d9 100644
--- a/tests/setup_e2e_tests.py
+++ b/tests/setup_e2e_tests.py
@@ -1,322 +1,322 @@
-import pytest
-
-
-@pytest.mark.sanity
-@pytest.mark.bridge
-class TestSetupBridge:
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_setup_rf_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_setup_radius_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.open
-    @pytest.mark.twog
-    def test_setup_open_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.open
-    @pytest.mark.fiveg
-    def test_setup_open_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa
-    @pytest.mark.twog
-    def test_setup_wpa_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa
-    @pytest.mark.fiveg
-    def test_setup_wpa_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.twog
-    def test_setup_wpa2_personal_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    def test_setup_wpa2_personal_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.twog
-    @pytest.mark.radius
-    def test_setup_wpa2_enterprise_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    def test_setup_wpa2_enterprise_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_setup_equipment_ap_profile(self):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_push_profile(self):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_verify_vif_config(self):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_verify_vif_state(self):
-        assert True
-
-
-@pytest.mark.sanity
-@pytest.mark.nat
-class TestSetupNAT:
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_setup_rf_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_setup_radius_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.open
-    @pytest.mark.twog
-    def test_setup_open_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.open
-    @pytest.mark.fiveg
-    def test_setup_open_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa
-    @pytest.mark.twog
-    def test_setup_wpa_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa
-    @pytest.mark.fiveg
-    def test_setup_wpa_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.twog
-    def test_setup_wpa2_personal_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    def test_setup_wpa2_personal_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.twog
-    @pytest.mark.radius
-    def test_setup_wpa2_enterprise_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    def test_setup_wpa2_enterprise_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_setup_equipment_ap_profile(self):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_push_profile(self):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_verify_vif_config(self):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_verify_vif_state(self):
-        assert True
-
-
-@pytest.mark.sanity
-@pytest.mark.vlan
-class TestSetupVLAN:
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_setup_rf_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_setup_radius_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.open
-    @pytest.mark.twog
-    def test_setup_open_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.open
-    @pytest.mark.fiveg
-    def test_setup_open_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa
-    @pytest.mark.twog
-    def test_setup_wpa_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa
-    @pytest.mark.fiveg
-    def test_setup_wpa_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.twog
-    def test_setup_wpa2_personal_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    def test_setup_wpa2_personal_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.twog
-    @pytest.mark.radius
-    def test_setup_wpa2_enterprise_2g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    def test_setup_wpa2_enterprise_5g_ssid_profile(self, cleanup_profile):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_setup_equipment_ap_profile(self):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_push_profile(self):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_verify_vif_config(self):
-        assert True
-
-    @pytest.mark.fiveg
-    @pytest.mark.radius
-    @pytest.mark.twog
-    @pytest.mark.wpa2_enterprise
-    @pytest.mark.wpa2_personal
-    @pytest.mark.wpa
-    @pytest.mark.open
-    def test_verify_vif_state(self):
-        assert True
+# import pytest
+#
+#
+# @pytest.mark.sanity
+# @pytest.mark.bridge
+# class TestSetupBridge:
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_setup_rf_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_setup_radius_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.open
+#     @pytest.mark.twog
+#     def test_setup_open_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.open
+#     @pytest.mark.fiveg
+#     def test_setup_open_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa
+#     @pytest.mark.twog
+#     def test_setup_wpa_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa
+#     @pytest.mark.fiveg
+#     def test_setup_wpa_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.twog
+#     def test_setup_wpa2_personal_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.fiveg
+#     def test_setup_wpa2_personal_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.twog
+#     @pytest.mark.radius
+#     def test_setup_wpa2_enterprise_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     def test_setup_wpa2_enterprise_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_setup_equipment_ap_profile(self):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_push_profile(self):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_verify_vif_config(self):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_verify_vif_state(self):
+#         assert True
+#
+#
+# @pytest.mark.sanity
+# @pytest.mark.nat
+# class TestSetupNAT:
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_setup_rf_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_setup_radius_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.open
+#     @pytest.mark.twog
+#     def test_setup_open_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.open
+#     @pytest.mark.fiveg
+#     def test_setup_open_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa
+#     @pytest.mark.twog
+#     def test_setup_wpa_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa
+#     @pytest.mark.fiveg
+#     def test_setup_wpa_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.twog
+#     def test_setup_wpa2_personal_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.fiveg
+#     def test_setup_wpa2_personal_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.twog
+#     @pytest.mark.radius
+#     def test_setup_wpa2_enterprise_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     def test_setup_wpa2_enterprise_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_setup_equipment_ap_profile(self):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_push_profile(self):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_verify_vif_config(self):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_verify_vif_state(self):
+#         assert True
+#
+#
+# @pytest.mark.sanity
+# @pytest.mark.vlan
+# class TestSetupVLAN:
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_setup_rf_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_setup_radius_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.open
+#     @pytest.mark.twog
+#     def test_setup_open_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.open
+#     @pytest.mark.fiveg
+#     def test_setup_open_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa
+#     @pytest.mark.twog
+#     def test_setup_wpa_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa
+#     @pytest.mark.fiveg
+#     def test_setup_wpa_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.twog
+#     def test_setup_wpa2_personal_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.fiveg
+#     def test_setup_wpa2_personal_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.twog
+#     @pytest.mark.radius
+#     def test_setup_wpa2_enterprise_2g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     def test_setup_wpa2_enterprise_5g_ssid_profile(self, cleanup_profile):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_setup_equipment_ap_profile(self):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_push_profile(self):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_verify_vif_config(self):
+#         assert True
+#
+#     @pytest.mark.fiveg
+#     @pytest.mark.radius
+#     @pytest.mark.twog
+#     @pytest.mark.wpa2_enterprise
+#     @pytest.mark.wpa2_personal
+#     @pytest.mark.wpa
+#     @pytest.mark.open
+#     def test_verify_vif_state(self):
+#         assert True