added wpa2 eap ttls

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>

libs/apnos/apnos.py

@@ -439,10 +439,10 @@ if __name__ == '__main__':
         'mode': 'wifi6',
         'serial': '903cb39d6918',
         'jumphost': True,
-        'ip': "localhost",  # 10.28.3.103
+        'ip': "10.28.3.103",  # 10.28.3.103
         'username': "lanforge",
         'password': "pumpkin77",
-        'port': 8806,  # 22
+        'port': 22,  # 22
         'jumphost_tty': '/dev/ttyAP2',
         'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/edgecore_eap102/20210625-edgecore_eap102-uCentral-trunk-4225122-upgrade.bin"
     }

tests/configuration.py

@@ -212,10 +212,10 @@ CONFIGURATION = {
                 'mode': 'wifi6',
                 'serial': '903cb39d6918',
                 'jumphost': True,
-                'ip': "localhost",  # 10.28.3.103
+                'ip': "10.28.3.103",  # 10.28.3.103
                 'username': "lanforge",
                 'password': "pumpkin77",
-                'port': 8806,  # 22
+                'port': 22,  # 22
                 'jumphost_tty': '/dev/ttyAP2',
                 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/edgecore_eap102/20210625-edgecore_eap102-uCentral-trunk-4225122-upgrade.bin"
             }
