Merge branch 'master' into feature/wifi-4240--adapt-helm

tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_bridge_mode.py

@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test,
+pytestmark = [pytest.mark.dataplane_throughput_test,
               pytest.mark.bridge]  # , pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_nat_mode.py

@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test,
+pytestmark = [pytest.mark.dataplane_throughput_test,
               pytest.mark.nat]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dataplane_throughput_test/open_security/test_vlan_mode.py

@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.vlan, pytest.mark.dataplane_throughput_test]
+pytestmark = [pytest.mark.vlan, pytest.mark.dataplane_throughput_test]
 
 setup_params_general = {
     "mode": "VLAN",
@@ -30,13 +30,6 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-@pytest.mark.parametrize(
-    'create_vlan',
-    [setup_params_general],
-    indirect=True,
-    scope="class"
-)
-@pytest.mark.usefixtures("create_vlan")
 class TestDataplaneThroughputVLAN(object):
     """Dataplane THroughput VLAN Mode
        pytest -m "dataplane_throughput_test and open and VLAN"

tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_bridge_mode.py

@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test,
+pytestmark = [pytest.mark.dataplane_throughput_test,
               pytest.mark.bridge]  # , pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_nat_mode.py

@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.nat]
+pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.nat]
 
 setup_params_general = {
     "mode": "NAT",

tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa3_security/test_vlan_mode.py

@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.vlan]
+pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.vlan]
 
 setup_params_general = {
     "mode": "VLAN",

tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_bridge_mode.py

@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test,
+pytestmark = [pytest.mark.dataplane_throughput_test,
               pytest.mark.bridge]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_nat_mode.py

@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test,
+pytestmark = [pytest.mark.dataplane_throughput_test,
               pytest.mark.nat]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa_security/test_vlan_mode.py

@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.vlan]
+pytestmark = [pytest.mark.dataplane_throughput_test, pytest.mark.vlan]
 
 setup_params_general = {
     "mode": "VLAN",

tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py

@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.performance_release]#,
+pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.performance_release]#,
 #              pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py

@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.nat, pytest.mark.performance_release]#,
+pytestmark = [pytest.mark.dual_band_test, pytest.mark.nat, pytest.mark.performance_release]#,
 #              pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py

@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release]#,
+pytestmark = [pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release]#,
 #              pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_bridge_mode.py

@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.sss,
+pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.sss,
               pytest.mark.single_station_dual_band_throughput]# pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_nat_mode.py

@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.nat, pytest.mark.dual_band_test]#,
+pytestmark = [pytest.mark.nat, pytest.mark.dual_band_test]#,
 #              pytest.mark.usefixtures("setup_test_run")]
 
 

tests/e2e/basic/performance_tests/dual_band_performance_test/wap3_personal/test_vlan_mode.py

@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.vlan, pytest.mark.dual_band_test]#,
+pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test]#,
 #              pytest.mark.usefixtures("setup_test_run")]
 
 

tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_bridge_mode.py

@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.sss,
+pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.sss,
               pytest.mark.single_station_dual_band_throughput]# pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_general = {

tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_nat_mode.py

@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.nat,
+pytestmark = [pytest.mark.dual_band_test, pytest.mark.nat,
               pytest.mark.single_station_dual_band_throughput]
 setup_params_general = {
     "mode": "NAT",

tests/e2e/basic/performance_tests/dual_band_performance_test/wpa_personal/test_vlan_mode.py

@@ -9,7 +9,7 @@ import os
 import allure
 import pytest
 
-pytestmark = [pytest.mark.performance, pytest.mark.vlan, pytest.mark.dual_band_test]#,
+pytestmark = [pytest.mark.vlan, pytest.mark.dual_band_test]#,
 #              pytest.mark.usefixtures("setup_test_run")]