test fixes

This commit is contained in:
shivamcandela
2021-06-04 15:31:47 +05:30
parent 0dda9c86de
commit b8253c98b2
8 changed files with 149 additions and 114 deletions

View File

@@ -397,7 +397,7 @@ class ProfileUtility:
for i in self.default_profiles: for i in self.default_profiles:
skip_delete_id.append(self.default_profiles[i]._id) skip_delete_id.append(self.default_profiles[i]._id)
delete_ids = list(set(delete_ids) - set(delete_ids).intersection(set(skip_delete_id))) delete_ids = list(set(delete_ids) - set(delete_ids).intersection(set(skip_delete_id)))
# print(delete_ids) print(delete_ids)
for i in delete_ids: for i in delete_ids:
self.set_equipment_to_profile(profile_id=i) self.set_equipment_to_profile(profile_id=i)
self.delete_profile(profile_id=delete_ids) self.delete_profile(profile_id=delete_ids)
@@ -1013,14 +1013,15 @@ class FirmwareUtility:
# This is for Unit tests on Controller Library # This is for Unit tests on Controller Library
if __name__ == '__main__': if __name__ == '__main__':
controller = { controller = {
'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller 'url': "http://wlan-portal-svc-digicert.cicd.lab.wlan.tip.build", # API base url for the controller
'username': 'support@example.com', 'username': 'support@example.com',
'password': 'support', 'password': 'support',
'version': "1.1.0-SNAPSHOT", 'version': "1.1.0-SNAPSHOT",
'commit_date': "2021-04-27" 'commit_date': "2021-04-27"
} }
api = Controller(controller_data=controller) api = Controller(controller_data=controller)
# profile = ProfileUtility(sdk_client=api) profile = ProfileUtility(sdk_client=api)
profile.cleanup_profiles()
# profile.get_default_profiles() # profile.get_default_profiles()
# profile_data = { # profile_data = {
# "profile_name": "ssid_wep_2g", # "profile_name": "ssid_wep_2g",

View File

@@ -1,3 +1,6 @@
import allure
class Reporting: class Reporting:
def __init__(self): def __init__(self):
@@ -5,4 +8,5 @@ class Reporting:
pass pass
def update_testrail(self, case_id=None, run_id=None, status_id=1, msg=None): def update_testrail(self, case_id=None, run_id=None, status_id=1, msg=None):
allure.attach(name=str(msg), body="")
pass pass

View File

