Telecominfraproject/wlan-testing
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-testing.git synced 2026-01-27 10:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

get_equipment_id to get_equipment_ref

Browse Source 
Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>
This commit is contained in:
shivamcandela
2021-09-22 09:26:16 +05:30
parent ae362a70fa
commit 3246cdc83b
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/conftest.py
View File

@@ -239,7 +239,7 @@ def get_apnos():
@pytest.fixture(scope="session")
def get_equipment_id(request, setup_controller, testbed, get_configuration):
def get_equipment_ref(request, setup_controller, testbed, get_configuration):
""""""
if request.config.getoption("1.x"):
equipment_id_list = []
@@ -331,7 +331,7 @@ def upload_firmware(request, should_upload_firmware, instantiate_firmware):
@pytest.fixture(scope="session")
def upgrade_firmware(request, instantiate_firmware, get_equipment_id, check_ap_firmware_cloud, get_latest_firmware,
def upgrade_firmware(request, instantiate_firmware, get_equipment_ref, check_ap_firmware_cloud, get_latest_firmware,
should_upgrade_firmware, should_upload_firmware, get_apnos, get_configuration):
"""yields the status of upgrade of firmware. waits for 300 sec after each upgrade request"""
print(should_upgrade_firmware, should_upload_firmware)
@@ -354,13 +354,13 @@ def upgrade_firmware(request, instantiate_firmware, get_equipment_id, check_ap_f
else:
for i in range(0, len(instantiate_firmware)):
status = instantiate_firmware[i].upgrade_fw(equipment_id=get_equipment_id[i], force_upload=True,
status = instantiate_firmware[i].upgrade_fw(equipment_id=get_equipment_ref[i], force_upload=True,
force_upgrade=should_upgrade_firmware)
status_list.append(status)
else:
if should_upgrade_firmware:
for i in range(0, len(instantiate_firmware)):
status = instantiate_firmware[i].upgrade_fw(equipment_id=get_equipment_id[i],
status = instantiate_firmware[i].upgrade_fw(equipment_id=get_equipment_ref[i],
force_upload=should_upload_firmware,
force_upgrade=should_upgrade_firmware)
status_list.append(status)
@@ -374,11 +374,11 @@ def upgrade_firmware(request, instantiate_firmware, get_equipment_id, check_ap_f
@pytest.fixture(scope="session")
def check_ap_firmware_cloud(request, setup_controller, get_equipment_id):
def check_ap_firmware_cloud(request, setup_controller, get_equipment_ref):
"""yields the active version of firmware on cloud"""
if request.config.getoption("--1.x"):
ap_fw_list = []
for i in get_equipment_id:
for i in get_equipment_ref:
ap_fw_list.append(setup_controller.get_ap_firmware_old_method(equipment_id=i))
yield ap_fw_list
else:
@@ -407,7 +407,7 @@ def check_ap_firmware_ssh(get_configuration, request):
@pytest.fixture(scope="session")
def setup_test_run(setup_controller, request, upgrade_firmware, get_configuration,
get_equipment_id, get_latest_firmware,
get_equipment_ref, get_latest_firmware,
get_apnos):
"""used to upgrade the firmware on AP and should be called on each test case on a module level"""
if request.config.getoption("--1.x"):

4
tests/e2e/advanced/conftest.py
View File

@@ -51,7 +51,7 @@ def setup_vlan():
@allure.feature("CLIENT CONNECTIVITY SETUP")
@pytest.fixture(scope="class")
def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment_id,
def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment_ref,
instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
get_security_flags, get_configuration, radius_info, get_apnos):
instantiate_profile = instantiate_profile(sdk_client=setup_controller)
@@ -524,7 +524,7 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment
# Push the Equipment AP Profile to AP
try:
for i in get_equipment_id:
for i in get_equipment_ref:
instantiate_profile.push_profile_old_method(equipment_id=i)
except Exception as e:
print(e)

14
tests/e2e/interOp/conftest.py
View File

@@ -151,17 +151,17 @@ def upload_firmware(should_upload_firmware, instantiate_firmware, get_latest_fir
@pytest.fixture(scope="session")
def upgrade_firmware(request, instantiate_firmware, get_equipment_id, check_ap_firmware_cloud, get_latest_firmware,
def upgrade_firmware(request, instantiate_firmware, get_equipment_ref, check_ap_firmware_cloud, get_latest_firmware,
should_upgrade_firmware):
if get_latest_firmware != check_ap_firmware_cloud:
if request.config.getoption("--skip-upgrade"):
status = "skip-upgrade"
else:
status = instantiate_firmware.upgrade_fw(equipment_id=get_equipment_id, force_upload=False,
status = instantiate_firmware.upgrade_fw(equipment_id=get_equipment_ref, force_upload=False,
force_upgrade=should_upgrade_firmware)
else:
if should_upgrade_firmware:
status = instantiate_firmware.upgrade_fw(equipment_id=get_equipment_id, force_upload=False,
status = instantiate_firmware.upgrade_fw(equipment_id=get_equipment_ref, force_upload=False,
force_upgrade=should_upgrade_firmware)
else:
status = "skip-upgrade"
@@ -169,8 +169,8 @@ def upgrade_firmware(request, instantiate_firmware, get_equipment_id, check_ap_f
@pytest.fixture(scope="session")
def check_ap_firmware_cloud(setup_controller, get_equipment_id):
yield setup_controller.get_ap_firmware_old_method(equipment_id=get_equipment_id)
def check_ap_firmware_cloud(setup_controller, get_equipment_ref):
yield setup_controller.get_ap_firmware_old_method(equipment_id=get_equipment_ref)
"""
@@ -195,7 +195,7 @@ def setup_vlan():
@pytest.fixture(scope="class")
def setup_profiles(request, setup_controller, testbed, get_equipment_id, fixtures_ver,
def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtures_ver,
instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info):
lf_tools.reset_scenario()
@@ -223,7 +223,7 @@ def setup_profiles(request, setup_controller, testbed, get_equipment_id, fixture
lf_tools.add_vlan(vlan_ids=vlan_list)
# call this, if 1.x
return_var = fixtures_ver.setup_profiles(request, param, setup_controller, testbed, get_equipment_id,
return_var = fixtures_ver.setup_profiles(request, param, setup_controller, testbed, get_equipment_ref,
instantiate_profile,
get_markers, create_lanforge_chamberview_dut, lf_tools,
get_security_flags, get_configuration, radius_info, get_apnos,

6
tests/e2e/interOp/openroaming_test/android/conftest.py
View File

@@ -25,7 +25,7 @@ from controller.controller_1x.controller import ProfileUtility
@allure.feature("PASSPOINT CONNECTIVITY SETUP")
@pytest.fixture(scope="class")
def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment_id,
def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment_ref,
instantiate_profile, get_markers, passpoint_provider_info, passpoint_operator_info,
passpoint_venue_info, passpoint_profile_info,
get_configuration, passpoint_radius_server_info, passpoint_radius_accounting_server_info, get_apnos):
@@ -301,7 +301,7 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment
@pytest.fixture(scope="function")
def push_ap_profile(request, setup_profiles, get_equipment_id, get_apnos, get_configuration):
def push_ap_profile(request, setup_profiles, get_equipment_ref, get_apnos, get_configuration):
parameter = dict(request.param)
test_cases, instantiate_profile, profile_data = setup_profiles
ssid_names = parameter["ssid_names"]
@@ -322,7 +322,7 @@ def push_ap_profile(request, setup_profiles, get_equipment_id, get_apnos, get_co
allure.attach(body=str(ap_profile_info), name="Pushing profiles on AP :: ")
# Push the Equipment AP Profile to AP
try:
for i in get_equipment_id:
for i in get_equipment_ref:
instantiate_profile.push_profile_old_method(equipment_id=i)
except Exception as e:
print(e)

6
tests/e2e/interOp/openroaming_test/iOS/conftest.py
View File

@@ -25,7 +25,7 @@ from controller.controller_1x.controller import ProfileUtility
@allure.feature("PASSPOINT CONNECTIVITY SETUP")
@pytest.fixture(scope="class")
def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment_id,
def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment_ref,
instantiate_profile, get_markers, passpoint_provider_info, passpoint_operator_info,
passpoint_venue_info, passpoint_profile_info,
get_configuration, passpoint_radius_server_info, passpoint_radius_accounting_server_info, get_apnos):
@@ -302,7 +302,7 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment
@pytest.fixture(scope="function")
def push_ap_profile(request, setup_profiles, get_equipment_id, get_apnos, get_configuration):
def push_ap_profile(request, setup_profiles, get_equipment_ref, get_apnos, get_configuration):
parameter = dict(request.param)
test_cases, instantiate_profile, profile_data = setup_profiles
ssid_names = parameter["ssid_names"]
@@ -323,7 +323,7 @@ def push_ap_profile(request, setup_profiles, get_equipment_id, get_apnos, get_co
allure.attach(body=str(ap_profile_info), name="Pushing profiles on AP :: ")
# Push the Equipment AP Profile to AP
try:
for i in get_equipment_id:
for i in get_equipment_ref:
instantiate_profile.push_profile_old_method(equipment_id=i)
except Exception as e:
print(e)

4
tests/fixtures_1x.py
View File

@@ -83,7 +83,7 @@ class Fixtures_1x:
# version_list.append(version)
return ["-\n-"]
def setup_profiles(self, request, param, setup_controller, testbed, get_equipment_id, 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_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info):
@@ -546,7 +546,7 @@ class Fixtures_1x:
# Push the Equipment AP Profile to AP
try:
for i in get_equipment_id:
for i in get_equipment_ref:
instantiate_profile.push_profile_old_method(equipment_id=i)
except Exception as e:
print(e)