@@ -223,11 +223,11 @@ CONFIGURATION = {
         "traffic_generator": {
             "name": "lanforge",
             "details": {
-                "ip": "localhost",  # 10.28.3.30
-                "port": 8802,  # 8080
-                "ssh_port": 8804,
-                "2.4G-Radio": ["wiphy4"],
-                "5G-Radio": ["wiphy5"],
+                "ip": "10.28.3.30",  # 10.28.3.30
+                "port": 8080,  # 8080
+                "ssh_port": 22,
+                "2.4G-Radio": ["wiphy0"],
+                "5G-Radio": ["wiphy1"],
                 "AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "wiphy3"],
                 "upstream": "1.1.eth2",
                 "upstream_subnet": "10.28.2.1/24",
@@ -250,6 +250,14 @@ RADIUS_SERVER_DATA = {
     "pk_password": "whatever"
 }
 
+RADIUS_ACCOUNTING_DATA = {
+    "ip": "10.10.10.72",
+    "port": 1812,
+    "secret": "testing123",
+    "user": "user",
+    "password": "password",
+    "pk_password": "whatever"
+}
 TEST_CASES = {
     "ap_upgrade": 2233,
     "5g_wpa2_bridge": 2236,

tests/conftest.py

@@ -39,6 +39,7 @@ import pytest
 from cv_test_manager import cv_test
 from configuration import CONFIGURATION
 from configuration import RADIUS_SERVER_DATA
+from configuration import RADIUS_ACCOUNTING_DATA
 from configuration import TEST_CASES
 from testrails.testrail_api import APIClient
 from testrails.reporting import Reporting
@@ -193,6 +194,13 @@ def radius_info():
     yield RADIUS_SERVER_DATA
 
 
+@pytest.fixture(scope="session")
+def radius_accounting_info():
+    """yields the radius accounting information from lab info file"""
+    allure.attach(body=str(RADIUS_ACCOUNTING_DATA), name="Radius server Info: ")
+    yield RADIUS_ACCOUNTING_DATA
+
+
 @pytest.fixture(scope="session")
 def get_configuration(testbed, request):
     """yields the selected testbed information from lab info file (configuration.py)"""
@@ -223,7 +231,6 @@ def get_equipment_id(request, setup_controller, testbed, get_configuration):
     yield equipment_id_list
 
 
-
 @pytest.fixture(scope="session")
 def instantiate_access_point(testbed, get_apnos, get_configuration):
     """setup the access point connectivity"""
@@ -545,6 +552,14 @@ def create_lanforge_chamberview_dut(get_configuration, testbed):
     yield True
 
 
+@pytest.fixture(scope="session")
+def lf_tools(get_configuration, testbed):
+    """ Create a DUT on LANforge"""
+    obj = ChamberView(lanforge_data=get_configuration["traffic_generator"]["details"],
+                      testbed=testbed, access_point_data=get_configuration["access_point"])
+    yield obj
+
+
 @pytest.fixture(scope="module")
 def create_vlan(request, testbed, get_configuration):
     """Create a vlan on lanforge"""

tests/e2e/basic/conftest.py

@@ -58,7 +58,7 @@ def setup_vlan():
 @pytest.fixture(scope="class")
 def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment_id,
                    instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
-                   get_security_flags, get_configuration, radius_info, get_apnos):
+                   get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info):
     if request.config.getoption("--ucentral"):
         instantiate_profile_obj = instantiate_profile(sdk_client=setup_controller)
         print(1, instantiate_profile_obj.sdk_client)
@@ -156,6 +156,100 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment
                             test_cases["wpa2_personal"] = False
                             allure.attach(body=str(e),
                                           name="SSID Profile Creation Failed")
+            if mode == "wpa_wpa2_personal_mixed":
+                for j in profile_data["ssid"][mode]:
+                    if mode in get_markers.keys() and get_markers[mode]:
+                        try:
+                            for i in range(len(j["appliedRadios"])):
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHzU", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHzL", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHz", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is2dot4GHz", "2G")
+                            j["appliedRadios"] = list(set(j["appliedRadios"]))
+                            j['security'] = 'psk-mixed'
+                            lf_dut_data.append(j)
+                            print("shivam: ", j)
+                            creates_profile = instantiate_profile_obj.add_ssid(ssid_data=j)
+                            test_cases["wpa_2g"] = True
+                            allure.attach(body=str(creates_profile),
+                                          name="SSID Profile Created")
+                        except Exception as e:
+                            print(e)
+                            test_cases["wpa2_personal"] = False
+                            allure.attach(body=str(e),
+                                          name="SSID Profile Creation Failed")
+            if mode == "wpa3_personal":
+                for j in profile_data["ssid"][mode]:
+                    if mode in get_markers.keys() and get_markers[mode]:
+                        try:
+                            for i in range(len(j["appliedRadios"])):
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHzU", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHzL", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHz", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is2dot4GHz", "2G")
+                            j["appliedRadios"] = list(set(j["appliedRadios"]))
+                            j['security'] = 'sae'
+                            lf_dut_data.append(j)
+                            print("shivam: ", j)
+                            creates_profile = instantiate_profile_obj.add_ssid(ssid_data=j)
+                            test_cases["wpa_2g"] = True
+                            allure.attach(body=str(creates_profile),
+                                          name="SSID Profile Created")
+                        except Exception as e:
+                            print(e)
+                            test_cases["wpa2_personal"] = False
+                            allure.attach(body=str(e),
+                                          name="SSID Profile Creation Failed")
+            if mode == "wpa3_personal_mixed":
+                for j in profile_data["ssid"][mode]:
+                    if mode in get_markers.keys() and get_markers[mode]:
+                        try:
+                            for i in range(len(j["appliedRadios"])):
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHzU", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHzL", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHz", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is2dot4GHz", "2G")
+                            j["appliedRadios"] = list(set(j["appliedRadios"]))
+                            j['security'] = 'sae-mixed'
+                            lf_dut_data.append(j)
+                            print("shivam: ", j)
+                            creates_profile = instantiate_profile_obj.add_ssid(ssid_data=j)
+                            test_cases["wpa_2g"] = True
+                            allure.attach(body=str(creates_profile),
+                                          name="SSID Profile Created")
+                        except Exception as e:
+                            print(e)
+                            test_cases["wpa2_personal"] = False
+                            allure.attach(body=str(e),
+                                          name="SSID Profile Creation Failed")
+
+            # EAP SSID Modes
+            if mode == "wpa2_enterprise":
+                for j in profile_data["ssid"][mode]:
+                    if mode in get_markers.keys() and get_markers[mode]:
+                        try:
+                            for i in range(len(j["appliedRadios"])):
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHzU", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHzL", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is5GHz", "5G")
+                                j["appliedRadios"][i] = j["appliedRadios"][i].replace("is2dot4GHz", "2G")
+
+                            j["appliedRadios"] = list(set(j["appliedRadios"]))
+                            j['security'] = 'wpa2'
+                            lf_dut_data.append(j)
+                            RADIUS_SERVER_DATA = radius_info
+                            RADIUS_ACCOUNTING_DATA = radius_accounting_info
+                            creates_profile = instantiate_profile_obj.add_ssid(ssid_data=j, radius=True,
+                                                                               radius_auth_data=RADIUS_SERVER_DATA,
+                                                                               radius_accounting_data=RADIUS_ACCOUNTING_DATA)
+                            test_cases["wpa_2g"] = True
+                            allure.attach(body=str(creates_profile),
+                                          name="SSID Profile Created")
+                        except Exception as e:
+                            print(e)
+                            test_cases["wpa2_personal"] = False
+                            allure.attach(body=str(e),
+                                          name="SSID Profile Creation Failed")
         ap_ssh = get_apnos(get_configuration['access_point'][0], pwd="../libs/apnos/", sdk="2.x")
         connected, latest, active = ap_ssh.get_ucentral_status()
         print(2, instantiate_profile_obj.sdk_client)