@@ -1,6 +1,51 @@
CONFIGURATION = { CONFIGURATION = {
# This is sample Config of a Testbed # This is sample Config of a Testbed
"basic-ext-01": {
"controller": {
'url': "http://wlan-portal-svc-digicert.cicd.lab.wlan.tip.build", # API base url for the controller
'username': 'support@example.com', # cloud controller Login
'password': 'support', # Cloud Controller Login Password
'version': '1.1.0-SNAPSHOT', # Controller version
'commit_date': "2021-04-27" # Controller version sdk, commit date
},
'access_point': [
{
'model': 'ecw5410', # AP Model, can be found in ap console using "node" command
'mode': 'wifi5', # wifi5/wifi6 can be found on AP Hardware page on Confluence
'serial': '903cb3944873', # "node" command has serial_number information
'jumphost': True,
# True, if you have AP On serial console and not ssh access, False, if you have AP ssh access from the machine
'ip': "192.168.80.99",
# IP Address of System, which has AP Connected to serial cable (if jumphost is True), else - AP IP Address
'username': "lanforge", # ssh username of system (lab-ctlr/ap)
'password': "lanforge", # ssh password for system (lab-ctlr/ap)
'port': 22, # 22, # ssh port for system (lab-ctlr/ap)
'jumphost_tty': '/dev/ttyAP1', # if jumphost is True, enter the serial console device name
'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz"
# Enter the Target AP Version URL for Testing
}
],
# Traffic generator
"traffic_generator": {
"name": "lanforge", # ( lanforge/ perfecto)
# Details for LANforge system
"details": {
"ip": "192.168.80.99", # localhost,
"port": 8080, # 8802,
"2.4G-Radio": ["wiphy4"],
"5G-Radio": ["wiphy5"],
"AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "wiphy3"],
"upstream": "1.1.eth2",
"upstream_subnet": "10.28.2.1/24",
"uplink": "1.1.eth3",
"2.4G-Station-Name": "wlan0",
"5G-Station-Name": "wlan0",
"AX-Station-Name": "ax"
}
}
},
"basic-lab": { "basic-lab": {
"controller": { "controller": {
'url': "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build", # API base url for the controller 'url': "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build", # API base url for the controller
@@ -13,7 +58,7 @@ CONFIGURATION = {
{ {
'model': 'ecw5410', # AP Model, can be found in ap console using "node" command 'model': 'ecw5410', # AP Model, can be found in ap console using "node" command
'mode': 'wifi5', # wifi5/wifi6 can be found on AP Hardware page on Confluence 'mode': 'wifi5', # wifi5/wifi6 can be found on AP Hardware page on Confluence
'serial': '3c2c99f44e77', # "node" command has serial_number information 'serial': '903cb3944873', # "node" command has serial_number information
'jumphost': True, 'jumphost': True,
# True, if you have AP On serial console and not ssh access, False, if you have AP ssh access from the machine # True, if you have AP On serial console and not ssh access, False, if you have AP ssh access from the machine
'ip': "localhost", 'ip': "localhost",
@@ -22,7 +67,7 @@ CONFIGURATION = {
'password': "pumpkin77", # ssh password for system (lab-ctlr/ap) 'password': "pumpkin77", # ssh password for system (lab-ctlr/ap)
'port': 8803, # 22, # ssh port for system (lab-ctlr/ap) 'port': 8803, # 22, # ssh port for system (lab-ctlr/ap)
'jumphost_tty': '/dev/ttyAP1', # if jumphost is True, enter the serial console device name 'jumphost_tty': '/dev/ttyAP1', # if jumphost is True, enter the serial console device name
'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.0.0-rc2.tar.gz" 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz"
# Enter the Target AP Version URL for Testing # Enter the Target AP Version URL for Testing
} }
], ],
@@ -122,22 +167,22 @@ TEST_CASES = {
"ap_profile_bridge": 5641, "ap_profile_bridge": 5641,
"ap_profile_nat": 5642, "ap_profile_nat": 5642,
"ap_profile_vlan": 5643, "ap_profile_vlan": 5643,
"ssid_2g_eap_bridge": 5644, "ssid_2g_wpa2_eap_bridge": 5644,
"ssid_2g_wpa2_bridge": 5645, "ssid_2g_wpa2_bridge": 5645,
"ssid_2g_wpa_bridge": 5646, "ssid_2g_wpa_bridge": 5646,
"ssid_5g_eap_bridge": 5647, "ssid_5g_wpa2_eap_bridge": 5647,
"ssid_5g_wpa2_bridge": 5648, "ssid_5g_wpa2_bridge": 5648,
"ssid_5g_wpa_bridge": 5649, "ssid_5g_wpa_bridge": 5649,
"ssid_2g_eap_nat": 5650, "ssid_2g_wpa2_eap_nat": 5650,
"ssid_2g_wpa2_nat": 5651, "ssid_2g_wpa2_nat": 5651,
"ssid_2g_wpa_nat": 5652, "ssid_2g_wpa_nat": 5652,
"ssid_5g_eap_nat": 5653, "ssid_5g_wpa2_eap_nat": 5653,
"ssid_5g_wpa2_nat": 5654, "ssid_5g_wpa2_nat": 5654,
"ssid_5g_wpa_nat": 5655, "ssid_5g_wpa_nat": 5655,
"ssid_2g_eap_vlan": 5656, "ssid_2g_wpa2_eap_vlan": 5656,
"ssid_2g_wpa2_vlan": 5657, "ssid_2g_wpa2_vlan": 5657,
"ssid_2g_wpa_vlan": 5658, "ssid_2g_wpa_vlan": 5658,
"ssid_5g_eap_vlan": 5659, "ssid_5g_wpa2_eap_vlan": 5659,
"ssid_5g_wpa2_vlan": 5660, "ssid_5g_wpa2_vlan": 5660,
"ssid_5g_wpa_vlan": 5661, "ssid_5g_wpa_vlan": 5661,
"radius_profile": 5808, "radius_profile": 5808,
@@ -186,8 +231,8 @@ TEST_CASES = {
"2g_wpa3_mixed_wpa3_vlan": 9779, "2g_wpa3_mixed_wpa3_vlan": 9779,
# "5g_wpa3_mixed_wpa2_vlan": 9780, # "5g_wpa3_mixed_wpa2_vlan": 9780,
"5g_wpa3_mixed_wpa3_vlan": 9781, "5g_wpa3_mixed_wpa3_vlan": 9781,
# "ssid_2g_wpa3_mixed_eap_bridge": 9782, "ssid_2g_wpa3_enterprise_mixed_bridge": 9782,
# "ssid_5g_wpa3_mixed_eap_bridge": 9783, "ssid_5g_wpa3_enterprise_mixed_bridge": 9783,
# "2g_wpa3_mixed_eap_wpa2_bridge": 9784, # "2g_wpa3_mixed_eap_wpa2_bridge": 9784,
# "2g_wpa3_mixed_eap_wpa3_bridge": 9785, # "2g_wpa3_mixed_eap_wpa3_bridge": 9785,
# "5g_wpa3_mixed_eap_wpa2_bridge": 9786, # "5g_wpa3_mixed_eap_wpa2_bridge": 9786,
@@ -216,14 +261,16 @@ TEST_CASES = {
"ssid_5g_wpa2_mixed_nat": 9814, "ssid_5g_wpa2_mixed_nat": 9814,
"ssid_2g_wpa2_mixed_vlan": 9815, "ssid_2g_wpa2_mixed_vlan": 9815,
"ssid_5g_wpa2_mixed_vlan": 9817, "ssid_5g_wpa2_mixed_vlan": 9817,
# "ssid_2g_wpa2_mixed_eap_bridge": 9818, "ssid_2g_wpa_wpa2_enterprise_mixed_bridge": 9818,
# "ssid_5g_wpa2_mixed_eap_bridge": 9819, "ssid_5g_wpa_wpa2_enterprise_mixed_bridge": 9819,
# "ssid_2g_wpa2_mixed_eap_nat": 9820, "ssid_2g_wpa_wpa2_enterprise_mixed_nat": 9820,
# "ssid_5g_wpa2_mixed_eap_nat": 9821, "ssid_5g_wpa_wpa2_enterprise_mixed_nat": 9821,
# "ssid_2g_wpa2_mixed_eap_vlan": 9822, "ssid_2g_wpa_wpa2_enterprise_mixed_vlan": 9822,
# "ssid_5g_wpa2_mixed_eap_vlan": 9823, "ssid_5g_wpa_wpa2_enterprise_mixed_vlan": 9823,
"ssid_2g_wpa_eap_bridge": 9824, "ssid_2g_wpa_eap_bridge": 9824,
"ssid_5g_wpa_eap_bridge": 9825, "ssid_5g_wpa_eap_bridge": 9825,
# "ssid_2g_wpa2_eap_bridge": 9824,
# "ssid_5g_wpa2_eap_bridge": 9825,
"ssid_2g_wpa_eap_nat": 9826, "ssid_2g_wpa_eap_nat": 9826,
"ssid_5g_wpa_eap_nat": 9827, "ssid_5g_wpa_eap_nat": 9827,
"ssid_2g_wpa_eap_vlan": 9828, "ssid_2g_wpa_eap_vlan": 9828,

View File

@@ -278,8 +278,9 @@ def upload_firmware(should_upload_firmware, instantiate_firmware):
@pytest.fixture(scope="session") @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_id, check_ap_firmware_cloud, get_latest_firmware,
should_upgrade_firmware): should_upgrade_firmware, should_upload_firmware):
"""yields the status of upgrade of firmware. waits for 300 sec after each upgrade request""" """yields the status of upgrade of firmware. waits for 300 sec after each upgrade request"""
print(should_upgrade_firmware, should_upload_firmware)
status_list = [] status_list = []
if get_latest_firmware != check_ap_firmware_cloud: if get_latest_firmware != check_ap_firmware_cloud:
if request.config.getoption("--skip-upgrade"): if request.config.getoption("--skip-upgrade"):
@@ -460,7 +461,7 @@ def traffic_generator_connectivity(testbed, get_configuration):
if not (lanforge_GUI_version or lanforge_gui_build_date or lanforge_gui_git_version): if not (lanforge_GUI_version or lanforge_gui_build_date or lanforge_gui_git_version):
yield False yield False
else: else:
yield True yield lanforge_GUI_version
except: except:
yield False yield False
else: else:

View File

@@ -1,7 +1,14 @@
"""
Profile Configuration : Enterprise SSID's Bridge Mode
"""
import pytest import pytest
import allure import allure
pytestmark = [pytest.mark.setup, pytest.mark.bridge, pytest.mark.sanity, pytest.mark.enterprise, pytest.mark.usefixtures("setup_test_run")] pytestmark = [pytest.mark.setup, pytest.mark.bridge, pytest.mark.sanity, pytest.mark.enterprise,
pytest.mark.usefixtures("setup_test_run")]
setup_params_enterprise = { setup_params_enterprise = {
"mode": "BRIDGE", "mode": "BRIDGE",
@@ -21,7 +28,7 @@ setup_params_enterprise = {
} }
@pytest.mark.enterprise @pytest.mark.suiteA
@allure.feature("BRIDGE MODE ENTERPRISE SETUP") @allure.feature("BRIDGE MODE ENTERPRISE SETUP")
@pytest.mark.parametrize( @pytest.mark.parametrize(
'setup_profiles', 'setup_profiles',
@@ -31,10 +38,12 @@ setup_params_enterprise = {
) )
@pytest.mark.usefixtures("setup_profiles") @pytest.mark.usefixtures("setup_profiles")
class TestSetupBridgeEnterpriseSuiteA(object): class TestSetupBridgeEnterpriseSuiteA(object):
""" Enterprise SSID Suite-A"""
@pytest.mark.wpa_enterprise @pytest.mark.wpa_enterprise
@pytest.mark.twog @pytest.mark.twog
def test_setup_wpa_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases): def test_setup_wpa_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases):
""" WPA Enterprise SSID 2.4G """
if setup_profiles['wpa_enterprise_2g']: if setup_profiles['wpa_enterprise_2g']:
update_report.update_testrail(case_id=test_cases["ssid_2g_wpa_eap_bridge"], update_report.update_testrail(case_id=test_cases["ssid_2g_wpa_eap_bridge"],
status_id=1, status_id=1,
@@ -49,14 +58,14 @@ class TestSetupBridgeEnterpriseSuiteA(object):
@pytest.mark.wpa_enterprise @pytest.mark.wpa_enterprise
@pytest.mark.fiveg @pytest.mark.fiveg
def test_setup_wpa_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases): def test_setup_wpa_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases):
""" WPA Enterprise SSID 5G """
if setup_profiles['wpa_enterprise_5g']: if setup_profiles['wpa_enterprise_5g']:
update_report.update_testrail(case_id=test_cases["ssid_2g_wpa_eap_bridge"], update_report.update_testrail(case_id=test_cases["ssid_5g_wpa_eap_bridge"],
status_id=1, status_id=1,
msg='profile created successfully') msg='profile created successfully')
assert setup_profiles['wpa2_enterprise_5g'] assert setup_profiles['wpa2_enterprise_5g']
else: else:
update_report.update_testrail(case_id=test_cases["ssid_2g_wpa_eap_bridge"], update_report.update_testrail(case_id=test_cases["ssid_5g_wpa_eap_bridge"],
status_id=5, status_id=5,
msg='Failed to create profile') msg='Failed to create profile')
assert False assert False
@@ -64,13 +73,14 @@ class TestSetupBridgeEnterpriseSuiteA(object):
@pytest.mark.wpa2_enterprise @pytest.mark.wpa2_enterprise
@pytest.mark.twog @pytest.mark.twog
def test_setup_wpa2_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases): def test_setup_wpa2_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases):
""" WPA2 Enterprise SSID 2.4G """
if setup_profiles['wpa2_enterprise_2g']: if setup_profiles['wpa2_enterprise_2g']:
update_report.update_testrail(case_id=test_cases["2g_wpa2_eap_bridge"], update_report.update_testrail(case_id=test_cases["ssid_2g_wpa2_eap_bridge"],
status_id=1, status_id=1,
msg='profile created successfully') msg='profile created successfully')
assert setup_profiles['wpa2_enterprise_2g'] assert setup_profiles['wpa2_enterprise_2g']
else: else:
update_report.update_testrail(case_id=test_cases["2g_wpa2_eap_bridge"], update_report.update_testrail(case_id=test_cases["ssid_2g_wpa2_eap_bridge"],
status_id=5, status_id=5,
msg='Failed to create profile') msg='Failed to create profile')
assert False assert False
@@ -78,14 +88,14 @@ class TestSetupBridgeEnterpriseSuiteA(object):
@pytest.mark.wpa2_enterprise @pytest.mark.wpa2_enterprise
@pytest.mark.fiveg @pytest.mark.fiveg
def test_setup_wpa2_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases): def test_setup_wpa2_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases):
""" WPA2 Enterprise SSID 5G """
if setup_profiles['wpa2_enterprise_5g']: if setup_profiles['wpa2_enterprise_5g']:
update_report.update_testrail(case_id=test_cases["5g_wpa2_eap_bridge"], update_report.update_testrail(case_id=test_cases["ssid_5g_wpa2_eap_bridge"],
status_id=1, status_id=1,
msg='profile created successfully') msg='profile created successfully')
assert setup_profiles['wpa2_enterprise_5g'] assert setup_profiles['wpa2_enterprise_5g']
else: else:
update_report.update_testrail(case_id=test_cases["5g_wpa2_eap_bridge"], update_report.update_testrail(case_id=test_cases["ssid_5g_wpa2_eap_bridge"],
status_id=5, status_id=5,
msg='Failed to create profile') msg='Failed to create profile')
assert False assert False
@@ -94,7 +104,7 @@ class TestSetupBridgeEnterpriseSuiteA(object):
@pytest.mark.twog @pytest.mark.twog
def test_setup_wpa3_enterprise_2g_ssid_profile(self, setup_profiles, update_report, def test_setup_wpa3_enterprise_2g_ssid_profile(self, setup_profiles, update_report,
test_cases): test_cases):
""" WPA3 Enterprise SSID 2.4G """
if setup_profiles['wpa3_enterprise_2g']: if setup_profiles['wpa3_enterprise_2g']:
update_report.update_testrail(case_id=test_cases["ssid_2g_wpa3_eap_bridge"], update_report.update_testrail(case_id=test_cases["ssid_2g_wpa3_eap_bridge"],
status_id=1, status_id=1,
@@ -110,9 +120,9 @@ class TestSetupBridgeEnterpriseSuiteA(object):
@pytest.mark.fiveg @pytest.mark.fiveg
def test_setup_wpa3_enterprise_5g_ssid_profile(self, setup_profiles, update_report, def test_setup_wpa3_enterprise_5g_ssid_profile(self, setup_profiles, update_report,
test_cases): test_cases):
""" WPA3 Enterprise SSID 5G """
if setup_profiles['wpa3_enterprise_5g']: if setup_profiles['wpa3_enterprise_5g']:
update_report.update_testrail(case_id=test_cases["5g_wpa3_eap_bridge"], update_report.update_testrail(case_id=test_cases["ssid_5g_wpa3_eap_bridge"],
status_id=1, status_id=1,
msg='profile created successfully') msg='profile created successfully')
assert setup_profiles['wpa3_enterprise_5g'] assert setup_profiles['wpa3_enterprise_5g']
@@ -124,7 +134,7 @@ class TestSetupBridgeEnterpriseSuiteA(object):
def test_setup_equipment_ap_profile(self, setup_profiles, update_report, def test_setup_equipment_ap_profile(self, setup_profiles, update_report,
test_cases): test_cases):
""" Equipment AP Profile Suite A Enterprise """
if setup_profiles['equipment_ap']: if setup_profiles['equipment_ap']:
update_report.update_testrail(case_id=test_cases["ap_profile_bridge"], update_report.update_testrail(case_id=test_cases["ap_profile_bridge"],
status_id=1, status_id=1,
@@ -138,7 +148,7 @@ class TestSetupBridgeEnterpriseSuiteA(object):
def test_verify_vif_config(self, setup_profiles, update_report, def test_verify_vif_config(self, setup_profiles, update_report,
test_cases): test_cases):
""" VIF Config Suite A Enterprise """
if setup_profiles['vifc']: if setup_profiles['vifc']:
update_report.update_testrail(case_id=test_cases["bridge_vifc"], update_report.update_testrail(case_id=test_cases["bridge_vifc"],
status_id=1, status_id=1,
@@ -152,6 +162,7 @@ class TestSetupBridgeEnterpriseSuiteA(object):
def test_verify_vif_state(self, setup_profiles, update_report, def test_verify_vif_state(self, setup_profiles, update_report,
test_cases): test_cases):
""" VIF Config Suite B Enterprise """
if setup_profiles['vifs']: if setup_profiles['vifs']:
update_report.update_testrail(case_id=test_cases["bridge_vifs"], update_report.update_testrail(case_id=test_cases["bridge_vifs"],
status_id=1, status_id=1,
@@ -163,25 +174,23 @@ class TestSetupBridgeEnterpriseSuiteA(object):
msg='Failed to push profile') msg='Failed to push profile')
assert False assert False
setup_params_enterprise_two = { setup_params_enterprise_two = {
"mode": "BRIDGE", "mode": "BRIDGE",
"ssid_modes": { "ssid_modes": {
"wpa_enterprise": [ "wpa_wpa2_enterprise_mixed": [
{"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]},
{"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}],
"wpa2_enterprise": [ "wpa3_enterprise_mixed": [
{"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]},
{"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]
"wpa3_enterprise": [ },
{"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]},
{"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]},
"rf": {}, "rf": {},
"radius": True "radius": True
} }
@pytest.mark.enterprise @pytest.mark.suiteB
@allure.feature("BRIDGE MODE ENTERPRISE SETUP") @allure.feature("BRIDGE MODE ENTERPRISE SETUP")
@pytest.mark.parametrize( @pytest.mark.parametrize(
'setup_profiles', 'setup_profiles',
@@ -192,99 +201,72 @@ setup_params_enterprise_two = {
@pytest.mark.usefixtures("setup_profiles") @pytest.mark.usefixtures("setup_profiles")
class TestSetupBridgeEnterpriseSuiteB(object): class TestSetupBridgeEnterpriseSuiteB(object):
@pytest.mark.wpa_enterprise """ Enterprise SSID Suite-B"""
@pytest.mark.wpa_wpa2_enterprise_mixed
@pytest.mark.twog @pytest.mark.twog
def test_setup_wpa_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases): def test_setup_wpa_wpa2_enterprise_mixed_2g_ssid_profile(self, setup_profiles, update_report, test_cases):
if setup_profiles['wpa_enterprise_2g']: """ WPA WPA2 Enterprise SSID 2.4G """
update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_bridge"], if setup_profiles['wpa_wpa2_enterprise_mixed_2g']:
update_report.update_testrail(case_id=test_cases["ssid_2g_wpa_wpa2_enterprise_mixed_bridge"],
status_id=1, status_id=1,
msg='profile created successfully') msg='profile created successfully')
assert setup_profiles['wpa2_enterprise_2g'] assert setup_profiles['wpa_wpa2_enterprise_mixed_2g']
else: else:
update_report.update_testrail(case_id=test_cases["wpa_enterprise_2g_bridge"], update_report.update_testrail(case_id=test_cases["ssid_2g_wpa_wpa2_enterprise_mixed_bridge"],
status_id=5, status_id=5,
msg='Failed to create profile') msg='Failed to create profile')
assert False assert False
@pytest.mark.wpa_enterprise @pytest.mark.wpa_wpa2_enterprise_mixed
@pytest.mark.fiveg @pytest.mark.fiveg
def test_setup_wpa_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases): def test_setup_wpa_wpa2_enterprise_mixed_5g_ssid_profile(self, setup_profiles, update_report, test_cases):
""" WPA WPA2 Enterprise SSID 5G """
if setup_profiles['wpa_enterprise_5g']: if setup_profiles['wpa_wpa2_enterprise_mixed_5g']:
update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_bridge"], update_report.update_testrail(case_id=test_cases["ssid_5g_wpa_wpa2_enterprise_mixed_bridge"],
status_id=1, status_id=1,
msg='profile created successfully') msg='profile created successfully')
assert setup_profiles['wpa2_enterprise_5g'] assert setup_profiles['wpa_wpa2_enterprise_mixed_5g']
else: else:
update_report.update_testrail(case_id=test_cases["wpa_enterprise_5g_bridge"], update_report.update_testrail(case_id=test_cases["ssid_5g_wpa_wpa2_enterprise_mixed_bridge"],
status_id=5, status_id=5,
msg='Failed to create profile') msg='Failed to create profile')
assert False assert False
@pytest.mark.wpa2_enterprise @pytest.mark.wpa3_enterprise_mixed
@pytest.mark.twog @pytest.mark.twog
def test_setup_wpa2_enterprise_2g_ssid_profile(self, setup_profiles, update_report, test_cases): def test_setup_wpa3_enterprise_mixed_2g_ssid_profile(self, setup_profiles, update_report, test_cases):
if setup_profiles['wpa2_enterprise_2g']: """ WPA3 Enterprise Mixed SSID 2.4G """
update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_bridge"], if setup_profiles['wpa3_enterprise_mixed_2g']:
update_report.update_testrail(case_id=test_cases["ssid_2g_wpa3_enterprise_mixed_bridge"],
status_id=1, status_id=1,
msg='profile created successfully') msg='profile created successfully')
assert setup_profiles['wpa2_enterprise_2g'] assert setup_profiles['wpa3_enterprise_mixed_2g']
else: else:
update_report.update_testrail(case_id=test_cases["wpa2_enterprise_2g_bridge"], update_report.update_testrail(case_id=test_cases["ssid_2g_wpa3_enterprise_mixed_bridge"],
status_id=5, status_id=5,
msg='Failed to create profile') msg='Failed to create profile')
assert False assert False
@pytest.mark.wpa2_enterprise @pytest.mark.wpa3_enterprise_mixed
@pytest.mark.fiveg @pytest.mark.fiveg
def test_setup_wpa2_enterprise_5g_ssid_profile(self, setup_profiles, update_report, test_cases): def test_setup_wpa3_enterprise_mixed_5g_ssid_profile(self, setup_profiles, update_report,
test_cases):
if setup_profiles['wpa2_enterprise_5g']: """ WPA3 Enterprise Mixed SSID 5G """
update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_bridge"], if setup_profiles['wpa3_enterprise_mixed_5g']:
update_report.update_testrail(case_id=test_cases["ssid_5g_wpa3_enterprise_mixed_bridge"],
status_id=1, status_id=1,
msg='profile created successfully') msg='profile created successfully')
assert setup_profiles['wpa2_enterprise_5g'] assert setup_profiles['wpa3_enterprise_mixed_5g']
else: else:
update_report.update_testrail(case_id=test_cases["wpa2_enterprise_5g_bridge"], update_report.update_testrail(case_id=test_cases["ssid_5g_wpa3_enterprise_mixed_bridge"],
status_id=5,
msg='Failed to create profile')
assert False
@pytest.mark.wpa3_enterprise
@pytest.mark.twog
def test_setup_wpa3_enterprise_2g_ssid_profile(self, setup_profiles, update_report,
test_cases):
if setup_profiles['wpa3_enterprise_2g']:
update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_bridge"],
status_id=1,
msg='profile created successfully')
assert setup_profiles['wpa3_enterprise_2g']
else:
update_report.update_testrail(case_id=test_cases["wpa3_enterprise_2g_bridge"],
status_id=5,
msg='Failed to create profile')
assert False
@pytest.mark.wpa3_enterprise
@pytest.mark.fiveg
def test_setup_wpa3_enterprise_5g_ssid_profile(self, setup_profiles, update_report,
test_cases):
if setup_profiles['wpa3_enterprise_5g']:
update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_bridge"],
status_id=1,
msg='profile created successfully')
assert setup_profiles['wpa3_enterprise_5g']
else:
update_report.update_testrail(case_id=test_cases["wpa3_enterprise_5g_bridge"],
status_id=5, status_id=5,
msg='Failed to create profile') msg='Failed to create profile')
assert False assert False
def test_setup_equipment_ap_profile(self, setup_profiles, update_report, def test_setup_equipment_ap_profile(self, setup_profiles, update_report,
test_cases): test_cases):
""" Equipment AP Profile Suite B Enterprise """
if setup_profiles['equipment_ap']: if setup_profiles['equipment_ap']:
update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"], update_report.update_testrail(case_id=test_cases["equipment_ap_bridge"],
status_id=1, status_id=1,
@@ -298,7 +280,7 @@ class TestSetupBridgeEnterpriseSuiteB(object):
def test_verify_vif_config(self, setup_profiles, update_report, def test_verify_vif_config(self, setup_profiles, update_report,
test_cases): test_cases):
""" VIF Config Suite B Enterprise """
if setup_profiles['vifc']: if setup_profiles['vifc']:
update_report.update_testrail(case_id=test_cases["bridge_vifc"], update_report.update_testrail(case_id=test_cases["bridge_vifc"],
status_id=1, status_id=1,
@@ -312,6 +294,7 @@ class TestSetupBridgeEnterpriseSuiteB(object):
def test_verify_vif_state(self, setup_profiles, update_report, def test_verify_vif_state(self, setup_profiles, update_report,
test_cases): test_cases):
""" VIF State Suite B Enterprise """
if setup_profiles['vifs']: if setup_profiles['vifs']:
update_report.update_testrail(case_id=test_cases["bridge_vifs"], update_report.update_testrail(case_id=test_cases["bridge_vifs"],
status_id=1, status_id=1,

View File

@@ -582,7 +582,7 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment
# ['ssid_idx=0 ssid=Default-SSID-2g security=WPA|WEP| password=12345678 bssid=90:3c:b3:94:48:58'], # ['ssid_idx=0 ssid=Default-SSID-2g security=WPA|WEP| password=12345678 bssid=90:3c:b3:94:48:58'],
# ['ssid_idx=1 ssid=Default-SSID-5gl password=12345678 bssid=90:3c:b3:94:48:59'] # ['ssid_idx=1 ssid=Default-SSID-5gl password=12345678 bssid=90:3c:b3:94:48:59']
# ] # ]
allure.attach(name="SSID DATA IN LF DUT", body=str(ssid_data))
lf_tools.update_ssid(ssid_data=ssid_data) lf_tools.update_ssid(ssid_data=ssid_data)
def teardown_session(): def teardown_session():
@@ -593,7 +593,7 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment
instantiate_profile.delete_profile(instantiate_profile.profile_creation_ids["rf"]) instantiate_profile.delete_profile(instantiate_profile.profile_creation_ids["rf"])
allure.attach(body=str(profile_data['equipment_ap']['profile_name'] + "\n"), allure.attach(body=str(profile_data['equipment_ap']['profile_name'] + "\n"),
name="Tear Down in Profiles ") name="Tear Down in Profiles ")
time.sleep(20) time.sleep(5)
request.addfinalizer(teardown_session) request.addfinalizer(teardown_session)
yield test_cases yield test_cases

View File

@@ -10,7 +10,6 @@ num_stations=1
# Cloud SDK settings # Cloud SDK settings
sdk-customer-id=2 sdk-customer-id=2
<<<<<<< HEAD
# Influx Params # Influx Params
influx_host=influx.cicd.lab.wlan.tip.build influx_host=influx.cicd.lab.wlan.tip.build
@@ -24,7 +23,7 @@ influx_org=tip
radius_server_ip=192.168.200.75 radius_server_ip=192.168.200.75
radius_port=1812 radius_port=1812
radius_secret=testing123 radius_secret=testing123
>>>>>>> staging-wifi-2387
# Testrail Info # Testrail Info
tr_url=https://telecominfraproject.testrail.com tr_url=https://telecominfraproject.testrail.com

View File

@@ -14,7 +14,7 @@ class TestResources(object):
@pytest.mark.test_cloud_controller @pytest.mark.test_cloud_controller
@allure.testcase(name="test_controller_connectivity", url="") @allure.testcase(name="test_controller_connectivity", url="")
def test_controller_connectivity(self, setup_controller, update_report, test_cases): def test_controller_connectivity(self, setup_controller, setup_test_run, update_report, test_cases):
"""Test case to verify cloud Controller Connectivity""" """Test case to verify cloud Controller Connectivity"""
if setup_controller.bearer: if setup_controller.bearer:
allure.attach(name="Controller Connectivity Success", body="") allure.attach(name="Controller Connectivity Success", body="")
@@ -54,13 +54,13 @@ class TestResources(object):
@allure.testcase(name="test_traffic_generator_connectivity", url="") @allure.testcase(name="test_traffic_generator_connectivity", url="")
def test_traffic_generator_connectivity(self, traffic_generator_connectivity, update_report, test_cases): def test_traffic_generator_connectivity(self, traffic_generator_connectivity, update_report, test_cases):
"""Test case to verify Traffic Generator Connectivity""" """Test case to verify Traffic Generator Connectivity"""
if traffic_generator_connectivity is False: if traffic_generator_connectivity == "5.4.3":
allure.attach(name="Access Point Connectivity Success", body=str(traffic_generator_connectivity)) allure.attach(name="Access Point Connectivity Success", body=str(traffic_generator_connectivity))
update_report.update_testrail(case_id=test_cases["cloud_connection"], update_report.update_testrail(case_id=test_cases["cloud_connection"],
status_id=5, status_id=5,
msg='CloudSDK connectivity failed') msg='CloudSDK connectivity failed')
pytest.exit("Traffic Generator is not Available") pytest.exit("LANforgeGUI-5.4.3 is not available")
else: else:
allure.attach(name="Access Point Connectivity Failed", body=str(traffic_generator_connectivity)) allure.attach(name="Access Point Connectivity Failed", body=str(traffic_generator_connectivity))
update_report.update_testrail(case_id=test_cases["cloud_connection"], update_report.update_testrail(case_id=test_cases["cloud_connection"],