mirror of
https://github.com/Telecominfraproject/wlan-testing.git
synced 2025-11-03 04:18:15 +00:00
Modified basic/conftest.py to support a single testcase for configuring multiple encryptions.
Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
This commit is contained in:
@@ -2,6 +2,37 @@ import allure
|
|||||||
import pytest
|
import pytest
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
|
||||||
|
def separate_band_and_encryption(markers: list, target_object) -> list:
|
||||||
|
"""
|
||||||
|
examples:
|
||||||
|
1> if markers = ['2G', 'wpa2_personal']
|
||||||
|
return -> [['2G', 'wpa2_personal']]
|
||||||
|
2> if markers = ['2G', 'wpa3_personal', 'wpa2_personal', 'wpa', 'open']
|
||||||
|
return -> [['2G', 'open'], ['2G', 'wpa'], ['2G', 'wpa2_personal'], ['2G', 'wpa3_personal']]
|
||||||
|
3> if markers = ['5G', 'wpa3_personal', 'wpa2_personal', 'wpa', 'open']
|
||||||
|
return -> [['5G', 'open'], ['5G', 'wpa'], ['5G', 'wpa2_personal'], ['5G', 'wpa3_personal']]
|
||||||
|
4> if markers = ['5G', 'wpa3_personal', 'wpa2_personal', '2G', 'wpa', 'open']
|
||||||
|
return -> [['2G', 'open'], ['2G', 'wpa'], ['2G', 'wpa2_personal'], ['2G', 'wpa3_personal'],
|
||||||
|
['5G', 'open'], ['5G', 'wpa'], ['5G', 'wpa2_personal'], ['5G', 'wpa3_personal']]
|
||||||
|
"""
|
||||||
|
|
||||||
|
bands = []
|
||||||
|
encryption = []
|
||||||
|
for marker in markers:
|
||||||
|
if marker in target_object.supported_bands:
|
||||||
|
bands.append(marker)
|
||||||
|
elif marker in target_object.supported_encryption:
|
||||||
|
encryption.append(marker)
|
||||||
|
|
||||||
|
combinations = []
|
||||||
|
for band in bands:
|
||||||
|
for enc in encryption:
|
||||||
|
combinations.append([band, enc])
|
||||||
|
|
||||||
|
return combinations
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="class")
|
@pytest.fixture(scope="class")
|
||||||
def setup_configuration(request, get_markers, get_target_object, run_lf):
|
def setup_configuration(request, get_markers, get_target_object, run_lf):
|
||||||
# Predefined selected markers and selected configuration
|
# Predefined selected markers and selected configuration
|
||||||
@@ -11,7 +42,9 @@ def setup_configuration(request, get_markers, get_target_object, run_lf):
|
|||||||
requested_combination = []
|
requested_combination = []
|
||||||
for key in get_markers:
|
for key in get_markers:
|
||||||
if get_markers[key]:
|
if get_markers[key]:
|
||||||
requested_combination.append(get_markers[key])
|
combinations = separate_band_and_encryption(markers=get_markers[key], target_object=get_target_object)
|
||||||
|
for comb in combinations:
|
||||||
|
requested_combination.append(comb)
|
||||||
|
|
||||||
# Method to setup the basic configuration
|
# Method to setup the basic configuration
|
||||||
data = {}
|
data = {}
|
||||||
@@ -19,4 +52,4 @@ def setup_configuration(request, get_markers, get_target_object, run_lf):
|
|||||||
data = get_target_object.setup_basic_configuration(configuration=configuration,
|
data = get_target_object.setup_basic_configuration(configuration=configuration,
|
||||||
requested_combination=requested_combination)
|
requested_combination=requested_combination)
|
||||||
logging.info("dut_data after config applied: " + str(data))
|
logging.info("dut_data after config applied: " + str(data))
|
||||||
yield data
|
yield data
|
||||||
Reference in New Issue
Block a user