From 2e53c5bed220e3962234ff1d7d19cc1d243ceeb7 Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Sat, 29 May 2021 01:35:52 +0530 Subject: [PATCH] README Changes and some test case changes Signed-off-by: shivamcandela --- README.md | 8 + libs/controller/controller.py | 5 +- tests/configuration.py | 118 ++-------- tests/controller_tests/test_api_customer.py | 0 tests/controller_tests/test_api_equipment.py | 0 .../test_api_equipment_gateway.py | 0 .../test_api_firmware_management.py | 0 tests/controller_tests/test_api_location.py | 0 tests/controller_tests/test_api_profile.py | 0 tests/controller_tests/test_cloud_firmware.py | 0 tests/controller_tests/test_cloud_profiles.py | 75 ------- tests/e2e/basic/README.md | 211 ++++++++++++------ ...enterprise_security_modes_configuration.py | 2 + ...st_general_security_modes_configuration.py | 22 +- ...enterprise_security_modes_configuration.py | 44 ++-- ...st_general_security_modes_configuration.py | 86 +++---- ...enterprise_security_modes_configuration.py | 44 ++-- ...st_general_security_modes_configuration.py | 64 +++--- .../test_enterprise_tls.py | 3 +- .../test_enterprise_ttls.py | 128 +++++------ .../test_general_security_modes.py | 2 +- .../test_enterprise_tls.py | 2 +- .../test_enterprise_ttls.py | 128 +++++------ .../test_general_security_modes.py | 2 +- .../test_enterprise_tls.py | 2 +- .../test_enterprise_ttls.py | 128 +++++------ .../test_general_security_modes.py | 2 +- .../vlan_mode/default_vlan_tests/__init__.py | 0 28 files changed, 498 insertions(+), 578 deletions(-) delete mode 100644 tests/controller_tests/test_api_customer.py delete mode 100644 tests/controller_tests/test_api_equipment.py delete mode 100644 tests/controller_tests/test_api_equipment_gateway.py delete mode 100644 tests/controller_tests/test_api_firmware_management.py delete mode 100644 tests/controller_tests/test_api_location.py delete mode 100644 tests/controller_tests/test_api_profile.py delete mode 100644 tests/controller_tests/test_cloud_firmware.py delete mode 100644 tests/controller_tests/test_cloud_profiles.py delete mode 100644 tests/e2e/basic/validation_of_operating_modes/vlan_mode/default_vlan_tests/__init__.py diff --git a/README.md b/README.md index 47076c543..57b3401f8 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,15 @@ pip3 install pytest==6.2.2 pip3 install bs4 pip3 install paramiko pip3 install xlsxwriter +pip3 install influxdb_client +pip3 install allure-pytest + + + + ``` +Note: Add the pip3 module if any module not found error hits + #### Step 3 Please ensure you follow the steps outlined in [here](./libs/controller/README.md) diff --git a/libs/controller/controller.py b/libs/controller/controller.py index 3cc46f081..6d18a13a3 100644 --- a/libs/controller/controller.py +++ b/libs/controller/controller.py @@ -1010,6 +1010,7 @@ class FirmwareUtility: return firmware_version +# This is for Unit tests on Controller Library if __name__ == '__main__': controller = { 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller @@ -1030,10 +1031,6 @@ if __name__ == '__main__': # "vlan": 1, # "mode": "BRIDGE" # } - fw_obj = FirmwareUtility(sdk_client=api, model="ecw5410", - version_url="https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.0.4-rc4.tar.gz") - fw_obj.upload_fw_on_cloud(force_upload=True) - fw_obj.upgrade_fw(equipment_id=7) # profile.create_wep_ssid_profile(profile_data=profile_data) # print(profile.get_profile_by_name(profile_name="wpa_wpa2_eap")) # profile.get_default_profiles() diff --git a/tests/configuration.py b/tests/configuration.py index b8e70b010..3a1ca3b99 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -1,61 +1,30 @@ -""" -ec420 basic-03 -ecw5410 basic-01 -ecw5211 not available in basic -wf188n basic-05 -eap102 basic-06 -eap101 basic-02 -wf194c baisc-08-02 - -ssh -C -L 8800:lf1:4002 -L 8801:lf1:5901 -L 8802:lf1:8080 -L 8803:lab-ctlr:22 \ # basic-01 --L 8720:lf2:4002 -L 8721:lf2:5901 -L 8722:lf2:8080 -L 8723:lab-ctlr:22 \ # basic-02 --L 8830:lf3:4002 -L 8831:lf3:5901 -L 8832:lf3:8080 -L 8833:lab-ctlr:22 \ # basic-03 --L 8810:lf4:4002 -L 8811:lf4:5901 -L 8812:lf4:8080 -L 8813:lab-ctlr:22 \ # basic-04 --L 8850:lf12:4002 -L 8851:lf12:5901 -L 8852:lf12:8080 -L 8853:lab-ctlr4:22 \ # basic-05 --L 8860:lf13:4002 -L 8861:lf13:5901 -L 8862:lf13:8080 -L 8863:lab-ctlr4:22 \ # basic-06 --L 8870:lf14:4002 -L 8871:lf14:5901 -L 8872:lf14:8080 -L 8873:lab-ctlr4:22 \ # basic-07 --L 8880:lf15:4002 -L 8881:lf15:5901 -L 8882:lf15:8080 -L 8883:lab-ctlr4:22 \ # basic-08 -ubuntu@3.130.51.163 - - - -ssh -C -L 8800:lf1:4002 -L 8801:lf1:5901 -L 8802:lf1:8080 -L 8803:lab-ctlr:22 \ --L 8720:lf2:4002 -L 8721:lf2:5901 -L 8722:lf2:8080 -L 8723:lab-ctlr:22 \ --L 8830:lf3:4002 -L 8831:lf3:5901 -L 8832:lf3:8080 -L 8833:lab-ctlr:22 \ --L 8810:lf4:4002 -L 8811:lf4:5901 -L 8812:lf4:8080 -L 8813:lab-ctlr:22 \ --L 8850:lf12:4002 -L 8851:lf12:5901 -L 8852:lf12:8080 -L 8853:lab-ctlr4:22 \ --L 8860:lf13:4002 -L 8861:lf13:5901 -L 8862:lf13:8080 -L 8863:lab-ctlr4:22 \ --L 8870:lf14:4002 -L 8871:lf14:5901 -L 8872:lf14:8080 -L 8873:lab-ctlr4:22 \ --L 8880:lf15:4002 -L 8881:lf15:5901 -L 8882:lf15:8080 -L 8883:lab-ctlr4:22 \ -ubuntu@orch - -""" - CONFIGURATION = { - "basic-01": { + "basic-lab": { "controller": { 'url': "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', - 'password': 'support', - 'version': '1.1.0-SNAPSHOT', - 'commit_date': "2021-04-27" + 'username': 'support@example.com', # cloud controller Login + 'password': 'support', # Cloud Controller Login Password + 'version': '1.1.0-SNAPSHOT', # Controller version + 'commit_date': "2021-04-27" # Controller version sdk, commit date }, 'access_point': [ { - 'model': 'ecw5410', - 'mode': 'wifi5', - 'serial': '3c2c99f44e77', - 'jumphost': True, - 'ip': "localhost", # localhost - 'username': "lanforge", - 'password': "pumpkin77", - 'port': 8803, # 22, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.0.0-rc2.tar.gz" + 'model': 'ecw5410', # AP Model, can be found in ap console using "node" command + 'mode': 'wifi5', # wifi5/wifi6 can be found on AP Hardware page on Confluence + 'serial': '3c2c99f44e77', # "node" command has serial_number information + 'jumphost': True, # True, if you have AP On serial console and not ssh access, False, if you have AP ssh access from the machine + 'ip': "localhost", # IP Address of System, which has AP Connected to serial cable (if jumphost is True), else - AP IP Address + 'username': "lanforge", # ssh username of system (lab-ctlr/ap) + 'password': "pumpkin77", # ssh password for system (lab-ctlr/ap) + 'port': 8803, # 22, # ssh port for system (lab-ctlr/ap) + 'jumphost_tty': '/dev/ttyAP1', # if jumphost is True, enter the serial console device name + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.0.0-rc2.tar.gz" # Enter the Target AP Version URL for Testing } ], + # Traffic generator "traffic_generator": { - "name": "lanforge", + "name": "lanforge", #( lanforge/ perfecto) + # Details for LANforge system "details": { "ip": "localhost", # localhost, "port": 8802, # 8802, @@ -70,60 +39,9 @@ CONFIGURATION = { "AX-Station-Name": "ax" } } - }, # checked - "basic-ext-04-01": { - "controller": { - 'url': "http://wlan-portal-svc-digicert.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', - 'password': 'support', - 'version': "1.1.0-SNAPSHOT", - 'commit_date': "2021-04-27" - }, - 'access_point': [ - { - 'model': 'ecw5410', - 'mode': "wifi5", - 'serial': '903cb3944857', - 'jumphost': True, - 'ip': "192.168.200.80", - 'username': "lanforge", - 'password': "lanforge", - 'port': 22, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.0.4-rc4.tar.gz" - } - ], - "traffic_generator": { - "name": "lanforge", - "details": { - "ip": "192.168.200.80", - "port": 8080, - "2.4G-Radio": ["wiphy0"], - "5G-Radio": ["wiphy1"], - "AX-Radio": ["wiphy2"], - "upstream": "1.1.eth1", - "upstream_subnet": "192.168.200.0/24", - "uplink" : "1.1.eth2", - "2.4G-Station-Name": "wlan0", - "5G-Station-Name": "wlan0", - "AX-Station-Name": "ax", - } - } } } -FIRMWARE = { - # jFrog parameters - "JFROG": - { - "jfrog-base-url": "https://tip.jFrog.io/artifactory/tip-wlan-ap-firmware", - "build": "pending", - "branch": "trunk" - } - - - -} RADIUS_SERVER_DATA = { "ip": "10.10.10.72", diff --git a/tests/controller_tests/test_api_customer.py b/tests/controller_tests/test_api_customer.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/controller_tests/test_api_equipment.py b/tests/controller_tests/test_api_equipment.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/controller_tests/test_api_equipment_gateway.py b/tests/controller_tests/test_api_equipment_gateway.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/controller_tests/test_api_firmware_management.py b/tests/controller_tests/test_api_firmware_management.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/controller_tests/test_api_location.py b/tests/controller_tests/test_api_location.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/controller_tests/test_api_profile.py b/tests/controller_tests/test_api_profile.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/controller_tests/test_cloud_firmware.py b/tests/controller_tests/test_cloud_firmware.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/controller_tests/test_cloud_profiles.py b/tests/controller_tests/test_cloud_profiles.py deleted file mode 100644 index ca498f4a5..000000000 --- a/tests/controller_tests/test_cloud_profiles.py +++ /dev/null @@ -1,75 +0,0 @@ -import pytest - - -@pytest.mark.rf -class TestRFProfiles: - - def test_rf_profile(self): - assert True - - -@pytest.mark.radius -class TestRadiusProfile: - - def test_radius_profile(self): - assert True - - -@pytest.mark.ssid -class TestSSIDProfile: - - @pytest.mark.open - @pytest.mark.twog - def test_open_ssid_2g(self): - assert True - - @pytest.mark.open - @pytest.mark.fiveg - def test_open_ssid_5g(self): - assert True - - @pytest.mark.wpa - @pytest.mark.twog - def test_wpa_ssid_2g(self): - assert True - - @pytest.mark.wpa - @pytest.mark.fiveg - def test_wpa_ssid_5g(self): - assert True - - @pytest.mark.wpa2_personal - @pytest.mark.twog - def test_wpa2_personal_ssid_2g(self): - assert True - - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - def test_wpa2_personal_ssid_5g(self): - assert True - - @pytest.mark.wpa2_enterprise - @pytest.mark.twog - def test_wpa2_enterprise_ssid_2g(self): - assert True - - @pytest.mark.wpa2_enterprise - @pytest.mark.fiveg - def test_wpa2_enterprise_ssid_5g(self): - assert True - - -@pytest.mark.equipment_ap_profile -class TestEquipmentAPProfile: - - @pytest.mark.bridge - def test_equipment_ap_profile_bridge(self): - assert True - - @pytest.mark.nat - def test_equipment_ap_profile_nat(self): - assert True - - @pytest.mark.vlan - def test_equipment_ap_profile_vlan(self): - assert True diff --git a/tests/e2e/basic/README.md b/tests/e2e/basic/README.md index 0209a09a9..e041b4910 100644 --- a/tests/e2e/basic/README.md +++ b/tests/e2e/basic/README.md @@ -21,114 +21,177 @@ Test cases can be bunched on a 1. class level (have a module/ test_xx.py , have one or more classes, do setup once for each class) 2. function level (have a module/ test_xx.py , have one or more functions, do setup once for each function) + +# Use the below sample template for starting to write test cases in basic ### SAMPLE Test Case Example: test_featureA_bridge.py ```python import pytest -pytestmark = [pytest.mark.test_featureA, pytest.mark.bridge] +import allure + +# Module level Marking +pytestmark = [pytest.mark.usefixtures("setup_test_run"), pytest.mark.featureA] + +# It is compulsory to put pytest.mark.usefixtures("setup_test_run") in module level marking + +profile_config = { + "mode": "NAT", # Mode of config ("BRIDGE"/"NAT"/"VLAN") + + # SSID modes and its Config: Enter the json data structure in the below format for test cases + "ssid_modes": { + # Enter the ssid modes: + # (open/wpa/wpa2_personal/wpa3_personal/wpa3_personal_mixed/wpa_wpa2_personal_mixed/ + # wpa_enterprise/wpa2_enterprise/wpa3_enterprise/wpa_wpa2_enterprise_mixed/wpa3_enterprise_mixed + # /wep) + # Each security type can have multiple ssid config placed in a list and is customizable + "wpa": [ + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"], "vlan": 1 }, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] + }, + # rf config data that is need to be pushed, + # Leave Blank for default (default config is taken from configuration.py for the selected testbed and AP Model) + "rf": {}, + # True if you want to create a Radius Profile(Radius config by default is taken from configuration.py) + "radius": True +} -@pytest.mark.test_featureA -@pytest.mark.wifi5 -@pytest.mark.wifi6 +# Class level Marking +@pytest.mark.suite_a @pytest.mark.parametrize( - 'setup_profiles, create_profiles', - [(["BRIDGE"], ["BRIDGE"])], + 'setup_profiles', # Name of the fixture + [profile_config], # Passing the above static profile_config data for setup for tests in this class indirect=True, - scope="class" + scope="class" # Scope of the fixture (Its experimental for current framework (keep it "class" for default scenario)) ) @pytest.mark.usefixtures("setup_profiles") -@pytest.mark.usefixtures("create_profiles") class TestFeatureABridge(object): - @pytest.mark.wpa - @pytest.mark.twog - def test_client_wpa_2g(self, get_lanforge_data, setup_profile_data): - profile_data = setup_profile_data["BRIDGE"]["WPA"]["2G"] - lanforge_ip = get_lanforge_data["lanforge_ip"] - lanforge_port = int(get_lanforge_data["lanforge-port-number"]) - ssid = profile_data["ssid_name"] + @pytest.mark.wpa # Marker for the wifi encryption needed - Compulsory + @pytest.mark.twog # Marker for band (twog/fiveg) - Compulsory + def test_client_wpa_2g(self): + profile_data = profile_config["ssid_modes"]["wpa"][0] + ssid_name = profile_data["ssid_name"] security_key = profile_data["security_key"] security = "wpa" - upstream = get_lanforge_data["lanforge_bridge_port"] - radio = get_lanforge_data["lanforge_2dot4g"] + mode = "BRIDGE" + band = "twog" # refer to appliedRadios in ssid_modes config (twog/fiveg) + # vlan = 1 # 1 for "BRIDGE"/"NAT" # Can be customised in the ssid config json + # Write Your test case Here - PASS = True - assert PASS + # Some Recommendations: + # If your test case has components that are to be used by other test case, + # then make it library and call its instance from fixture. + # If your test case has some reports, then attach it as an allure report + + allure.attach(name="Test case report", body="Test case result description") # Check its usages for more detail + + PASS_FAIL_CONDITION = True + assert PASS_FAIL_CONDITION @pytest.mark.wpa @pytest.mark.fiveg - def test_client_wpa_5g(self, get_lanforge_data, setup_profile_data): - profile_data = setup_profile_data["BRIDGE"]["WPA"]["5G"] - lanforge_ip = get_lanforge_data["lanforge_ip"] - lanforge_port = int(get_lanforge_data["lanforge-port-number"]) - ssid = profile_data["ssid_name"] + def test_client_wpa_5g(self): + profile_data = profile_config["ssid_modes"]["wpa"][1] + ssid_name = profile_data["ssid_name"] security_key = profile_data["security_key"] security = "wpa" - upstream = get_lanforge_data["lanforge_bridge_port"] - radio = get_lanforge_data["lanforge_5g"] + mode = "BRIDGE" + band = "fiveg" # refer to appliedRadios in ssid_modes config (twog/fiveg) + vlan = 1 # 1 for "BRIDGE"/"NAT" # Can be customised in the ssid config json + # Write Your test case Here - PASS = True - assert PASS - - - @pytest.mark.wpa2_personal - @pytest.mark.twog - def test_client_wpa2_personal_2g(self, get_lanforge_data, setup_profile_data): - profile_data = setup_profile_data["BRIDGE"]["WPA2_P"]["2G"] - lanforge_ip = get_lanforge_data["lanforge_ip"] - lanforge_port = int(get_lanforge_data["lanforge-port-number"]) - ssid = profile_data["ssid_name"] + # Some Recommendations: + # If your test case has components that are to be used by other test case, + # then make it library and call its instance from fixture. + # If your test case has some reports, then attach it as an allure report + + allure.attach(name="Test case report", body="Test case result description") # Check its usages for more detail + + PASS_FAIL_CONDITION = True + assert PASS_FAIL_CONDITION + + @pytest.mark.wpa2_personal # Marker for the wifi encryption needed - Compulsory + @pytest.mark.twog # Marker for band (twog/fiveg) - Compulsory + def test_client_wpa2_personal_2g(self): + profile_data = profile_config["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] security_key = profile_data["security_key"] security = "wpa2" - upstream = get_lanforge_data["lanforge_bridge_port"] - radio = get_lanforge_data["lanforge_2dot4g"] + mode = "BRIDGE" + band = "twog" # refer to appliedRadios in ssid_modes config (twog/fiveg) + # vlan = 1 # 1 for "BRIDGE"/"NAT" # Can be customised in the ssid config json + # Write Your test case Here - PASS = True - assert PASS + # Some Recommendations: + # If your test case has components that are to be used by other test case, + # then make it library and call its instance from fixture. + # If your test case has some reports, then attach it as an allure report + + allure.attach(name="Test case report", body="Test case result description") # Check its usages for more detail + + PASS_FAIL_CONDITION = True + assert PASS_FAIL_CONDITION @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_client_wpa2_personal_5g(self, get_lanforge_data, setup_profile_data): - profile_data = setup_profile_data["BRIDGE"]["WPA2_P"]["5G"] - lanforge_ip = get_lanforge_data["lanforge_ip"] - lanforge_port = int(get_lanforge_data["lanforge-port-number"]) - ssid = profile_data["ssid_name"] + def test_client_wpa2_personal_5g(self): + profile_data = profile_config["ssid_modes"]["wpa2_personal"][1] + ssid_name = profile_data["ssid_name"] security_key = profile_data["security_key"] security = "wpa2" - upstream = get_lanforge_data["lanforge_bridge_port"] - radio = get_lanforge_data["lanforge_5g"] + mode = "BRIDGE" + band = "fiveg" # refer to appliedRadios in ssid_modes config (twog/fiveg) + vlan = 1 # 1 for "BRIDGE"/"NAT" # Can be customised in the ssid config json + # Write Your test case Here - PASS = True - assert PASS + # Some Recommendations: + # If your test case has components that are to be used by other test case, + # then make it library and call its instance from fixture. + # If your test case has some reports, then attach it as an allure report + + allure.attach(name="Test case report", body="Test case result description") # Check its usages for more detail + + PASS_FAIL_CONDITION = True + assert PASS_FAIL_CONDITION + + + + + +``` +##General Guardrails: +``` +setup_profile is a Fixture that collects markers +from the test case to decide which security modes and band is need to be applied on the Access Point + +Test cases can be selected based upon the markers + +# This selection will push all the config for the above scenario, considering that you have specified all required markers +pytest -m featureA + +# This selection will select only wpa test cases and will push the config for wpa mode only because wpa2_personal marker is not selected +pytest -m "featureA and wpa" + +Conclusion: Security modes for SSID has some specific markers which are specified as follows + +open/wpa/wpa2_personal/wpa3_personal/wpa3_personal_mixed/wpa_wpa2_personal_mixed +wpa_enterprise/wpa2_enterprise/wpa3_enterprise/wpa_wpa2_enterprise_mixed/wpa3_enterprise_mixed/wep + +and for band, its (twog/fiveg) + +if you don't specifi the marker, then no matter what profile_config you are passing to setup_profile fixture, +it will not be pushed + +Refer other test cases for more reference ``` - -### Follow the e2e/basic/client_connectivity_test, for more understanding - -## NOTE: -1. Marking the test case is important, setup will take the markers associated with it, and decide the configuration -2. PARAMETRIZATION: -```python -import pytest - -@pytest.mark.parametrize( - 'setup_profiles, create_profiles', - [(["BRIDGE"], ["BRIDGE"])], - indirect=True, - scope="class" -) -@pytest.mark.usefixtures("setup_profiles") -@pytest.mark.usefixtures("create_profiles") -class TestSomething(object): - ... -``` -### Passing the parameters to the "setup_profiles" and "create_profiles" will setup in each of the asked modes -### For setup to be done in BRIDGE mode, see the above example -### setup can be done on different scope levels, mentioned below -####[scope="class", scope="function"] \ No newline at end of file +## If you have special Config requirements for test case, then reach out to Shivam Thakur on Slack, or email (shivam.thakur@candelatech.com) \ No newline at end of file diff --git a/tests/e2e/basic/configuration_tests/bridge_mode/test_enterprise_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/bridge_mode/test_enterprise_security_modes_configuration.py index 0b1fe8672..5f091ae02 100644 --- a/tests/e2e/basic/configuration_tests/bridge_mode/test_enterprise_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/bridge_mode/test_enterprise_security_modes_configuration.py @@ -1,6 +1,8 @@ import pytest import allure +pytestmark = [pytest.mark.setup, pytest.mark.bridge, pytest.mark.sanity, pytest.mark.enterprise, pytest.mark.usefixtures("setup_test_run")] + setup_params_enterprise = { "mode": "BRIDGE", "ssid_modes": { diff --git a/tests/e2e/basic/configuration_tests/bridge_mode/test_general_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/bridge_mode/test_general_security_modes_configuration.py index 80edfd5df..131a174fc 100644 --- a/tests/e2e/basic/configuration_tests/bridge_mode/test_general_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/bridge_mode/test_general_security_modes_configuration.py @@ -2,7 +2,7 @@ import allure import pytest import time -pytestmark = [pytest.mark.setup, pytest.mark.bridge, pytest.mark.sanity] +pytestmark = [pytest.mark.setup, pytest.mark.bridge, pytest.mark.sanity, pytest.mark.general, pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "BRIDGE", @@ -36,12 +36,12 @@ class TestSetupBridge(object): @pytest.mark.twog def test_setup_open_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['open_2g']: - update_report.update_testrail(case_id=test_cases["open_2g"], + update_report.update_testrail(case_id=test_cases["open_2g_bridge"], status_id=1, msg='profile created successfully') assert setup_profiles['open_2g'] else: - update_report.update_testrail(case_id=test_cases["open_2g"], + update_report.update_testrail(case_id=test_cases["open_2g_bridge"], status_id=5, msg='Failed to create profile') assert False @@ -51,12 +51,12 @@ class TestSetupBridge(object): def test_setup_open_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['open_5g']: - update_report.update_testrail(case_id=test_cases["open_5g"], + update_report.update_testrail(case_id=test_cases["open_5g_bridge"], status_id=1, msg='profile created successfully') assert setup_profiles['open_5g'] else: - update_report.update_testrail(case_id=test_cases["open_5g"], + update_report.update_testrail(case_id=test_cases["open_5g_bridge"], status_id=5, msg='Failed to create profile') assert False @@ -65,12 +65,12 @@ class TestSetupBridge(object): @pytest.mark.twog def test_setup_wpa_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_2g']: - update_report.update_testrail(case_id=test_cases["wpa_2g"], + update_report.update_testrail(case_id=test_cases["wpa_2g_bridge"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa_2g"], + update_report.update_testrail(case_id=test_cases["wpa_2g_bridge"], status_id=5, msg='Failed to create profile') assert False @@ -96,12 +96,12 @@ class TestSetupBridge(object): test_cases): if setup_profiles['wpa2_personal_2g']: - update_report.update_testrail(case_id=test_cases["wpa2_personal_2g"], + update_report.update_testrail(case_id=test_cases["wpa2_personal_2g_bridge"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_personal_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa2_personal_2g"], + update_report.update_testrail(case_id=test_cases["wpa2_personal_2g_bridge"], status_id=5, msg='Failed to create profile') assert False @@ -112,12 +112,12 @@ class TestSetupBridge(object): test_cases): if setup_profiles['wpa2_personal_5g']: - update_report.update_testrail(case_id=test_cases["wpa2_personal_5g"], + update_report.update_testrail(case_id=test_cases["wpa2_personal_5g_bridge"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_personal_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa2_personal_5g"], + update_report.update_testrail(case_id=test_cases["wpa2_personal_5g_bridge"], status_id=5, msg='Failed to create profile') assert False diff --git a/tests/e2e/basic/configuration_tests/nat_mode/test_enterprise_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/nat_mode/test_enterprise_security_modes_configuration.py index 1102e9710..a7bb573ab 100644 --- a/tests/e2e/basic/configuration_tests/nat_mode/test_enterprise_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/nat_mode/test_enterprise_security_modes_configuration.py @@ -1,8 +1,10 @@ import pytest import allure +pytestmark = [pytest.mark.setup, pytest.mark.nat, pytest.mark.sanity, pytest.mark.enterprise, pytest.mark.usefixtures("setup_test_run")] + setup_params_enterprise = { - "mode": "BRIDGE", + "mode": "NAT", "ssid_modes": { "wpa_enterprise": [ {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, @@ -20,7 +22,7 @@ setup_params_enterprise = { @pytest.mark.enterprise -@allure.feature("BRIDGE MODE ENTERPRISE SETUP") +@allure.feature("NAT MODE ENTERPRISE SETUP") @pytest.mark.parametrize( 'setup_profiles', [setup_params_enterprise], @@ -28,18 +30,18 @@ setup_params_enterprise = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestSetupBridgeEnterprise(object): +class TestSetupNATEnterprise(object): @pytest.mark.wpa_enterprise @pytest.mark.twog def test_setup_wpa_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_enterprise_2g']: - update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_enterprise_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -49,12 +51,12 @@ class TestSetupBridgeEnterprise(object): def test_setup_wpa_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_enterprise_5g']: - update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_enterprise_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -63,12 +65,12 @@ class TestSetupBridgeEnterprise(object): @pytest.mark.twog def test_setup_wpa2_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa2_enterprise_2g']: - update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_enterprise_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -78,12 +80,12 @@ class TestSetupBridgeEnterprise(object): def test_setup_wpa2_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa2_enterprise_5g']: - update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_enterprise_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -94,12 +96,12 @@ class TestSetupBridgeEnterprise(object): test_cases): if setup_profiles['wpa3_enterprise_2g']: - update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa3_enterprise_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -110,12 +112,12 @@ class TestSetupBridgeEnterprise(object): test_cases): if setup_profiles['wpa3_enterprise_5g']: - update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa3_enterprise_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -124,12 +126,12 @@ class TestSetupBridgeEnterprise(object): test_cases): if setup_profiles['equipment_ap']: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['equipment_ap'] else: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_nat"], status_id=5, msg='Failed to create profile') assert False @@ -138,12 +140,12 @@ class TestSetupBridgeEnterprise(object): test_cases): if setup_profiles['vifc']: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["nat_vifc"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifc'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["nat_vifc"], status_id=5, msg='Failed to push profile') assert False @@ -151,12 +153,12 @@ class TestSetupBridgeEnterprise(object): def test_verify_vif_state(self, setup_profiles, update_report, test_cases): if setup_profiles['vifs']: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["nat_vifs"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifs'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["nat_vifs"], status_id=5, msg='Failed to push profile') assert False diff --git a/tests/e2e/basic/configuration_tests/nat_mode/test_general_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/nat_mode/test_general_security_modes_configuration.py index 80edfd5df..a633d0439 100644 --- a/tests/e2e/basic/configuration_tests/nat_mode/test_general_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/nat_mode/test_general_security_modes_configuration.py @@ -2,10 +2,10 @@ import allure import pytest import time -pytestmark = [pytest.mark.setup, pytest.mark.bridge, pytest.mark.sanity] +pytestmark = [pytest.mark.setup, pytest.mark.nat, pytest.mark.sanity, pytest.mark.general, pytest.mark.usefixtures("setup_test_run")] setup_params_general = { - "mode": "BRIDGE", + "mode": "NAT", "ssid_modes": { "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], @@ -22,7 +22,7 @@ setup_params_general = { @pytest.mark.basic -@allure.feature("BRIDGE MODE SETUP") +@allure.feature("NAT MODE SETUP") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -30,18 +30,18 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestSetupBridge(object): +class TestSetupNAT(object): @pytest.mark.open @pytest.mark.twog def test_setup_open_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['open_2g']: - update_report.update_testrail(case_id=test_cases["open_2g"], + update_report.update_testrail(case_id=test_cases["open_2g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['open_2g'] else: - update_report.update_testrail(case_id=test_cases["open_2g"], + update_report.update_testrail(case_id=test_cases["open_2g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -51,12 +51,12 @@ class TestSetupBridge(object): def test_setup_open_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['open_5g']: - update_report.update_testrail(case_id=test_cases["open_5g"], + update_report.update_testrail(case_id=test_cases["open_5g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['open_5g'] else: - update_report.update_testrail(case_id=test_cases["open_5g"], + update_report.update_testrail(case_id=test_cases["open_5g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -65,12 +65,12 @@ class TestSetupBridge(object): @pytest.mark.twog def test_setup_wpa_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_2g']: - update_report.update_testrail(case_id=test_cases["wpa_2g"], + update_report.update_testrail(case_id=test_cases["wpa_2g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa_2g"], + update_report.update_testrail(case_id=test_cases["wpa_2g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -80,12 +80,12 @@ class TestSetupBridge(object): def test_setup_wpa_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_5g']: - update_report.update_testrail(case_id=test_cases["wpa_5g"], + update_report.update_testrail(case_id=test_cases["wpa_5g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa_5g"], + update_report.update_testrail(case_id=test_cases["wpa_5g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -96,12 +96,12 @@ class TestSetupBridge(object): test_cases): if setup_profiles['wpa2_personal_2g']: - update_report.update_testrail(case_id=test_cases["wpa2_personal_2g"], + update_report.update_testrail(case_id=test_cases["wpa2_personal_2g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_personal_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa2_personal_2g"], + update_report.update_testrail(case_id=test_cases["wpa2_personal_2g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -112,12 +112,12 @@ class TestSetupBridge(object): test_cases): if setup_profiles['wpa2_personal_5g']: - update_report.update_testrail(case_id=test_cases["wpa2_personal_5g"], + update_report.update_testrail(case_id=test_cases["wpa2_personal_5g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_personal_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa2_personal_5g"], + update_report.update_testrail(case_id=test_cases["wpa2_personal_5g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -126,12 +126,12 @@ class TestSetupBridge(object): test_cases): if setup_profiles['equipment_ap']: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['equipment_ap'] else: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_nat"], status_id=5, msg='Failed to create profile') assert False @@ -140,12 +140,12 @@ class TestSetupBridge(object): test_cases): if setup_profiles['vifc']: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["nat_vifc"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifc'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["nat_vifc"], status_id=5, msg='Failed to push profile') assert False @@ -153,19 +153,19 @@ class TestSetupBridge(object): def test_verify_vif_state(self, setup_profiles, update_report, test_cases): if setup_profiles['vifs']: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["nat_vifs"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifs'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["nat_vifs"], status_id=5, msg='Failed to push profile') assert False setup_params_general_two = { - "mode": "BRIDGE", + "mode": "NAT", "ssid_modes": { "wpa3_personal": [ {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, @@ -185,7 +185,7 @@ setup_params_general_two = { } -@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") +@allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general_two], @@ -193,18 +193,18 @@ setup_params_general_two = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestBridgeModeConnectivitySuiteTwo(object): +class TestNATModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal @pytest.mark.twog def test_setup_wpa3_personal_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['open_2g']: - update_report.update_testrail(case_id=test_cases["wpa3_personal_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_2g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['open_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_personal_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_2g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -214,12 +214,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): def test_setup_wpa3_personal_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['open_5g']: - update_report.update_testrail(case_id=test_cases["wpa3_personal_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_5g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['open_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_personal_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_5g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -228,12 +228,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.twog def test_setup_wpa3_personal_mixed_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_2g']: - update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_2g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_2g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -243,12 +243,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): def test_setup_wpa3_personal_mixed_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_5g']: - update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_5g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_5g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -259,12 +259,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): test_cases): if setup_profiles['wpa2_personal_2g']: - update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_2g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_personal_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_2g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -275,12 +275,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): test_cases): if setup_profiles['wpa2_personal_5g']: - update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_5g_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_personal_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_5g_nat"], status_id=5, msg='Failed to create profile') assert False @@ -289,12 +289,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): test_cases): if setup_profiles['equipment_ap']: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_nat"], status_id=1, msg='profile created successfully') assert setup_profiles['equipment_ap'] else: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_nat"], status_id=5, msg='Failed to create profile') assert False @@ -303,12 +303,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): test_cases): if setup_profiles['vifc']: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["nat_vifc"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifc'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["nat_vifc"], status_id=5, msg='Failed to push profile') assert False @@ -316,12 +316,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): def test_verify_vif_state(self, setup_profiles, update_report, test_cases): if setup_profiles['vifs']: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["nat_vifs"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifs'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["nat_vifs"], status_id=5, msg='Failed to push profile') assert False diff --git a/tests/e2e/basic/configuration_tests/vlan_mode/test_enterprise_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/vlan_mode/test_enterprise_security_modes_configuration.py index 1102e9710..5fa76179c 100644 --- a/tests/e2e/basic/configuration_tests/vlan_mode/test_enterprise_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/vlan_mode/test_enterprise_security_modes_configuration.py @@ -1,8 +1,10 @@ import pytest import allure +pytestmark = [pytest.mark.setup, pytest.mark.vlan, pytest.mark.sanity, pytest.mark.enterprise, pytest.mark.usefixtures("setup_test_run")] + setup_params_enterprise = { - "mode": "BRIDGE", + "mode": "VLAN", "ssid_modes": { "wpa_enterprise": [ {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, @@ -20,7 +22,7 @@ setup_params_enterprise = { @pytest.mark.enterprise -@allure.feature("BRIDGE MODE ENTERPRISE SETUP") +@allure.feature("VLAN MODE ENTERPRISE SETUP") @pytest.mark.parametrize( 'setup_profiles', [setup_params_enterprise], @@ -28,18 +30,18 @@ setup_params_enterprise = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestSetupBridgeEnterprise(object): +class TestSetupvlanEnterprise(object): @pytest.mark.wpa_enterprise @pytest.mark.twog def test_setup_wpa_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_enterprise_2g']: - update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_enterprise_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -49,12 +51,12 @@ class TestSetupBridgeEnterprise(object): def test_setup_wpa_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_enterprise_5g']: - update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_enterprise_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -63,12 +65,12 @@ class TestSetupBridgeEnterprise(object): @pytest.mark.twog def test_setup_wpa2_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa2_enterprise_2g']: - update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_enterprise_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -78,12 +80,12 @@ class TestSetupBridgeEnterprise(object): def test_setup_wpa2_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa2_enterprise_5g']: - update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_enterprise_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -94,12 +96,12 @@ class TestSetupBridgeEnterprise(object): test_cases): if setup_profiles['wpa3_enterprise_2g']: - update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa3_enterprise_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -110,12 +112,12 @@ class TestSetupBridgeEnterprise(object): test_cases): if setup_profiles['wpa3_enterprise_5g']: - update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa3_enterprise_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -124,12 +126,12 @@ class TestSetupBridgeEnterprise(object): test_cases): if setup_profiles['equipment_ap']: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['equipment_ap'] else: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -138,12 +140,12 @@ class TestSetupBridgeEnterprise(object): test_cases): if setup_profiles['vifc']: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["vlan_vifc"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifc'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["vlan_vifc"], status_id=5, msg='Failed to push profile') assert False @@ -151,12 +153,12 @@ class TestSetupBridgeEnterprise(object): def test_verify_vif_state(self, setup_profiles, update_report, test_cases): if setup_profiles['vifs']: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["vlan_vifs"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifs'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["vlan_vifs"], status_id=5, msg='Failed to push profile') assert False diff --git a/tests/e2e/basic/configuration_tests/vlan_mode/test_general_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/vlan_mode/test_general_security_modes_configuration.py index 80edfd5df..88cc3f6b9 100644 --- a/tests/e2e/basic/configuration_tests/vlan_mode/test_general_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/vlan_mode/test_general_security_modes_configuration.py @@ -2,10 +2,12 @@ import allure import pytest import time -pytestmark = [pytest.mark.setup, pytest.mark.bridge, pytest.mark.sanity] +pytestmark = [pytest.mark.setup, pytest.mark.vlan, pytest.mark.sanity, pytest.mark.general, pytest.mark.usefixtures("setup_test_run")] + +pytestmark = [pytest.mark.setup, pytest.mark.vlan, pytest.mark.sanity] setup_params_general = { - "mode": "BRIDGE", + "mode": "VLAN", "ssid_modes": { "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], @@ -22,7 +24,7 @@ setup_params_general = { @pytest.mark.basic -@allure.feature("BRIDGE MODE SETUP") +@allure.feature("VLAN MODE SETUP") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -30,7 +32,7 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestSetupBridge(object): +class TestSetupvlan(object): @pytest.mark.open @pytest.mark.twog @@ -126,12 +128,12 @@ class TestSetupBridge(object): test_cases): if setup_profiles['equipment_ap']: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['equipment_ap'] else: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -140,12 +142,12 @@ class TestSetupBridge(object): test_cases): if setup_profiles['vifc']: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["vlan_vifc"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifc'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["vlan_vifc"], status_id=5, msg='Failed to push profile') assert False @@ -153,19 +155,19 @@ class TestSetupBridge(object): def test_verify_vif_state(self, setup_profiles, update_report, test_cases): if setup_profiles['vifs']: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["vlan_vifs"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifs'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["vlan_vifs"], status_id=5, msg='Failed to push profile') assert False setup_params_general_two = { - "mode": "BRIDGE", + "mode": "VLAN", "ssid_modes": { "wpa3_personal": [ {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, @@ -185,7 +187,7 @@ setup_params_general_two = { } -@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") +@allure.feature("vlan MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general_two], @@ -193,18 +195,18 @@ setup_params_general_two = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestBridgeModeConnectivitySuiteTwo(object): +class TestvlanModeConnectivitySuiteTwo(object): @pytest.mark.wpa3_personal @pytest.mark.twog def test_setup_wpa3_personal_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['open_2g']: - update_report.update_testrail(case_id=test_cases["wpa3_personal_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_2g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['open_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_personal_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_2g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -214,12 +216,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): def test_setup_wpa3_personal_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['open_5g']: - update_report.update_testrail(case_id=test_cases["wpa3_personal_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_5g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['open_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_personal_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_5g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -228,12 +230,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): @pytest.mark.twog def test_setup_wpa3_personal_mixed_2g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_2g']: - update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_2g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_2g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -243,12 +245,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): def test_setup_wpa3_personal_mixed_5g_ssid_profile(self, setup_profiles, update_report, test_cases): if setup_profiles['wpa_5g']: - update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_5g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa3_personal_mixed_5g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -259,12 +261,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): test_cases): if setup_profiles['wpa2_personal_2g']: - update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_2g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_personal_2g'] else: - update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_2g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_2g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -275,12 +277,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): test_cases): if setup_profiles['wpa2_personal_5g']: - update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_5g_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['wpa2_personal_5g'] else: - update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_5g_bridge"], + update_report.update_testrail(case_id=test_cases["wpa_wpa2_personal_mixed_5g_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -289,12 +291,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): test_cases): if setup_profiles['equipment_ap']: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_vlan"], status_id=1, msg='profile created successfully') assert setup_profiles['equipment_ap'] else: - update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], + update_report.update_testrail(case_id=test_cases["equipment_ap_vlan"], status_id=5, msg='Failed to create profile') assert False @@ -303,12 +305,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): test_cases): if setup_profiles['vifc']: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["vlan_vifc"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifc'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifc"], + update_report.update_testrail(case_id=test_cases["vlan_vifc"], status_id=5, msg='Failed to push profile') assert False @@ -316,12 +318,12 @@ class TestBridgeModeConnectivitySuiteTwo(object): def test_verify_vif_state(self, setup_profiles, update_report, test_cases): if setup_profiles['vifs']: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["vlan_vifs"], status_id=1, msg='profile pushed successfully') assert setup_profiles['vifs'] else: - update_report.update_testrail(case_id=test_cases["bridge_vifs"], + update_report.update_testrail(case_id=test_cases["vlan_vifs"], status_id=5, msg='Failed to push profile') assert False diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_tls.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_tls.py index 246a1faa6..87c8716fa 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_tls.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_tls.py @@ -1,7 +1,8 @@ # import allure # import pytest # -# # pytestmark = [pytest.mark.client_connectivity, pytest.mark.bridge, pytest.mark.enterprise, pytest.mark.tls, pytest.mark.sanity] +# # pytestmark = [pytest.mark.client_connectivity, pytest.mark.bridge, pytest.mark.enterprise, pytest.mark.tls, pytest.mark.sanity, +# pytest.mark.usefixtures("setup_test_run")] # # setup_params_enterprise = { # "mode": "BRIDGE", diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py index 6552940f1..7e2872c49 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py @@ -2,7 +2,7 @@ import allure import pytest pytestmark = [pytest.mark.client_connectivity, pytest.mark.bridge, pytest.mark.enterprise, pytest.mark.ttls, - pytest.mark.sanity] + pytest.mark.sanity, pytest.mark.usefixtures("setup_test_run")] setup_params_enterprise = { "mode": "BRIDGE", @@ -161,69 +161,69 @@ class TestBridgeModeEnterpriseTTLSSuiteOne(object): pytest.exit("Test Case Failed") assert passes - # @pytest.mark.wpa3_enterprise - # @pytest.mark.twog - # def test_wpa3_enterprise_2g(self, station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, - # test_cases, radius_info, exit_on_fail): - # profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][0] - # ssid_name = profile_data["ssid_name"] - # security = "wpa3" - # mode = "BRIDGE" - # band = "twog" - # vlan = 1 - # ttls_passwd = radius_info["password"] - # eap = "TTLS" - # identity = radius_info['user'] - # passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, - # mode=mode, band=band, - # eap=eap, ttls_passwd=ttls_passwd, identity=identity, - # station_name=station_names_twog, vlan_id=vlan) - # - # if passes: - # update_report.update_testrail(case_id=test_cases["2g_wpa_bridge"], - # status_id=1, - # msg='2G WPA Client Connectivity Passed successfully - bridge mode' + str( - # passes)) - # else: - # update_report.update_testrail(case_id=test_cases["2g_wpa_bridge"], - # status_id=5, - # msg='2G WPA Client Connectivity Failed - bridge mode' + str( - # passes)) - # if exit_on_fail: - # pytest.exit("Test Case Failed") - # assert passes - # - # @pytest.mark.wpa3_enterprise - # @pytest.mark.fiveg - # def test_wpa3_enterprise_5g(self, station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, - # test_cases, radius_info, exit_on_fail): - # profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][1] - # ssid_name = profile_data["ssid_name"] - # security = "wpa3" - # mode = "BRIDGE" - # band = "fiveg" - # vlan = 1 - # ttls_passwd = radius_info["password"] - # eap = "TTLS" - # identity = radius_info['user'] - # passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, - # mode=mode, band=band, - # eap=eap, ttls_passwd=ttls_passwd, identity=identity, - # station_name=station_names_fiveg, vlan_id=vlan) - # - # if passes: - # update_report.update_testrail(case_id=test_cases["2g_wpa_bridge"], - # status_id=1, - # msg='2G WPA Client Connectivity Passed successfully - bridge mode' + str( - # passes)) - # else: - # update_report.update_testrail(case_id=test_cases["2g_wpa_bridge"], - # status_id=5, - # msg='2G WPA Client Connectivity Failed - bridge mode' + str( - # passes)) - # if exit_on_fail: - # pytest.exit("Test Case Failed") - # assert passes + @pytest.mark.wpa3_enterprise + @pytest.mark.twog + def test_wpa3_enterprise_2g(self, station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + test_cases, radius_info, exit_on_fail): + profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][0] + ssid_name = profile_data["ssid_name"] + security = "wpa3" + mode = "BRIDGE" + band = "twog" + vlan = 1 + ttls_passwd = radius_info["password"] + eap = "TTLS" + identity = radius_info['user'] + passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, + mode=mode, band=band, + eap=eap, ttls_passwd=ttls_passwd, identity=identity, + station_name=station_names_twog, vlan_id=vlan) + + if passes: + update_report.update_testrail(case_id=test_cases["2g_wpa_bridge"], + status_id=1, + msg='2G WPA Client Connectivity Passed successfully - bridge mode' + str( + passes)) + else: + update_report.update_testrail(case_id=test_cases["2g_wpa_bridge"], + status_id=5, + msg='2G WPA Client Connectivity Failed - bridge mode' + str( + passes)) + if exit_on_fail: + pytest.exit("Test Case Failed") + assert passes + + @pytest.mark.wpa3_enterprise + @pytest.mark.fiveg + def test_wpa3_enterprise_5g(self, station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, + test_cases, radius_info, exit_on_fail): + profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][1] + ssid_name = profile_data["ssid_name"] + security = "wpa3" + mode = "BRIDGE" + band = "fiveg" + vlan = 1 + ttls_passwd = radius_info["password"] + eap = "TTLS" + identity = radius_info['user'] + passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, + mode=mode, band=band, + eap=eap, ttls_passwd=ttls_passwd, identity=identity, + station_name=station_names_fiveg, vlan_id=vlan) + + if passes: + update_report.update_testrail(case_id=test_cases["2g_wpa_bridge"], + status_id=1, + msg='2G WPA Client Connectivity Passed successfully - bridge mode' + str( + passes)) + else: + update_report.update_testrail(case_id=test_cases["2g_wpa_bridge"], + status_id=5, + msg='2G WPA Client Connectivity Failed - bridge mode' + str( + passes)) + if exit_on_fail: + pytest.exit("Test Case Failed") + assert passes setup_params_enterprise_two = { diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py index 5c840e1da..79710147b 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py @@ -1,7 +1,7 @@ import allure import pytest -pytestmark = [pytest.mark.client_connectivity, pytest.mark.bridge, pytest.mark.general, pytest.mark.sanity] +pytestmark = [pytest.mark.client_connectivity, pytest.mark.bridge, pytest.mark.general, pytest.mark.sanity, pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "BRIDGE", diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_tls.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_tls.py index 8616d5e37..574e05e18 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_tls.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_tls.py @@ -1,7 +1,7 @@ # import allure # import pytest # -# # pytestmark = [pytest.mark.client_connectivity, pytest.mark.nat, pytest.mark.enterprise, pytest.mark.tls, pytest.mark.sanity] +# # pytestmark = [pytest.mark.client_connectivity, pytest.mark.nat, pytest.mark.enterprise, pytest.mark.tls, pytest.mark.sanity, pytest.mark.usefixtures("setup_test_run")] # # setup_params_enterprise = { # "mode": "NAT", diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py index 3a0bab026..93cbc46d9 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py @@ -1,7 +1,7 @@ import allure import pytest -pytestmark = [pytest.mark.client_connectivity, pytest.mark.nat, pytest.mark.enterprise, pytest.mark.ttls, +pytestmark = [pytest.mark.client_connectivity, pytest.mark.usefixtures("setup_test_run"), pytest.mark.nat, pytest.mark.enterprise, pytest.mark.ttls, pytest.mark.sanity] setup_params_enterprise = { @@ -161,69 +161,69 @@ class TestNATModeEnterpriseTTLSSuiteOne(object): pytest.exit("Test Case Failed") assert passes - # @pytest.mark.wpa3_enterprise - # @pytest.mark.twog - # def test_wpa3_enterprise_2g(self, station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, - # test_cases, radius_info, exit_on_fail): - # profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][0] - # ssid_name = profile_data["ssid_name"] - # security = "wpa3" - # mode = "NAT" - # band = "twog" - # vlan = 1 - # ttls_passwd = radius_info["password"] - # eap = "TTLS" - # identity = radius_info['user'] - # passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, - # mode=mode, band=band, - # eap=eap, ttls_passwd=ttls_passwd, identity=identity, - # station_name=station_names_twog, vlan_id=vlan) - # - # if passes: - # update_report.update_testrail(case_id=test_cases["2g_wpa_nat"], - # status_id=1, - # msg='2G WPA Client Connectivity Passed successfully - NAT mode' + str( - # passes)) - # else: - # update_report.update_testrail(case_id=test_cases["2g_wpa_nat"], - # status_id=5, - # msg='2G WPA Client Connectivity Failed - NAT mode' + str( - # passes)) - # if exit_on_fail: - # pytest.exit("Test Case Failed") - # assert passes - # - # @pytest.mark.wpa3_enterprise - # @pytest.mark.fiveg - # def test_wpa3_enterprise_5g(self, station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, - # test_cases, radius_info, exit_on_fail): - # profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][1] - # ssid_name = profile_data["ssid_name"] - # security = "wpa3" - # mode = "NAT" - # band = "fiveg" - # vlan = 1 - # ttls_passwd = radius_info["password"] - # eap = "TTLS" - # identity = radius_info['user'] - # passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, - # mode=mode, band=band, - # eap=eap, ttls_passwd=ttls_passwd, identity=identity, - # station_name=station_names_fiveg, vlan_id=vlan) - # - # if passes: - # update_report.update_testrail(case_id=test_cases["2g_wpa_nat"], - # status_id=1, - # msg='2G WPA Client Connectivity Passed successfully - NAT mode' + str( - # passes)) - # else: - # update_report.update_testrail(case_id=test_cases["2g_wpa_nat"], - # status_id=5, - # msg='2G WPA Client Connectivity Failed - NAT mode' + str( - # passes)) - # if exit_on_fail: - # pytest.exit("Test Case Failed") - # assert passes + @pytest.mark.wpa3_enterprise + @pytest.mark.twog + def test_wpa3_enterprise_2g(self, station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + test_cases, radius_info, exit_on_fail): + profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][0] + ssid_name = profile_data["ssid_name"] + security = "wpa3" + mode = "NAT" + band = "twog" + vlan = 1 + ttls_passwd = radius_info["password"] + eap = "TTLS" + identity = radius_info['user'] + passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, + mode=mode, band=band, + eap=eap, ttls_passwd=ttls_passwd, identity=identity, + station_name=station_names_twog, vlan_id=vlan) + + if passes: + update_report.update_testrail(case_id=test_cases["2g_wpa_nat"], + status_id=1, + msg='2G WPA Client Connectivity Passed successfully - NAT mode' + str( + passes)) + else: + update_report.update_testrail(case_id=test_cases["2g_wpa_nat"], + status_id=5, + msg='2G WPA Client Connectivity Failed - NAT mode' + str( + passes)) + if exit_on_fail: + pytest.exit("Test Case Failed") + assert passes + + @pytest.mark.wpa3_enterprise + @pytest.mark.fiveg + def test_wpa3_enterprise_5g(self, station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, + test_cases, radius_info, exit_on_fail): + profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][1] + ssid_name = profile_data["ssid_name"] + security = "wpa3" + mode = "NAT" + band = "fiveg" + vlan = 1 + ttls_passwd = radius_info["password"] + eap = "TTLS" + identity = radius_info['user'] + passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, + mode=mode, band=band, + eap=eap, ttls_passwd=ttls_passwd, identity=identity, + station_name=station_names_fiveg, vlan_id=vlan) + + if passes: + update_report.update_testrail(case_id=test_cases["2g_wpa_nat"], + status_id=1, + msg='2G WPA Client Connectivity Passed successfully - NAT mode' + str( + passes)) + else: + update_report.update_testrail(case_id=test_cases["2g_wpa_nat"], + status_id=5, + msg='2G WPA Client Connectivity Failed - NAT mode' + str( + passes)) + if exit_on_fail: + pytest.exit("Test Case Failed") + assert passes setup_params_enterprise_two = { diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py index 883c2007b..ebcab8804 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py @@ -1,7 +1,7 @@ import allure import pytest -pytestmark = [pytest.mark.client_connectivity, pytest.mark.nat, pytest.mark.general, pytest.mark.sanity] +pytestmark = [pytest.mark.client_connectivity, pytest.mark.usefixtures("setup_test_run"), pytest.mark.nat, pytest.mark.general, pytest.mark.sanity] setup_params_general = { "mode": "NAT", diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_tls.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_tls.py index 4b610924b..59246411d 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_tls.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_tls.py @@ -1,7 +1,7 @@ # import allure # import pytest # -# # pytestmark = [pytest.mark.client_connectivity, pytest.mark.vlan, pytest.mark.enterprise, pytest.mark.tls, pytest.mark.sanity] +# # pytestmark = [pytest.mark.client_connectivity, pytest.mark.usefixtures("setup_test_run"), pytest.mark.vlan, pytest.mark.enterprise, pytest.mark.tls, pytest.mark.sanity] # # setup_params_enterprise = { # "mode": "VLAN", diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py index ec8c648f9..fa1a6d6c5 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py @@ -1,7 +1,7 @@ import allure import pytest -pytestmark = [pytest.mark.client_connectivity, pytest.mark.vlan, pytest.mark.enterprise, pytest.mark.ttls, +pytestmark = [pytest.mark.client_connectivity, pytest.mark.usefixtures("setup_test_run"), pytest.mark.vlan, pytest.mark.enterprise, pytest.mark.ttls, pytest.mark.sanity] setup_params_enterprise = { @@ -161,69 +161,69 @@ class TestVLANModeEnterpriseTTLSSuiteOne(object): pytest.exit("Test Case Failed") assert passes - # @pytest.mark.wpa3_enterprise - # @pytest.mark.twog - # def test_wpa3_enterprise_2g(self, station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, - # test_cases, radius_info, exit_on_fail): - # profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][0] - # ssid_name = profile_data["ssid_name"] - # security = "wpa3" - # mode = "VLAN" - # band = "twog" - # vlan = 1 - # ttls_passwd = radius_info["password"] - # eap = "TTLS" - # identity = radius_info['user'] - # passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, - # mode=mode, band=band, - # eap=eap, ttls_passwd=ttls_passwd, identity=identity, - # station_name=station_names_twog, vlan_id=vlan) - # - # if passes: - # update_report.update_testrail(case_id=test_cases["2g_wpa_vlan"], - # status_id=1, - # msg='2G WPA Client Connectivity Passed successfully - VLAN mode' + str( - # passes)) - # else: - # update_report.update_testrail(case_id=test_cases["2g_wpa_vlan"], - # status_id=5, - # msg='2G WPA Client Connectivity Failed - VLAN mode' + str( - # passes)) - # if exit_on_fail: - # pytest.exit("Test Case Failed") - # assert passes - # - # @pytest.mark.wpa3_enterprise - # @pytest.mark.fiveg - # def test_wpa3_enterprise_5g(self, station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, - # test_cases, radius_info, exit_on_fail): - # profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][1] - # ssid_name = profile_data["ssid_name"] - # security = "wpa3" - # mode = "VLAN" - # band = "fiveg" - # vlan = 1 - # ttls_passwd = radius_info["password"] - # eap = "TTLS" - # identity = radius_info['user'] - # passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, - # mode=mode, band=band, - # eap=eap, ttls_passwd=ttls_passwd, identity=identity, - # station_name=station_names_fiveg, vlan_id=vlan) - # - # if passes: - # update_report.update_testrail(case_id=test_cases["2g_wpa_vlan"], - # status_id=1, - # msg='2G WPA Client Connectivity Passed successfully - VLAN mode' + str( - # passes)) - # else: - # update_report.update_testrail(case_id=test_cases["2g_wpa_vlan"], - # status_id=5, - # msg='2G WPA Client Connectivity Failed - VLAN mode' + str( - # passes)) - # if exit_on_fail: - # pytest.exit("Test Case Failed") - # assert passes + @pytest.mark.wpa3_enterprise + @pytest.mark.twog + def test_wpa3_enterprise_2g(self, station_names_twog, setup_profiles, get_lanforge_data, lf_test, update_report, + test_cases, radius_info, exit_on_fail): + profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][0] + ssid_name = profile_data["ssid_name"] + security = "wpa3" + mode = "VLAN" + band = "twog" + vlan = 1 + ttls_passwd = radius_info["password"] + eap = "TTLS" + identity = radius_info['user'] + passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, + mode=mode, band=band, + eap=eap, ttls_passwd=ttls_passwd, identity=identity, + station_name=station_names_twog, vlan_id=vlan) + + if passes: + update_report.update_testrail(case_id=test_cases["2g_wpa_vlan"], + status_id=1, + msg='2G WPA Client Connectivity Passed successfully - VLAN mode' + str( + passes)) + else: + update_report.update_testrail(case_id=test_cases["2g_wpa_vlan"], + status_id=5, + msg='2G WPA Client Connectivity Failed - VLAN mode' + str( + passes)) + if exit_on_fail: + pytest.exit("Test Case Failed") + assert passes + + @pytest.mark.wpa3_enterprise + @pytest.mark.fiveg + def test_wpa3_enterprise_5g(self, station_names_fiveg, setup_profiles, get_lanforge_data, lf_test, update_report, + test_cases, radius_info, exit_on_fail): + profile_data = setup_params_enterprise["ssid_modes"]["wpa3_enterprise"][1] + ssid_name = profile_data["ssid_name"] + security = "wpa3" + mode = "VLAN" + band = "fiveg" + vlan = 1 + ttls_passwd = radius_info["password"] + eap = "TTLS" + identity = radius_info['user'] + passes = lf_test.EAP_Connect(ssid=ssid_name, security=security, + mode=mode, band=band, + eap=eap, ttls_passwd=ttls_passwd, identity=identity, + station_name=station_names_fiveg, vlan_id=vlan) + + if passes: + update_report.update_testrail(case_id=test_cases["2g_wpa_vlan"], + status_id=1, + msg='2G WPA Client Connectivity Passed successfully - VLAN mode' + str( + passes)) + else: + update_report.update_testrail(case_id=test_cases["2g_wpa_vlan"], + status_id=5, + msg='2G WPA Client Connectivity Failed - VLAN mode' + str( + passes)) + if exit_on_fail: + pytest.exit("Test Case Failed") + assert passes setup_params_enterprise_two = { diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py index ab3d500b6..85ae888e3 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py @@ -1,7 +1,7 @@ import allure import pytest -pytestmark = [pytest.mark.client_connectivity, pytest.mark.vlan, pytest.mark.general, pytest.mark.sanity] +pytestmark = [pytest.mark.client_connectivity, pytest.mark.usefixtures("setup_test_run"), pytest.mark.vlan, pytest.mark.general, pytest.mark.sanity] setup_params_general = { "mode": "VLAN", diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/default_vlan_tests/__init__.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/default_vlan_tests/__init__.py deleted file mode 100644 index e69de29bb..000000000