@@ -165,7 +259,10 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment
         config = json.loads(str(instantiate_profile_obj.base_profile_config).replace(" ", "").replace("'", '"'))
         config["uuid"] = 0
         ap_config_latest = ap_ssh.get_uc_latest_config()
+        try:
             ap_config_latest["uuid"] = 0
+        except:
+            pass
         x = 1
         while ap_config_latest != config:
             time.sleep(5)

tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py

@@ -8,7 +8,7 @@ import allure
 import pytest
 
 pytestmark = [pytest.mark.client_connectivity, pytest.mark.bridge, pytest.mark.enterprise, pytest.mark.ttls,
-              pytest.mark.sanity, pytest.mark.usefixtures("setup_test_run")]
+              pytest.mark.sanity]#, pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_enterprise = {
     "mode": "BRIDGE",
@@ -116,6 +116,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object):
                 pytest.exit("Test Case Failed")
         assert passes
 
+    @pytest.mark.uc_sanity
     @pytest.mark.sanity_light
     @pytest.mark.wpa2_enterprise
     @pytest.mark.twog
@@ -134,6 +135,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object):
         ttls_passwd = radius_info["password"]
         eap = "TTLS"
         identity = radius_info['user']
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -156,6 +158,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object):
                 pytest.exit("Test Case Failed")
         assert passes
 
+    @pytest.mark.uc_sanity
     @pytest.mark.sanity_light
     @pytest.mark.wpa2_enterprise
     @pytest.mark.fiveg
@@ -174,6 +177,7 @@ class TestBridgeModeEnterpriseTTLSSuiteA(object):
         ttls_passwd = radius_info["password"]
         eap = "TTLS"
         identity = radius_info['user']
+        get_vif_state.append(ssid_name)
         if ssid_name 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")

tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py

