From 7384ae80f2dfb6bf8094b975bbfbf2b1b65ad2c4 Mon Sep 17 00:00:00 2001 From: karthikaeyetea Date: Tue, 28 Jun 2022 18:45:25 +0530 Subject: [PATCH] Resolved merge conflicts Signed-off-by: karthikaeyetea --- .../fiveg/test_dynamic_over_ssid_fiveg_wpa3.py | 2 -- .../wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py | 4 ++++ .../wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py index fc37db55f..41bcb3c4f 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_over_ssid_fiveg_wpa3.py @@ -111,5 +111,3 @@ class TestDynamicVlanOverSsid5GWpa3(object): elif not val: print("Station ip not assigned as per dynamic vlan") assert False - - diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py index 390549e51..816fc415b 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/fiveg/test_dynamic_vlan_fiveg_wpa3.py @@ -331,7 +331,11 @@ class TestDynamicVlan5GWpa3(object): @pytest.mark.wpa2_enterprise @pytest.mark.fiveg @allure.testcase(name="test_dynamic_unsupported_vlan", +<<<<<<< HEAD url="https://telecominfraproject.atlassian.net/browse/WIFI-6102") +======= + url="https://telecominfraproject.atlassian.net/browse/WIFI-5710") +>>>>>>> Created testcases for WAP3_eap security def test_dynamic_unsupported_vlan(self, get_vif_state, lf_tools, create_lanforge_chamberview_dut, lf_test, get_configuration, station_names_fiveg): diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py index 8205840c5..d779cf264 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/dynamic_vlan/wpa3_enterprise/twog/test_dynamic_vlan_twog_wpa3.py @@ -15,7 +15,6 @@ from configuration import DYNAMIC_VLAN_RADIUS_ACCOUNTING_DATA pytestmark = [pytest.mark.ow_regression_lf, pytest.mark.ow_dvlan_tests_lf, pytest.mark.wpa3_enterprise, - pytest.mark.twog] setup_params_general = { "mode": "VLAN", @@ -645,4 +644,3 @@ class TestDynamicVlan2GWpa3(object): assert False lf_tools.admin_up_down([station_list[sta]], option="up") time.sleep(5) -