mirror of
https://github.com/Telecominfraproject/wlan-testing.git
synced 2025-11-03 20:38:05 +00:00
WIFI-5076 : Enabled the option to skip the lanforge interaction when running interop
Signed-off-by: shivam <shivam.thakur@candelatech.com>
This commit is contained in:
@@ -97,6 +97,13 @@ def pytest_addoption(parser):
|
|||||||
help="skip updating firmware on the AP (useful for local testing)"
|
help="skip updating firmware on the AP (useful for local testing)"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
parser.addoption(
|
||||||
|
"--skip-lanforge",
|
||||||
|
action="store_true",
|
||||||
|
default=False,
|
||||||
|
help="skip to do any interactions on lanforge (to be used in case of interop)"
|
||||||
|
)
|
||||||
|
|
||||||
# change behaviour
|
# change behaviour
|
||||||
parser.addoption(
|
parser.addoption(
|
||||||
"--exit-on-fail",
|
"--exit-on-fail",
|
||||||
@@ -260,6 +267,11 @@ def get_sdk_version(fixtures_ver):
|
|||||||
yield version
|
yield version
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture(scope="session")
|
||||||
|
def skip_lf(request):
|
||||||
|
yield request.config.getoption("skip-lanforge")
|
||||||
|
|
||||||
|
|
||||||
# Controller Fixture
|
# Controller Fixture
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def setup_controller(request, get_configuration, add_env_properties, fixtures_ver):
|
def setup_controller(request, get_configuration, add_env_properties, fixtures_ver):
|
||||||
@@ -542,26 +554,32 @@ def traffic_generator_connectivity(testbed, get_configuration):
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def create_lanforge_chamberview_dut(lf_tools):
|
def create_lanforge_chamberview_dut(lf_tools, skip_lf):
|
||||||
|
if not skip_lf:
|
||||||
dut_object, dut_name = lf_tools.Create_Dut()
|
dut_object, dut_name = lf_tools.Create_Dut()
|
||||||
return dut_name
|
return dut_name
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def lf_tools(get_configuration, testbed):
|
def lf_tools(get_configuration, testbed, skip_lf):
|
||||||
""" Create a DUT on LANforge"""
|
""" Create a DUT on LANforge"""
|
||||||
|
if not skip_lf:
|
||||||
obj = ChamberView(lanforge_data=get_configuration["traffic_generator"]["details"],
|
obj = ChamberView(lanforge_data=get_configuration["traffic_generator"]["details"],
|
||||||
testbed=testbed, access_point_data=get_configuration["access_point"])
|
testbed=testbed, access_point_data=get_configuration["access_point"])
|
||||||
|
else:
|
||||||
|
obj = False
|
||||||
yield obj
|
yield obj
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def lf_test(get_configuration, setup_influx, request):
|
def lf_test(get_configuration, setup_influx, request, skip_lf):
|
||||||
|
if not skip_lf:
|
||||||
if request.config.getoption("--exit-on-fail"):
|
if request.config.getoption("--exit-on-fail"):
|
||||||
obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx, debug=True)
|
obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx,
|
||||||
|
debug=True)
|
||||||
if request.config.getoption("--exit-on-fail") is False:
|
if request.config.getoption("--exit-on-fail") is False:
|
||||||
obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx, debug=False)
|
obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx,
|
||||||
|
debug=False)
|
||||||
yield obj
|
yield obj
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -195,12 +195,12 @@ def setup_vlan():
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="class")
|
@pytest.fixture(scope="class")
|
||||||
def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtures_ver,
|
def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtures_ver, skip_lf,
|
||||||
instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
|
instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
|
||||||
get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info):
|
get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info):
|
||||||
lf_tools.reset_scenario()
|
lf_tools.reset_scenario()
|
||||||
param = dict(request.param)
|
param = dict(request.param)
|
||||||
|
if skip_lf:
|
||||||
# VLAN Setup
|
# VLAN Setup
|
||||||
if request.param["mode"] == "VLAN":
|
if request.param["mode"] == "VLAN":
|
||||||
|
|
||||||
@@ -227,7 +227,7 @@ def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtur
|
|||||||
instantiate_profile,
|
instantiate_profile,
|
||||||
get_markers, create_lanforge_chamberview_dut, lf_tools,
|
get_markers, create_lanforge_chamberview_dut, lf_tools,
|
||||||
get_security_flags, get_configuration, radius_info, get_apnos,
|
get_security_flags, get_configuration, radius_info, get_apnos,
|
||||||
radius_accounting_info)
|
radius_accounting_info, skip_lf=skip_lf)
|
||||||
yield return_var
|
yield return_var
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ class Fixtures_1x:
|
|||||||
|
|
||||||
def setup_profiles(self, request, param, setup_controller, testbed, get_equipment_ref, instantiate_profile,
|
def setup_profiles(self, request, param, setup_controller, testbed, get_equipment_ref, instantiate_profile,
|
||||||
get_markers, create_lanforge_chamberview_dut, lf_tools,
|
get_markers, create_lanforge_chamberview_dut, lf_tools,
|
||||||
get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info):
|
get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info, skip_lf=False):
|
||||||
|
|
||||||
instantiate_profile = instantiate_profile(sdk_client=setup_controller)
|
instantiate_profile = instantiate_profile(sdk_client=setup_controller)
|
||||||
vlan_id, mode = 0, 0
|
vlan_id, mode = 0, 0
|
||||||
|
|||||||
@@ -324,7 +324,8 @@ class Fixtures_2x:
|
|||||||
|
|
||||||
def setup_profiles(self, request, param, setup_controller, testbed, get_equipment_ref,
|
def setup_profiles(self, request, param, setup_controller, testbed, get_equipment_ref,
|
||||||
instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
|
instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
|
||||||
get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info):
|
get_security_flags, get_configuration, radius_info, get_apnos,
|
||||||
|
radius_accounting_info, skip_lf=False):
|
||||||
|
|
||||||
instantiate_profile_obj = instantiate_profile(sdk_client=setup_controller)
|
instantiate_profile_obj = instantiate_profile(sdk_client=setup_controller)
|
||||||
print(1, instantiate_profile_obj.sdk_client)
|
print(1, instantiate_profile_obj.sdk_client)
|
||||||
@@ -660,6 +661,7 @@ class Fixtures_2x:
|
|||||||
]
|
]
|
||||||
ssid_data.append(ssid)
|
ssid_data.append(ssid)
|
||||||
lf_tools.ssid_list.append(ssid_info_sdk[interface][0])
|
lf_tools.ssid_list.append(ssid_info_sdk[interface][0])
|
||||||
|
if skip_lf:
|
||||||
lf_tools.dut_idx_mapping = idx_mapping
|
lf_tools.dut_idx_mapping = idx_mapping
|
||||||
lf_tools.update_ssid(ssid_data=ssid_data)
|
lf_tools.update_ssid(ssid_data=ssid_data)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
Reference in New Issue
Block a user