@@ -296,6 +296,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
         pytest -m "client_connectivity and bridge and suiteB"
     """
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @allure.story('open 2.4 GHZ Band')
@@ -312,6 +313,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
         mode = "BRIDGE"
         band = "twog"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -331,6 +333,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @allure.story('open 5 GHZ Band')
@@ -346,6 +349,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
         mode = "BRIDGE"
         band = "fiveg"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -365,6 +369,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal_mixed
     @pytest.mark.twog
     @allure.story('open 2.4 GHZ Band')
@@ -382,6 +387,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
         mode = "BRIDGE"
         band = "twog"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -401,6 +407,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal_mixed
     @pytest.mark.fiveg
     @allure.story('open 5 GHZ Band')
@@ -417,6 +424,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
         mode = "BRIDGE"
         band = "fiveg"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -436,6 +444,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa_wpa2_personal_mixed
     @pytest.mark.twog
     @allure.story('wpa wpa2 personal mixed 2.4 GHZ Band')
@@ -454,6 +463,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
         mode = "BRIDGE"
         band = "twog"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -473,6 +483,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa_wpa2_personal_mixed
     @pytest.mark.fiveg
     @allure.story('wpa wpa2 personal mixed 5 GHZ Band')
@@ -489,6 +500,7 @@ class TestBridgeModeConnectivitySuiteTwo(object):
         mode = "BRIDGE"
         band = "fiveg"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")

tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py

@@ -1,8 +1,8 @@
 import allure
 import pytest
 
-pytestmark = [pytest.mark.client_connectivity, pytest.mark.usefixtures("setup_test_run"), pytest.mark.nat, pytest.mark.enterprise, pytest.mark.ttls,
-              pytest.mark.sanity]
+pytestmark = [pytest.mark.client_connectivity, pytest.mark.nat, pytest.mark.enterprise, pytest.mark.ttls,
+              pytest.mark.sanity] #pytest.mark.usefixtures("setup_test_run"),
 
 setup_params_enterprise = {
     "mode": "NAT",
@@ -103,6 +103,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object):
                 pytest.exit("Test Case Failed")
         assert passes
 
+    @pytest.mark.uc_sanity
     @pytest.mark.sanity_light
     @pytest.mark.wpa2_enterprise
     @pytest.mark.twog
@@ -117,6 +118,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object):
         ttls_passwd = radius_info["password"]
         eap = "TTLS"
         identity = radius_info['user']
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -139,6 +141,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object):
                 pytest.exit("Test Case Failed")
         assert passes
 
+    @pytest.mark.uc_sanity
     @pytest.mark.sanity_light
     @pytest.mark.wpa2_enterprise
     @pytest.mark.fiveg
@@ -153,6 +156,7 @@ class TestNATModeEnterpriseTTLSSuiteOne(object):
         ttls_passwd = radius_info["password"]
         eap = "TTLS"
         identity = radius_info['user']
+        get_vif_state.append(ssid_name)
         if ssid_name 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")

tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py

@@ -298,6 +298,7 @@ class TestBridgeModeConnectivitySuiteB(object):
         pytest -m "client_connectivity and bridge and suiteB"
     """
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @allure.story('open 2.4 GHZ Band')
@@ -314,6 +315,7 @@ class TestBridgeModeConnectivitySuiteB(object):
         mode = "NAT"
         band = "twog"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -333,6 +335,7 @@ class TestBridgeModeConnectivitySuiteB(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @allure.story('open 5 GHZ Band')
@@ -348,6 +351,7 @@ class TestBridgeModeConnectivitySuiteB(object):
         mode = "NAT"
         band = "fiveg"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -367,6 +371,7 @@ class TestBridgeModeConnectivitySuiteB(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal_mixed
     @pytest.mark.twog
     @allure.story('open 2.4 GHZ Band')
@@ -384,6 +389,7 @@ class TestBridgeModeConnectivitySuiteB(object):
         mode = "NAT"
         band = "twog"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -403,6 +409,7 @@ class TestBridgeModeConnectivitySuiteB(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal_mixed
     @pytest.mark.fiveg
     @allure.story('open 5 GHZ Band')
@@ -419,6 +426,7 @@ class TestBridgeModeConnectivitySuiteB(object):
         mode = "NAT"
         band = "fiveg"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -438,6 +446,7 @@ class TestBridgeModeConnectivitySuiteB(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa_wpa2_personal_mixed
     @pytest.mark.twog
     @allure.story('wpa wpa2 personal mixed 2.4 GHZ Band')
@@ -456,6 +465,7 @@ class TestBridgeModeConnectivitySuiteB(object):
         mode = "NAT"
         band = "twog"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -475,6 +485,7 @@ class TestBridgeModeConnectivitySuiteB(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa_wpa2_personal_mixed
     @pytest.mark.fiveg
     @allure.story('wpa wpa2 personal mixed 5 GHZ Band')
@@ -491,6 +502,7 @@ class TestBridgeModeConnectivitySuiteB(object):
         mode = "NAT"
         band = "fiveg"
         vlan = 1
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -510,7 +522,6 @@ class TestBridgeModeConnectivitySuiteB(object):
                                               passes))
         assert result
 
-
 # WEP Security Feature not available
 # setup_params_wep = {
 #     "mode": "BRIDGE",
@@ -590,4 +601,3 @@ class TestBridgeModeConnectivitySuiteB(object):
 #                                           msg='2G WPA Client Connectivity Failed - bridge mode' + str(
 #                                               passes))
 #         assert passes
-

tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py

@@ -1,8 +1,8 @@
 import allure
 import pytest
 
-pytestmark = [pytest.mark.client_connectivity, pytest.mark.usefixtures("setup_test_run"), pytest.mark.vlan, pytest.mark.enterprise, pytest.mark.ttls,
-              pytest.mark.sanity]
+pytestmark = [pytest.mark.client_connectivity, pytest.mark.vlan, pytest.mark.enterprise, pytest.mark.ttls,
+              pytest.mark.sanity] # pytest.mark.usefixtures("setup_test_run")
 
 setup_params_enterprise = {
     "mode": "VLAN",
@@ -11,8 +11,8 @@ setup_params_enterprise = {
             {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]},
             {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}],
         "wpa2_enterprise": [
-            {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]},
-            {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}],
+            {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"], "vlan":100},
+            {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "vlan":100}],
         "wpa3_enterprise": [
             {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]},
             {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]},
@@ -105,6 +105,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object):
                 pytest.exit("Test Case Failed")
         assert passes
 
+    @pytest.mark.uc_sanity
     @pytest.mark.sanity_light
     @pytest.mark.wpa2_enterprise
     @pytest.mark.twog
@@ -119,6 +120,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object):
         ttls_passwd = radius_info["password"]
         eap = "TTLS"
         identity = radius_info['user']
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -141,6 +143,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object):
                 pytest.exit("Test Case Failed")
         assert passes
 
+    @pytest.mark.uc_sanity
     @pytest.mark.sanity_light
     @pytest.mark.wpa2_enterprise
     @pytest.mark.fiveg
@@ -155,6 +158,7 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object):
         ttls_passwd = radius_info["password"]
         eap = "TTLS"
         identity = radius_info['user']
+        get_vif_state.append(ssid_name)
         if ssid_name 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")

tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py

@@ -264,17 +264,17 @@ setup_params_general_two = {
     "mode": "VLAN",
     "ssid_modes": {
         "wpa3_personal": [
-            {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"},
+            {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something", "vlan": 100},
             {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],
-             "security_key": "something"}],
+             "security_key": "something", "vlan": 100}],
         "wpa3_personal_mixed": [
-            {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"},
+            {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something","vlan": 100},
             {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],
-             "security_key": "something"}],
+             "security_key": "something", "vlan": 100}],
         "wpa_wpa2_personal_mixed": [
-            {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"},
+            {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something", "vlan": 100},
             {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"],
-             "security_key": "something"}]
+             "security_key": "something", "vlan": 100}]
     },
     "rf": {},
     "radius": False
@@ -295,6 +295,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
         pytest -m "client_connectivity and vlan and suiteB"
     """
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @allure.story('open 2.4 GHZ Band')
@@ -311,6 +312,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
         mode = "VLAN"
         band = "twog"
         vlan = 100
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -330,6 +332,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @allure.story('open 5 GHZ Band')
@@ -345,6 +348,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
         mode = "VLAN"
         band = "fiveg"
         vlan = 100
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -364,6 +368,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal_mixed
     @pytest.mark.twog
     @allure.story('open 2.4 GHZ Band')
@@ -381,6 +386,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
         mode = "VLAN"
         band = "twog"
         vlan = 100
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -400,6 +406,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa3_personal_mixed
     @pytest.mark.fiveg
     @allure.story('open 5 GHZ Band')
@@ -416,6 +423,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
         mode = "VLAN"
         band = "fiveg"
         vlan = 100
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -435,6 +443,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa_wpa2_personal_mixed
     @pytest.mark.twog
     @allure.story('wpa wpa2 personal mixed 2.4 GHZ Band')
@@ -453,6 +462,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
         mode = "VLAN"
         band = "twog"
         vlan = 100
+        get_vif_state.append(ssid_name)
         if ssid_name 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")
@@ -472,6 +482,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
                                               passes))
         assert result
 
+    @pytest.mark.uc_sanity
     @pytest.mark.wpa_wpa2_personal_mixed
     @pytest.mark.fiveg
     @allure.story('wpa wpa2 personal mixed 5 GHZ Band')
@@ -488,6 +499,7 @@ class TestvlanModeConnectivitySuiteTwo(object):
         mode = "VLAN"
         band = "fiveg"
         vlan = 100
+        get_vif_state.append(ssid_name)
         if ssid_name 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")