diff --git a/.DS_Store b/.DS_Store index 65080fbbe..0b9a44bd2 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/libs/apnos/apnos.py b/libs/apnos/apnos.py index 100121284..d32f10a37 100644 --- a/libs/apnos/apnos.py +++ b/libs/apnos/apnos.py @@ -81,18 +81,38 @@ class APNOS: return output # Method to get the iwinfo status of AP using AP-CLI/ JUMPHOST-CLI - def iwinfo_status(self): + def get_bssid_band_mapping(self): client = self.ssh_cli_connect() cmd = 'iwinfo' if self.mode: cmd = f"cd ~/cicd-git/ && ./openwrt_ctl.py {self.owrt_args} -t {self.tty} --action " \ f"cmd --value \"{cmd}\" " stdin, stdout, stderr = client.exec_command(cmd) - output = stdout.read() + data = stdout.read() client.close() - allure.attach(name="iwinfo Output Msg: ", body=str(output)) + allure.attach(name="iwinfo Output Msg: ", body=str(data)) allure.attach(name="iwinfo config Err Msg: ", body=str(stderr)) - return output + data = str(data).replace(" ", "").split("\\r\\n") + band_info = [] + for i in data: + tmp = [] + if i.__contains__("AccessPoint"): + bssid = i.replace("AccessPoint:", "") + tmp.append(bssid.casefold()) + elif i.__contains__("MasterChannel"): + if i.split(":")[2].__contains__("2.4"): + tmp.append("2G") + else: + tmp.append("5G") + else: + tmp = [] + if tmp != []: + band_info.append(tmp) + bssi_band_mapping = {} + for i in range(len(band_info)): + if (i % 2) == 0: + bssi_band_mapping[band_info[i][0]] = band_info[i+1][0] + return bssi_band_mapping # Method to get the vif_config of AP using AP-CLI/ JUMPHOST-CLI def get_vif_config(self): @@ -362,15 +382,20 @@ class APNOS: if __name__ == '__main__': obj = { 'jumphost': True, - 'ip': "localhost", + 'ip': "10.28.3.100", 'username': "lanforge", 'password': "pumpkin77", - 'port': 8803, - 'jumphost_tty': '/dev/ttyAP2' + 'port': 22, + 'jumphost_tty': '/dev/ttyAP1' } var = APNOS(credentials=obj) - r = var.get_ssid_info() - print(r) - print(var.get_ssid_info()) - print(var.get_manager_state()) - print(var.get_vlan()) \ No newline at end of file + abc = var.get_bssid_band_mapping() + + + # lst.remove("") + print(abc) + # r = var.get_ssid_info() + # print(r) + # print(var.get_ssid_info()) + # print(var.get_manager_state()) + # print(var.get_vlan()) \ No newline at end of file diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py index 432f4b89c..dd736c7db 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -24,6 +24,9 @@ sys.path.append(f'../libs') sys.path.append(f'../libs/lanforge/') from sta_connect2 import StaConnect2 import time +import string +import random +S = 12 # from eap_connect import EAPConnect from test_ipv4_ttls import TTLSTest from lf_wifi_capacity_test import WiFiCapacityTest @@ -200,42 +203,44 @@ class RunTest: self.eap_connect.cleanup(station_name) return self.eap_connect.passes() - def wifi_capacity(self, mode="BRIDGE", vlan_id=100, instance_name="wct_instance", stations=None): + def wifi_capacity(self, mode="BRIDGE", vlan_id=100, instance_name="wct_instance", download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000"): + instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S)) if mode == "BRIDGE": - self.client_connect.upstream_port = self.upstream_port + upstream_port = self.upstream_port elif mode == "NAT": - self.client_connect.upstream_port = self.upstream_port + upstream_port = self.upstream_port elif mode == "VLAN": - self.client_connect.upstream_port = self.upstream_port + "." + str(vlan_id) + upstream_port = self.upstream_port + "." + str(vlan_id) '''SINGLE WIFI CAPACITY using lf_wifi_capacity.py''' wificapacity_obj = WiFiCapacityTest(lfclient_host=self.lanforge_ip, - lf_port=self.lanforge_port, - lf_user="lanforge", - lf_password="lanforge", - local_lf_report_dir=self.local_report_path, - instance_name=instance_name, - config_name="wifi_config", - upstream="1.1." + self.upstream_port, - batch_size="1", - loop_iter="1", - protocol="UDP-IPv4", - duration="3000", - pull_report=True, - load_old_cfg=False, - upload_rate="10Mbps", - download_rate="1Gbps", - sort="interleave", - stations=stations, - create_stations=False, - radio=None, - security=None, - paswd=None, - ssid=None, - enables=[], - disables=[], - raw_lines=[], - raw_lines_file="", - sets=[]) + lf_port=self.lanforge_port, + lf_user="lanforge", + lf_password="lanforge", + local_lf_report_dir=self.local_report_path, + instance_name=instance_name, + config_name="wifi_config", + upstream="1.1." + upstream_port, + batch_size="1,5,10,20,40,64", + loop_iter="1", + protocol=protocol, + duration=duration, + pull_report=True, + load_old_cfg=False, + upload_rate=upload_rate, + download_rate=download_rate, + sort="interleave", + # stations=stations, + create_stations=True, + radio=None, + security=None, + paswd=None, + ssid=None, + enables=[], + disables=[], + raw_lines=[], + raw_lines_file="", + sets=[]) wificapacity_obj.setup() wificapacity_obj.run() @@ -282,18 +287,25 @@ class RunTest: return True def dataplane(self, station_name=None, mode="BRIDGE", vlan_id=100, download_rate="85%", dut_name="TIP", - upload_rate="85%", duration="1m", instance_name="test_demo"): + upload_rate="0", duration="15s", instance_name="test_demo", raw_lines=None): + instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S)) + if mode == "BRIDGE": self.client_connect.upstream_port = self.upstream_port elif mode == "NAT": self.client_connect.upstream_port = self.upstream_port - else: + elif mode == "VLAN": self.client_connect.upstream_port = self.upstream_port + "." + str(vlan_id) + if raw_lines is None: + raw_lines = [['pkts: 60;142;256;512;1024;MTU;4000'], ['directions: DUT Transmit;DUT Receive'], + ['traffic_types: UDP;TCP'], + ["show_3s: 1"], ["show_ll_graphs: 1"], ["show_log: 1"]] + self.dataplane_obj = DataplaneTest(lf_host=self.lanforge_ip, lf_port=self.lanforge_port, ssh_port=self.lf_ssh_port, - local_path=self.local_report_path, + local_lf_report_dir=self.local_report_path, lf_user="lanforge", lf_password="lanforge", instance_name=instance_name, @@ -306,61 +318,63 @@ class RunTest: duration=duration, dut=dut_name, station="1.1." + station_name[0], - raw_lines=[['pkts: Custom;60;142;256;512;1024;MTU'], - ['directions: DUT Transmit;DUT Receive'], - ['traffic_types: UDP;TCP'], ["show_3s: 1"], - ["show_ll_graphs: 1"], ["show_log: 1"]], - ) + raw_lines=raw_lines) + self.dataplane_obj.setup() self.dataplane_obj.run() report_name = self.dataplane_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - influx = CSVtoInflux(influxdb=self.influxdb, - _influx_tag=self.influx_params["influx_tag"], + influx = CSVtoInflux(influxdb=self.influxdb, _influx_tag=self.influx_params["influx_tag"], target_csv=self.local_report_path + report_name + "/kpi.csv") influx.post_to_influx() + return self.dataplane_obj - def dualbandperformancetest(self,ssid_5G="[BLANK]",ssid_2G="[BLANK]",mode="BRIDGE", vlan_id=100,dut_name="TIP", - instance_name="test_demo"): + def dualbandperformancetest(self, ssid_5G="[BLANK]", ssid_2G="[BLANK]", mode="BRIDGE", vlan_id=100, dut_name="TIP", + instance_name="test_demo", dut_5g="", dut_2g=""): + instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S)) + if mode == "BRIDGE": - self.client_connect.upstream_port = self.upstream_port + self.upstream_port = self.upstream_port elif mode == "NAT": - self.client_connect.upstream_port = self.upstream_port + self.upstream_port = self.upstream_port else: - self.client_connect.upstream_port = self.upstream_port + "." + str(vlan_id) + self.upstream_port = self.upstream_port + "." + str(vlan_id) self.dualbandptest_obj = ApAutoTest(lf_host=self.lanforge_ip, - lf_port=self.lanforge_port, - lf_user="lanforge", - lf_password="lanforge", - instance_name=instance_name, - config_name="dbp_config", - upstream="1.1." + self.upstream_port, - pull_report=True, - dut5_0=dut_name + ' ' + ssid_5G, - dut2_0=dut_name + ' ' + ssid_2G, - load_old_cfg=False, - max_stations_2=1, - max_stations_5=1, - max_stations_dual=2, - radio2=[["1.1.wiphy0"]], - radio5=[["1.1.wiphy1"]], - sets=[['Basic Client Connectivity', '0'], ['Multi Band Performance', '1'], - ['Throughput vs Pkt Size', '0'], ['Capacity', '0'], ['Stability', '0'], - ['Band-Steering', '0'], ['Multi-Station Throughput vs Pkt Size', '0'], - ['Long-Term', '0']] - ) + lf_port=self.lanforge_port, + lf_user="lanforge", + lf_password="lanforge", + instance_name=instance_name, + config_name="dbp_config", + upstream="1.1." + self.upstream_port, + pull_report=True, + dut5_0=dut_5g, + dut2_0=dut_2g, + load_old_cfg=False, + local_lf_report_dir=self.local_report_path, + max_stations_2=64, + max_stations_5=64, + max_stations_dual=124, + radio2=[self.twog_radios], + radio5=[self.fiveg_radios], + sets=[['Basic Client Connectivity', '0'], ['Multi Band Performance', '1'], + ['Throughput vs Pkt Size', '0'], ['Capacity', '0'], + ['Skip 2.4Ghz Tests', '1'], + ['Skip 5Ghz Tests', '1'], + ['Stability', '0'], + ['Band-Steering', '0'], ['Multi-Station Throughput vs Pkt Size', '0'], + ['Long-Term', '0']] + ) self.dualbandptest_obj.setup() self.dualbandptest_obj.run() - report_name = self.dataplane_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - influx = CSVtoInflux(influxdb=self.influxdb, - _influx_tag=self.influx_params["influx_tag"], - target_csv=self.local_report_path + report_name + "/kpi.csv") - influx.post_to_influx() + report_name = self.dualbandptest_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + # influx = CSVtoInflux(influxdb=self.influxdb, + # _influx_tag=self.influx_params["influx_tag"], + # target_csv=self.local_report_path + report_name + "/kpi.csv") + # influx.post_to_influx() return self.dualbandptest_obj - if __name__ == '__main__': lanforge_data = { "ip": "localhost", diff --git a/libs/lanforge/lf_tools.py b/libs/lanforge/lf_tools.py index eef0fb60b..6362a752a 100644 --- a/libs/lanforge/lf_tools.py +++ b/libs/lanforge/lf_tools.py @@ -1,3 +1,6 @@ +import re + +import allure from create_chamberview import CreateChamberview from create_chamberview_dut import DUT import time @@ -6,6 +9,7 @@ import json import os import pandas as pd + class ChamberView: def __init__(self, lanforge_data=None, access_point_data=None, debug=True, testbed=None): @@ -28,7 +32,7 @@ class ChamberView: self.scenario_name = "TIP-" + self.testbed self.debug = debug self.exit_on_error = False - + self.dut_idx_mapping = {} self.raw_line = [ ["profile_link " + self.upstream_resources + " upstream-dhcp 1 NA NA " + self.upstream_port.split(".") [2] + ",AUTO -1 NA"], @@ -57,6 +61,15 @@ class ChamberView: ) self.CreateDut.ssid = [] + def reset_scenario(self): + self.raw_line = [ + ["profile_link " + self.upstream_resources + " upstream-dhcp 1 NA NA " + self.upstream_port.split(".") + [2] + ",AUTO -1 NA"], + ["profile_link " + self.uplink_resources + " uplink-nat 1 'DUT: upstream LAN " + self.upstream_subnet + + "' NA " + self.uplink_port.split(".")[2] + "," + self.upstream_port.split(".")[2] + " -1 NA"] + ] + self.Chamber_View() + def Chamber_View(self): if self.delete_old_scenario: self.CreateChamberview.clean_cv_scenario(type="Network-Connectivity", scenario_name=self.scenario_name) @@ -70,6 +83,38 @@ class ChamberView: self.CreateChamberview.sync_cv() return self.CreateChamberview, self.scenario_name + def add_stations(self, band="2G", num_stations="max", dut="NA", ssid_name=[]): + idx = 0 + print(self.dut_idx_mapping) + for i in self.dut_idx_mapping: + if self.dut_idx_mapping[i][0] == ssid_name and self.dut_idx_mapping[i][3] == band: + idx = i + max_stations = 0 + print(idx) + if band == "2G": + max_stations = 64 * len(self.twog_radios) + radio = ",".join(self.twog_radios) + if len(self.twog_radios) == 1: + radio = radio + ",AUTO" + # self.eap_connect.sta_prefix = self.twog_prefix + if band == "5G": + max_stations = 64 * len(self.twog_radios) + radio = ",".join(self.fiveg_radios) + if len(self.fiveg_radios) == 1: + radio = radio + ",AUTO" + if band == "ax": + max_stations = len(self.twog_radios) + radio = ",".join(self.fiveg_radios) + if len(self.fiveg_radios) == 1: + radio = radio + ",AUTO" + # self.eap_connect.sta_prefix = self.fiveg_prefix + if num_stations != "max": + max_stations = num_stations + station_data = ["profile_link 1.1 STA-AUTO " + str(max_stations) + " 'DUT: " + dut + " Radio-" + str(int(idx)+1) + "'" + " NA " + radio] + self.raw_line.append(station_data) + + + def Create_Dut(self): self.CreateDut.setup() self.CreateDut.add_ssids() @@ -106,7 +151,7 @@ class ChamberView: cli_base = LFCliBase(_lfjson_host=self.lanforge_ip, _lfjson_port=self.lanforge_port, ) return cli_base.json_post(req_url, data) - def read_kpi_file(self, column_name, dir_name ): + def read_kpi_file(self, column_name, dir_name): if column_name == None: df = pd.read_csv("../reports/" + str(dir_name) + "/kpi.csv", sep=r'\t', engine='python') if df.empty == True: @@ -114,14 +159,36 @@ class ChamberView: else: return df else: - df = pd.read_csv("../reports/" + str(dir_name) + "/kpi.csv", sep=r'\t', usecols=column_name, engine='python') + df = pd.read_csv("../reports/" + str(dir_name) + "/kpi.csv", sep=r'\t', usecols=column_name, + engine='python') if df.empty == True: return "empty" else: return df + def attach_report_graphs(self, report_name=None, pdf_name="WIFI Capacity Test PDF Report"): + relevant_path = "../reports/" + report_name + "/" + entries = os.listdir("../reports/" + report_name + '/') + pdf = False + for i in entries: + if ".pdf" in i: + pdf = i + if pdf: + allure.attach.file(source=relevant_path + pdf, + name=pdf_name) + included_extensions = ['png'] + file_names = [fn for fn in os.listdir(relevant_path) + if any(fn.endswith(ext) for ext in included_extensions)] + a = [item for item in file_names if 'print' not in item] + a = [item for item in a if 'logo' not in item] + a = [item for item in a if 'Logo' not in item] + a = [item for item in a if 'candela' not in item] - + a.sort() + for i in a: + allure.attach.file(source=relevant_path + i, + name=i, + attachment_type="image/png", extension=None) diff --git a/libs/perfecto_libs/android_lib.py b/libs/perfecto_libs/android_lib.py index 2fd7ef975..5b0424e7e 100644 --- a/libs/perfecto_libs/android_lib.py +++ b/libs/perfecto_libs/android_lib.py @@ -8,6 +8,7 @@ import sys import os import time import warnings +from _pytest.outcomes import xfail import urllib3 from perfecto.model.model import Job, Project from perfecto import (PerfectoExecutionContext, PerfectoReportiumClient,TestContext, TestResultFactory) @@ -67,114 +68,6 @@ def getDeviceModelName(setup_perfectoMobile): print("ModelName: " + deviceModel) return deviceModel -@pytest.fixture(scope="function") -def setup_perfectoMobile_android(request): - from appium import webdriver - driver = None - reporting_client = None - - warnings.simplefilter("ignore", ResourceWarning) - urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) - - capabilities = { - 'platformName': request.config.getini("platformName-android"), - 'model': request.config.getini("model-android"), - 'browserName': 'mobileOS', - #'automationName' : 'Appium', - 'securityToken' : request.config.getini("securityToken"), - 'useAppiumForWeb' : 'false', - 'useAppiumForHybrid' : 'false', - #'bundleId' : request.config.getini("appPackage-android"), - } - - driver = webdriver.Remote('https://'+request.config.getini("perfectoURL")+'.perfectomobile.com/nexperience/perfectomobile/wd/hub', capabilities) - driver.implicitly_wait(35) - - TestCaseFullName = os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0] - nCurrentTestMethodNameSplit = re.sub(r'\[.*?\]\ *', "", TestCaseFullName) - try: - TestCaseName = nCurrentTestMethodNameSplit.removeprefix('test_') - print ("\nTestCaseName: " + TestCaseName) - except Exception as e: - TestCaseName = nCurrentTestMethodNameSplit - print("\nUpgrade Python to 3.9 to avoid test_ string in your test case name, see below URL") - print("https://www.andreagrandi.it/2020/10/11/python39-introduces-removeprefix-removesuffix/") - - projectname = request.config.getini("projectName") - projectversion = request.config.getini("projectVersion") - jobname = request.config.getini("jobName") - jobnumber = request.config.getini("jobNumber") - tags = request.config.getini("reportTags") - testCaseName = TestCaseName - - print("\nSetting Perfecto ReportClient....") - perfecto_execution_context = PerfectoExecutionContext(driver, tags, Job(jobname, jobnumber),Project(projectname, projectversion)) - reporting_client = PerfectoReportiumClient(perfecto_execution_context) - reporting_client.test_start(testCaseName, TestContext([], "Perforce")) - - def teardown(): - reporting_client.test_stop(TestResultFactory.create_failure("See Allure Report")) - driver.close() - print("\n------------") - print("Driver Closed") - try: - driver.quit() - print("Driver Quit") - print("------------") - except Exception as e: - print(" -- Exception Not Able To Quit --") - print(e) - # try: - # # print("\n\n---------- Tear Down ----------") - # testFailed = 0 - # testFailed = request.session.testsfailed - # print("Testcase Failure Count: ", str(testFailed)) - # if testFailed>0: - # print ("Test Case Failure, please check report link: " + testCaseName) - # try: - # exceptionFailure = request.config.cache.get("SelectingWifiFailed", None) - # reporting_client.test_stop(TestResultFactory.create_failure(exceptionFailure)) - # except Exception as e: - # reporting_client.test_stop(TestResultFactory.create_failure("Test Case failed -- See perfecto reports")) - # - # seen = {None} - # session = request.node - # print(session) - # elif testFailed<=0: - # reporting_client.test_stop(TestResultFactory.create_success()) - # - # #amount = len(request.session.items) - # #print("Test Session Items: ") - # #print(amount) - # - # #tests_count = request.session.testscollected - # #print("Test Collected: ") - # #print(tests_count) - # - # # print('Report-Url: ' + reporting_client.report_url()) - # # print("----------------------------------------------------------") - # # reporting_client.test_stop() - # driver.close() - # except Exception as e: - # print(" -- Exception While Tear Down --") - # reporting_client.test_stop(TestResultFactory.create_failure(e)) - # print('Report-Url-Failure: ' + reporting_client.report_url() + '\n') - # driver.close() - # print (e) - # finally: - # try: - # driver.quit() - # except Exception as e: - # print(" -- Exception Not Able To Quit --") - # print (e) - - request.addfinalizer(teardown) - - if driver is None: - yield -1 - else: - yield driver,reporting_client - def set_APconnMobileDevice_android(request, WifiName, WifiPass, setup_perfectoMobile, connData): print("\n-------------------------------------") print("Select Wifi/AccessPoint Connection") @@ -284,7 +177,7 @@ def set_APconnMobileDevice_android(request, WifiName, WifiPass, setup_perfectoMo try: report.step_start("Verify if Wifi is Connected") - WifiInternetErrMsg = WebDriverWait(driver, 35).until(EC.presence_of_element_located((MobileBy.XPATH, "//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) + WifiInternetErrMsg = WebDriverWait(driver, 60).until(EC.presence_of_element_located((MobileBy.XPATH, "//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) print("Wifi Successfully Connected") except NoSuchElementException: @@ -434,9 +327,11 @@ def ForgetWifiConnection(request, setup_perfectoMobile, WifiName, connData): print("Verify if wifi is disconnected from: " + WifiName) try: report.step_start("Verify if wifi is disconnected from: " + WifiName) - WifiForget= driver.find_element_by_xpath("//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']") + WifiDisconnect = driver.find_element_by_xpath("//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']") print("Wifi Not disconnected, check xpath for: " + WifiName) - except NoSuchElementException and Exception: + assert False + except Exception as e: + assert True print("Wifi Disconnected Successfully: " + WifiName) else: @@ -463,11 +358,10 @@ def ForgetWifiConnection(request, setup_perfectoMobile, WifiName, connData): #WifiForget= driver.find_element_by_xpath("//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']") print("Wifi Not disconnected, check xpath for: " + WifiName) WifiForget = WebDriverWait(driver, 20).until(EC.presence_of_element_located((MobileBy.XPATH, "//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']"))) - except NoSuchElementException and TimeoutException and Exception: + except Exception as e: assert True print("Wifi Disconnected Successfully: " + WifiName) - else: #print("Pixel Custom Code") report.step_start("Forget Wifi Network on Pixel" + WifiName) @@ -511,7 +405,7 @@ def ForgetWifiConnection(request, setup_perfectoMobile, WifiName, connData): report.step_start("Verify if Wifi is Connected") WifiInternetErrMsg = driver.find_element_by_xpath("//*[@resource-id='com.android.settings:id/summary' and @text='Connected']/parent::*/android.widget.TextView[@text='" + WifiName + "']") print("Forgot Wifi Error, check xpath") - except NoSuchElementException: + except Exception as e: print("Wifi Disconnected Successfully: " + WifiName) closeApp(connData["appPackage-android"], setup_perfectoMobile) diff --git a/libs/perfecto_libs/iOS_lib.py b/libs/perfecto_libs/iOS_lib.py index 9d3464bfe..73d23cd3a 100644 --- a/libs/perfecto_libs/iOS_lib.py +++ b/libs/perfecto_libs/iOS_lib.py @@ -145,7 +145,8 @@ def set_APconnMobileDevice_iOS(request, WifiNameSSID, WifiPass, setup_perfectoMo print("Join Button Not Enabled...Verify if Password is set properly ") try: - WifiInternetErrMsg2 = driver.find_element_by_xpath("//*[@label='No Internet Connection']").text + WifiInternetErrMsg2 = WebDriverWait(driver, 30).until(EC.presence_of_element_located((MobileBy.XPATH, "//*[@label='No Internet Connection']"))) + #= driver.find_element_by_xpath("//*[@label='No Internet Connection']").text reportFlag = False except NoSuchElementException: reportFlag = True diff --git a/tests/configuration.py b/tests/configuration.py index 95e714740..f326a83f1 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -1,61 +1,7 @@ -""" - 1.X Testbed Access using ssh tunnel - ssh -C -L 8801:lab-ctlr:22 -L 8802:lf1:8080 -L 8803:lf1:22 -L 8804:lf2:8080 -L 8805:lf2:22 -L 3389:lf1:3389 -L 3390:lf2:3389 ubuntu@orch - 2.X Testbed Access using ssh tunnel -""" CONFIGURATION = { - "advanced-02": { - "controller": { - 'url': "https://wlan-portal-svc-nola-01.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': 'eap102', # AP Model, can be found in ap console using "node" command - 'mode': 'wifi6', # wifi5/wifi6 can be found on AP Hardware page on Confluence - 'serial': '903cb39d6959', # "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': "localhost", - # 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': "pumpkin77", # ssh password for system (lab-ctlr/ap) - 'port': 8803, # 22, # ssh port for system (lab-ctlr/ap) - 'jumphost_tty': '/dev/ttyAP3', # if jumphost is True, enter the serial console device name - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/dev/eap102-2021-06-25-pending-b6743c3.tar.gz" - # Enter the Target AP Version URL for Testing - } - ], - # Traffic generator - "traffic_generator": { - "name": "lanforge", # ( lanforge/ perfecto) - # Details for LANforge system - "details": { - "ip": "localhost", # localhost, - "port": 8802, # 8802, - "ssh_port": 8804, - "2.4G-Radio": ["wiphy2", "wiphy4"], - "5G-Radio": ["wiphy5", "wiphy3"], - "AX-Radio": [], - "upstream": "1.1.eth1", - "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-01": { + "basic-01": { "controller": { 'url': "https://wlan-portal-svc-nola-02.cicd.lab.wlan.tip.build", # API base url for the controller 'username': 'support@example.com', @@ -69,32 +15,32 @@ CONFIGURATION = { 'mode': 'wifi5', 'serial': '3c2c99f44e77', 'jumphost': True, - 'ip': "localhost", # localhost + 'ip': "10.28.3.100", 'username': "lanforge", 'password': "pumpkin77", - 'port': 8801, # 22, + 'port': 22, 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/dev/ecw5410-2021-06-16-pending-e8418c0.tar.gz" + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/dev/ecw5410-2021-06-25-pending-b6743c3.tar.gz" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "localhost", # localhost, - "port": 8802, # 8802, - "ssh_port": 8803, - "2.4G-Radio": ["wiphy0", "wiphy4"], - "5G-Radio": ["wiphy0", "wiphy5"], - "AX-Radio": ["wiphy0", "wiphy1", "wiphy2", "wiphy3"], + "ip": "10.28.3.6", + "port": 8080, + "ssh_port": 22, + "2.4G-Radio": ["1.1.wiphy4"], + "5G-Radio": ["1.1.wiphy5"], + "AX-Radio": ["1.1.wiphy0", "1.1.wiphy1", "1.1.wiphy2", "1.1.wiphy3"], "upstream": "1.1.eth2", "upstream_subnet": "10.28.2.1/24", "uplink": "1.1.eth3", - "2.4G-Station-Name": "twog0", - "5G-Station-Name": "fiveg0", + "2.4G-Station-Name": "wlan0", + "5G-Station-Name": "wlan1", "AX-Station-Name": "ax" } } - }, # 1.X wifi-5 basic-01 + }, # checked deployed "basic-02": { "controller": { 'url': "https://wlan-portal-svc-nola-02.cicd.lab.wlan.tip.build", # API base url for the controller @@ -109,35 +55,233 @@ CONFIGURATION = { 'mode': 'wifi6', 'serial': '34efb6af48db', 'jumphost': True, - 'ip': "localhost", + 'ip': "10.28.3.100", 'username': "lanforge", 'password': "pumpkin77", - 'port': 8801, + 'port': 22, 'jumphost_tty': '/dev/ttyAP2', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/eap101/dev/eap101-2021-06-15-pending-39bd8f3.tar.gz" + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/eap101/dev/eap101-2021-06-25-pending-b6743c3.tar.gz" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "localhost", - "port": 8804, - "ssh_port": 8805, + "ip": "10.28.3.8", + "port": 8080, + "ssh_port": 22, "2.4G-Radio": ["wiphy0", "wiphy4"], "5G-Radio": ["wiphy0", "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": "sta0", - "5G-Station-Name": "sta1", + "2.4G-Station-Name": "wlan0", + "5G-Station-Name": "wlan0", "AX-Station-Name": "ax" } } - }, # 1.x wifi-6 basic-02 - "ext-03-01": { + }, # checked deployed + "basic-03": { "controller": { - 'url': "https://wlan-portal-svc-nola-ext-03.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 + 'username': 'support@example.com', + 'password': 'support', + 'version': '1.0.0-SNAPSHOT', + 'commit_date': '2021-03-23' + }, + 'access_point': [ + { + 'model': 'ec420', + 'mode': 'wifi5', + 'serial': '001122090801', + 'jumphost': True, + 'ip': "10.28.3.100", + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 22, + 'jumphost_tty': '/dev/ttyAP3', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ec420/trunk/ec420-1.1.0.tar.gz" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "10.28.3.10", + "port": 8080, + "ssh_port": 22, + "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" + } + } + }, # checked --- + "basic-04": { + "controller": { + 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller + 'username': 'support@example.com', + 'password': 'support', + 'version': '1.1.0-SNAPSHOT', + 'commit_date': "2021-06-01" + }, + 'access_point': [ + { + 'model': 'ecw5211', + 'mode': 'wifi5', + 'serial': '68215f9d0c1a', + 'jumphost': True, + 'ip': "10.28.3.100", + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 22, + 'jumphost_tty': '/dev/ttyAP5', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5211/trunk/ecw5211-1.1.0.tar.gz" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "10.28.3.12", + "port": 8080, + "ssh_port": 22, + "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" + } + } + }, # checked uci + "basic-05": { + "controller": { + 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller + 'username': 'support@example.com', + 'password': 'support', + 'version': '1.1.0-SNAPSHOT', + 'commit_date': "2021-06-01" + }, + 'access_point': [ + { + 'model': 'wf188n', + 'mode': 'wifi6', + 'serial': '0000c1018812', + 'jumphost': True, + 'ip': "10.28.3.103", + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 22, + 'jumphost_tty': '/dev/ttyAP1', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/wf188n/trunk/wf188n-1.1.0.tar.gz" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "10.28.3.28", + "port": 8080, + "ssh_port": 22, + "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" + } + } + }, # checked uci + "basic-06": { + "controller": { + 'url': 'https://sdk-ucentral-2.cicd.lab.wlan.tip.build:16001/api/v1/oauth2', # API base url for the controller + 'username': "tip@ucentral.com", + 'password': 'openwifi', + }, + 'access_point': [ + { + 'model': 'eap102', + 'mode': 'wifi6', + 'serial': '903cb39d6918', + 'jumphost': True, + 'ip': "localhost", # 10.28.3.103 + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 8863, # 22 + 'jumphost_tty': '/dev/ttyAP2', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/edgecore_eap102/20210625-edgecore_eap102-uCentral-trunk-4225122-upgrade.bin" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "localhost", # 10.28.3.30 + "port": 8862, # 8080 + "ssh_port": 8864, + "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" + } + } + }, # checked uci + "basic-07": { + "controller": { + 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller + 'username': 'support@example.com', + 'password': 'support', + 'version': '1.1.0-SNAPSHOT', + 'commit_date': "2021-06-01" + }, + 'access_point': [ + { + 'model': 'eap102', + 'mode': 'wifi6', + 'serial': '00037f102014', + 'jumphost': True, + 'ip': "localhost", # 10.28.3.103 + 'username': "lanforge", + 'password': "pumpkin77", + 'port': 8873, # 22 + 'jumphost_tty': '/dev/ttyAP3', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/eap102/trunk/eap102-1.1.0.tar.gz" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "localhost", # 10.28.3.32 + "port": 8872, # 8080 + "ssh_port": 22, + "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" + } + } + }, # checked uci + "basic-08-01": { + "controller": { + 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller 'username': 'support@example.com', 'password': 'support', 'version': '1.1.0-SNAPSHOT', @@ -147,37 +291,37 @@ CONFIGURATION = { { 'model': 'ecw5410', 'mode': 'wifi5', - 'serial': '903cb3944857', + 'serial': '68215fd2f724', 'jumphost': True, - 'ip': "192.168.200.80", # localhost + 'ip': "localhost", # 10.28.3.103 'username': "lanforge", - 'password': "lanforge", - 'port': 22, # 22, - 'jumphost_tty': '/dev/ttyAP1', + 'password': "pumpkin77", + 'port': 8883, # 22 + 'jumphost_tty': '/dev/ttyAP4', 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "192.168.200.80", # localhost, - "port": 8080, # 8802, + "ip": "localhost", # 10.28.3.34 + "port": 8882, # 8080 "ssh_port": 22, - "2.4G-Radio": ["wiphy0"], + "2.4G-Radio": ["wiphy4"], "5G-Radio": ["wiphy5"], - "AX-Radio": [], - "upstream": "1.1.eth1", - "upstream_subnet": "192.168.200.1/24", - "uplink": "1.1.eth2", - "2.4G-Station-Name": "twog0", - "5G-Station-Name": "fiveg0", - "AX-Station-Name": "ax0" + "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" } } - }, # Anjali 192.168.200.80 - "ext-03-02": { + }, # checked + "basic-08-02": { "controller": { - 'url': "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build", # API base url for the controller + 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller 'username': 'support@example.com', 'password': 'support', 'version': '1.1.0-SNAPSHOT', @@ -185,39 +329,40 @@ CONFIGURATION = { }, 'access_point': [ { - 'model': 'ecw5410', - 'mode': 'wifi5', - 'serial': '903cb394486f', + 'model': 'wf194c', + 'mode': 'wifi6', + 'serial': '089B4BB2F10C', 'jumphost': True, - 'ip': "192.168.200.81", # localhost + 'ip': "localhost", # 10.28.3.103 'username': "lanforge", - 'password': "lanforge", - 'port': 22, # 22, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" + 'password': "pumpkin77", + 'port': 8883, # 22 + 'jumphost_tty': '/dev/ttyAP5', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/wf194c/trunk/wf194c-1.1.0.tar.gz" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "192.168.200.81", # localhost, - "port": 8080, # 8802, + "ip": "localhost", # 10.28.3.34 + "port": 8882, # 8080 "ssh_port": 22, - "2.4G-Radio": ["wiphy0"], - "5G-Radio": ["wiphy5"], - "AX-Radio": [], - "upstream": "1.1.eth1", - "upstream_subnet": "192.168.200.1/24", - "uplink": "1.1.eth2", - "2.4G-Station-Name": "twog0", - "5G-Station-Name": "fiveg0", - "AX-Station-Name": "ax0" + "2.4G-Radio": ["wiphy0", "wiphy2"], + "5G-Radio": ["wiphy1", "wiphy3"], + "AX-Radio": ["wiphy4", "wiphy5", "wiphy6", "wiphy7"], + "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" } } - }, - "ext-03-03": { + }, # checked + + "mesh": { "controller": { - 'url': "https://wlan-portal-svc-nola-ext-03.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', 'password': 'support', 'version': '1.1.0-SNAPSHOT', @@ -225,147 +370,37 @@ CONFIGURATION = { }, 'access_point': [ { - 'model': 'ecw5410', - 'mode': 'wifi5', - 'serial': '903cb3944817', + 'model': 'eap101', + 'mode': 'wifi6', + 'serial': '34efb6af4a7a', 'jumphost': True, - 'ip': "192.168.200.82", # localhost + 'ip': "10.28.3.101", # 10.28.3.103 'username': "lanforge", - 'password': "lanforge", - 'port': 22, # 22, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" + 'password': "pumpkin77", + 'port': 22, # 22 + 'jumphost_tty': '/dev/ttyAP2', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/eap101/trunk/eap101-1.1.0.tar.gz" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "192.168.200.82", # localhost, - "port": 8080, # 8802, + "ip": "10.28.3.14", # 10.28.3.34 + "port": 8080, # 8080 "ssh_port": 22, - "2.4G-Radio": ["wiphy0"], - "5G-Radio": ["wiphy5"], - "AX-Radio": [], - "upstream": "1.1.eth1", - "upstream_subnet": "192.168.200.1/24", - "uplink": "1.1.eth2", - "2.4G-Station-Name": "twog0", - "5G-Station-Name": "fiveg0", - "AX-Station-Name": "ax0" + "2.4G-Radio": ["wiphy0", "wiphy2"], + "5G-Radio": ["wiphy1", "wiphy3"], + "AX-Radio": ["wiphy4", "wiphy5", "wiphy6", "wiphy7"], + "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" } } - }, # Mahesh 192.168.200.82 - "ext-03-04": { - "controller": { - 'url': "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', - 'password': 'support', - 'version': '1.1.0-SNAPSHOT', - 'commit_date': "2021-06-01" - }, - 'access_point': [ - { - 'model': 'ecw5410', - 'mode': 'wifi5', - 'serial': '903cb3944873', - 'jumphost': True, - 'ip': "192.168.200.52", # localhost - 'username': "lanforge", - 'password': "lanforge", - 'port': 22, # 22, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" - } - ], - "traffic_generator": { - "name": "lanforge", - "details": { - "ip": "192.168.52.100", # localhost, - "port": 8080, # 8802, - "ssh_port": 22, - "2.4G-Radio": ["wiphy0"], - "5G-Radio": ["wiphy5"], - "AX-Radio": [], - "upstream": "1.1.eth1", - "upstream_subnet": "192.168.52.1/24", - "uplink": "1.1.eth2", - "2.4G-Station-Name": "twog0", - "5G-Station-Name": "fiveg0", - "AX-Station-Name": "ax0" - } - } - }, # Shivam 192.168.52.100 - "ext-03-05": { - "controller": { - 'url': "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build", # API base url for the controller - 'username': 'support@example.com', - 'password': 'support', - 'version': '1.1.0-SNAPSHOT', - 'commit_date': "2021-06-01" - }, - 'access_point': [ - { - 'model': 'ecw5410', - 'mode': 'wifi5', - 'serial': '903cb3944857', - 'jumphost': True, - 'ip': "192.168.200.80", # localhost - 'username': "lanforge", - 'password': "lanforge", - 'port': 22, # 22, - 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" - } - ], - "traffic_generator": { - "name": "lanforge", - "details": { - "ip": "192.168.200.80", # localhost, - "port": 8080, # 8802, - "ssh_port": 22, - "2.4G-Radio": ["wiphy0"], - "5G-Radio": ["wiphy5"], - "AX-Radio": [], - "upstream": "1.1.eth1", - "upstream_subnet": "192.168.200.1/24", - "uplink": "1.1.eth2", - "2.4G-Station-Name": "twog0", - "5G-Station-Name": "fiveg0", - "AX-Station-Name": "ax0" - } - } - }, # Sushant 192.168.51.___ - # "interop": { - # "controller": { - # 'url': "https://wlan-portal-svc-nola-02.cicd.lab.wlan.tip.build", # API base url for the controller - # 'username': 'support@example.com', - # 'password': 'support', - # 'version': '1.1.0-SNAPSHOT', - # 'commit_date': '2021-06-01' - # }, - # 'access_point': [ - # { - # 'model': 'ecw5410', - # 'mode': 'wifi5', - # 'serial': '3c2c99f44e53', - # 'jumphost': True, - # 'ip': "localhost", - # 'username': "lanforge", - # 'password': "pumpkin77", - # 'port': 8833, - # 'jumphost_tty': '/dev/ttyAP4', - # 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0-rc3.tar.gz" - # } - # ], - # "traffic_generator": { - # "name": "Perfecto", - # "details": { - # "securityToken": "eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI3NzkzZGM0Ni1jZmU4LTQ4ODMtYjhiOS02ZWFlZGU2OTc2MDkifQ.eyJqdGkiOiJjYjRjYjQzYi05Y2FiLTQxNzQtOTYxYi04MDEwNTZkNDM2MzgiLCJleHAiOjAsIm5iZiI6MCwiaWF0IjoxNjExNTk0NzcxLCJpc3MiOiJodHRwczovL2F1dGgyLnBlcmZlY3RvbW9iaWxlLmNvbS9hdXRoL3JlYWxtcy90aXAtcGVyZmVjdG9tb2JpbGUtY29tIiwiYXVkIjoiaHR0cHM6Ly9hdXRoMi5wZXJmZWN0b21vYmlsZS5jb20vYXV0aC9yZWFsbXMvdGlwLXBlcmZlY3RvbW9iaWxlLWNvbSIsInN1YiI6IjdiNTMwYWUwLTg4MTgtNDdiOS04M2YzLTdmYTBmYjBkZGI0ZSIsInR5cCI6Ik9mZmxpbmUiLCJhenAiOiJvZmZsaW5lLXRva2VuLWdlbmVyYXRvciIsIm5vbmNlIjoiZTRmOTY4NjYtZTE3NS00YzM2LWEyODMtZTQwMmI3M2U5NzhlIiwiYXV0aF90aW1lIjowLCJzZXNzaW9uX3N0YXRlIjoiYWNkNTQ3MTctNzJhZC00MGU3LWI0ZDctZjlkMTAyNDRkNWZlIiwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJyZXBvcnRpdW0iOnsicm9sZXMiOlsiYWRtaW5pc3RyYXRvciJdfSwiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwidmlldy1wcm9maWxlIl19fSwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSBvZmZsaW5lX2FjY2VzcyBlbWFpbCJ9.SOL-wlZiQ4BoLLfaeIW8QoxJ6xzrgxBjwSiSzkLBPYw", - # "perfectoURL": "tip" - # } - # } - # }, - "interop": { + }, # checked + "interop": { "controller": { 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller 'username': 'support@example.com', @@ -382,7 +417,7 @@ CONFIGURATION = { 'ip': "localhost", 'username': "lanforge", 'password': "pumpkin77", - 'port': 8843, + 'port': 22, 'jumphost_tty': '/dev/ttyAP1', 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" } @@ -395,15 +430,55 @@ CONFIGURATION = { } } }, + + "basic-ext-03-03": { + "controller": { + 'url': "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build", # API base url for the controller + 'username': 'support@example.com', + 'password': 'support', + 'version': "1.1.0-SNAPSHOT", + 'commit_date': "2021-04-27" + }, + 'access_point': [ + { + 'model': 'ecw5410', + 'mode': 'wifi5', + 'serial': '903cb3944857', + 'jumphost': True, + 'ip': "192.168.200.80", + 'username': "lanforge", + 'password': "lanforge", + 'port': 22, + 'jumphost_tty': '/dev/ttyAP1', + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" + } + ], + "traffic_generator": { + "name": "lanforge", + "details": { + "ip": "192.168.200.80", + "port": 8080, + "ssh_port": 22, + "2.4G-Radio": ["wiphy0"], + "5G-Radio": ["wiphy1"], + "AX-Radio": ["wiphy2"], + "upstream": "1.1.eth1", + "upstream_subnet": "192.168.200.1/24", + "uplink": "1.1.eth2", + "2.4G-Station-Name": "wlan0", + "5G-Station-Name": "wlan0", + "AX-Station-Name": "ax" + } + } + } } - RADIUS_SERVER_DATA = { - "ip": "192.168.200.75", + "ip": "10.10.10.72", "port": 1812, "secret": "testing123", - "user": "nolaradius", - "password": "nolastart", + "user": "user", + "password": "password", "pk_password": "whatever" } @@ -481,6 +556,7 @@ PASSPOINT_PROFILE_INFO = { } } + TEST_CASES = { "ap_upgrade": 2233, "5g_wpa2_bridge": 2236, @@ -668,4 +744,4 @@ TEST_CASES = { "5g_open_nat": 4322, "2g_open_vlan": 9897, "5g_open_vlan": 9898 -} \ No newline at end of file +} diff --git a/tests/conftest.py b/tests/conftest.py index 93f5deca6..40512eb22 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,6 +6,7 @@ import sys import os import time import allure +import re import logging if "logs" not in os.listdir(): @@ -585,5 +586,6 @@ def setup_influx(request, testbed, get_configuration): } yield influx_params - - +# Need for Perforce Mobile Device Execution +def pytest_sessionstart(session): + session.results = dict() \ No newline at end of file diff --git a/tests/e2e/basic/configuration_tests/bridge_mode/test_enterprise_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/bridge_mode/test_enterprise_security_modes_configuration.py index 12885f557..d005dee73 100644 --- a/tests/e2e/basic/configuration_tests/bridge_mode/test_enterprise_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/bridge_mode/test_enterprise_security_modes_configuration.py @@ -15,14 +15,14 @@ setup_params_enterprise = { "mode": "BRIDGE", "ssid_modes": { "wpa_enterprise": [ - {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": True @@ -187,11 +187,11 @@ setup_params_enterprise_two = { "mode": "BRIDGE", "ssid_modes": { "wpa_wpa2_enterprise_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] }, "rf": {}, "radius": True diff --git a/tests/e2e/basic/configuration_tests/bridge_mode/test_general_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/bridge_mode/test_general_security_modes_configuration.py index ec219f5eb..f6f95f96d 100644 --- a/tests/e2e/basic/configuration_tests/bridge_mode/test_general_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/bridge_mode/test_general_security_modes_configuration.py @@ -15,14 +15,14 @@ pytestmark = [pytest.mark.setup, pytest.mark.bridge, pytest.mark.sanity, pytest. setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -204,16 +204,16 @@ setup_params_general_two = { "mode": "BRIDGE", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}] }, "rf": {}, diff --git a/tests/e2e/basic/configuration_tests/nat_mode/test_enterprise_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/nat_mode/test_enterprise_security_modes_configuration.py index ed032e5eb..cd37873a2 100644 --- a/tests/e2e/basic/configuration_tests/nat_mode/test_enterprise_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/nat_mode/test_enterprise_security_modes_configuration.py @@ -15,14 +15,14 @@ setup_params_enterprise = { "mode": "NAT", "ssid_modes": { "wpa_enterprise": [ - {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": True @@ -187,11 +187,11 @@ setup_params_enterprise_two = { "mode": "NAT", "ssid_modes": { "wpa_wpa2_enterprise_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] }, "rf": {}, "radius": True diff --git a/tests/e2e/basic/configuration_tests/nat_mode/test_general_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/nat_mode/test_general_security_modes_configuration.py index e474bd2d7..5e6a69e63 100644 --- a/tests/e2e/basic/configuration_tests/nat_mode/test_general_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/nat_mode/test_general_security_modes_configuration.py @@ -15,14 +15,14 @@ pytestmark = [pytest.mark.setup, pytest.mark.nat, pytest.mark.sanity, pytest.mar setup_params_general = { "mode": "NAT", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -204,16 +204,16 @@ setup_params_general_two = { "mode": "NAT", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}] }, "rf": {}, diff --git a/tests/e2e/basic/configuration_tests/vlan_mode/test_enterprise_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/vlan_mode/test_enterprise_security_modes_configuration.py index 3eb3dd487..b0b4ba4a3 100644 --- a/tests/e2e/basic/configuration_tests/vlan_mode/test_enterprise_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/vlan_mode/test_enterprise_security_modes_configuration.py @@ -15,14 +15,14 @@ setup_params_enterprise = { "mode": "VLAN", "ssid_modes": { "wpa_enterprise": [ - {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": True @@ -187,11 +187,11 @@ setup_params_enterprise_two = { "mode": "VLAN", "ssid_modes": { "wpa_wpa2_enterprise_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] }, "rf": {}, "radius": True diff --git a/tests/e2e/basic/configuration_tests/vlan_mode/test_general_security_modes_configuration.py b/tests/e2e/basic/configuration_tests/vlan_mode/test_general_security_modes_configuration.py index 67716637c..1c309d242 100644 --- a/tests/e2e/basic/configuration_tests/vlan_mode/test_general_security_modes_configuration.py +++ b/tests/e2e/basic/configuration_tests/vlan_mode/test_general_security_modes_configuration.py @@ -15,14 +15,14 @@ pytestmark = [pytest.mark.setup, pytest.mark.vlan, pytest.mark.sanity, pytest.ma setup_params_general = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -204,16 +204,16 @@ setup_params_general_two = { "mode": "VLAN", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}] }, "rf": {}, diff --git a/tests/e2e/basic/conftest.py b/tests/e2e/basic/conftest.py index da719e185..5ac29910c 100644 --- a/tests/e2e/basic/conftest.py +++ b/tests/e2e/basic/conftest.py @@ -27,6 +27,10 @@ def lf_tools(get_configuration, testbed): lf_tools_obj = ChamberView(lanforge_data=get_configuration['traffic_generator']['details'], access_point_data=get_configuration['access_point'], testbed=testbed) + lf_tools_obj.add_stations(band="2G", num_stations=0, dut="NA", ssid_name=[]) + lf_tools_obj.add_stations(band="5G", num_stations=0, dut="NA", ssid_name=[]) + lf_tools_obj.add_stations(band="ax", num_stations=0, dut="NA", ssid_name=[]) + lf_tools_obj.Chamber_View() yield lf_tools_obj @@ -141,375 +145,292 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment # print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_open_ssid_profile(profile_data=j) - test_cases["open_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_open_ssid_profile(profile_data=j) + test_cases["open_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["open_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_open_ssid_profile(profile_data=j) - test_cases["open_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["open_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") if mode == "wpa": for j in profile_data["ssid"][mode]: # print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa_ssid_profile(profile_data=j) - test_cases["wpa_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_wpa_ssid_profile(profile_data=j) + test_cases["wpa_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa_ssid_profile(profile_data=j) - test_cases["wpa_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") + if mode == "wpa2_personal": for j in profile_data["ssid"][mode]: # print(j) + if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa2_personal_ssid_profile(profile_data=j) - test_cases["wpa2_personal_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_wpa2_personal_ssid_profile(profile_data=j) + test_cases["wpa2_personal_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa2_personal_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa2_personal_ssid_profile(profile_data=j) - test_cases["wpa2_personal_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa2_personal_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") if mode == "wpa_wpa2_personal_mixed": for j in profile_data["ssid"][mode]: # print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa_wpa2_personal_mixed_ssid_profile( - profile_data=j) - test_cases["wpa_wpa2_personal_mixed_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + + creates_profile = instantiate_profile.create_wpa_wpa2_personal_mixed_ssid_profile( + profile_data=j) + test_cases["wpa_wpa2_personal_mixed_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa_wpa2_personal_mixed_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa_wpa2_personal_mixed_ssid_profile( - profile_data=j) - test_cases["wpa_wpa2_personal_mixed_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa_wpa2_personal_mixed_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") + if mode == "wpa3_personal": for j in profile_data["ssid"][mode]: print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa3_personal_ssid_profile(profile_data=j) - test_cases["wpa3_personal_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + + creates_profile = instantiate_profile.create_wpa3_personal_ssid_profile(profile_data=j) + test_cases["wpa3_personal_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa3_personal_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa3_personal_ssid_profile(profile_data=j) - test_cases["wpa3_personal_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa3_personal_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") if mode == "wpa3_personal_mixed": for j in profile_data["ssid"][mode]: print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa3_personal_mixed_ssid_profile( + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_wpa3_personal_mixed_ssid_profile( profile_data=j) - test_cases["wpa3_personal_mixed_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + test_cases["wpa3_personal_mixed_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa3_personal_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa3_personal_mixed_ssid_profile( - profile_data=j) - test_cases["wpa3_personal_mixed_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa3_personal_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") if mode == "wpa_enterprise": for j in profile_data["ssid"][mode]: if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa_enterprise_ssid_profile(profile_data=j) - test_cases["wpa_enterprise_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_wpa_enterprise_ssid_profile(profile_data=j) + test_cases["wpa_enterprise_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa_enterprise_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa_enterprise_ssid_profile(profile_data=j) - test_cases["wpa_enterprise_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa_enterprise_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") if mode == "wpa2_enterprise": for j in profile_data["ssid"][mode]: # print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa2_enterprise_ssid_profile(profile_data=j) - test_cases["wpa2_enterprise_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_wpa2_enterprise_ssid_profile(profile_data=j) + test_cases["wpa2_enterprise_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa2_enterprise_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa2_enterprise_ssid_profile(profile_data=j) - test_cases["wpa2_enterprise_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa2_enterprise_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") if mode == "wpa3_enterprise": for j in profile_data["ssid"][mode]: # print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa3_enterprise_ssid_profile(profile_data=j) - test_cases["wpa3_enterprise_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_wpa3_enterprise_ssid_profile(profile_data=j) + test_cases["wpa3_enterprise_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa3_enterprise_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa3_enterprise_ssid_profile(profile_data=j) - test_cases["wpa3_enterprise_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa3_enterprise_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") if mode == "wpa_wpa2_enterprise_mixed": for j in profile_data["ssid"][mode]: # print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa_wpa2_enterprise_mixed_ssid_profile( - profile_data=j) - test_cases["wpa_wpa2_enterprise_mixed_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_wpa_wpa2_enterprise_mixed_ssid_profile( + profile_data=j) + test_cases["wpa_wpa2_enterprise_mixed_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa_wpa2_enterprise_mixed_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa_wpa2_enterprise_mixed_ssid_profile( - profile_data=j) - test_cases["wpa_wpa2_enterprise_mixed_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa_wpa2_enterprise_mixed_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") if mode == "wpa3_enterprise_mixed": for j in profile_data["ssid"][mode]: # print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa3_enterprise_mixed_ssid_profile( - profile_data=j) - test_cases["wpa3_enterprise_mixed_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_wpa3_enterprise_mixed_ssid_profile( + profile_data=j) + test_cases["wpa3_enterprise_mixed_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa3_enterprise_mixed_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wpa3_enterprise_mixed_ssid_profile( - profile_data=j) - test_cases["wpa3_enterprise_mixed_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa3_enterprise_mixed_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") if mode == "wep": for j in profile_data["ssid"][mode]: # print(j) if mode in get_markers.keys() and get_markers[mode]: try: - if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( - j["appliedRadios"]): + if j["appliedRadios"].__contains__("2G"): lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wep_ssid_profile(profile_data=j) - test_cases["wpa3_enterprise_2g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") + if j["appliedRadios"].__contains__("5G"): + lf_dut_data.append(j) + for i in range(len(j["appliedRadios"])): + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GU", "is5GHzU") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5GL", "is5GHzL") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("5G", "is5GHz") + j["appliedRadios"][i] = j["appliedRadios"][i].replace("2G", "is2dot4GHz") + creates_profile = instantiate_profile.create_wep_ssid_profile(profile_data=j) + test_cases["wpa3_enterprise_2g"] = True + allure.attach(body=str(creates_profile), + name="SSID Profile Created") except Exception as e: print(e) test_cases["wpa3_enterprise_2g"] = False allure.attach(body=str(e), name="SSID Profile Creation Failed") - try: - if "fiveg" in get_markers.keys() and get_markers["fiveg"] and "is5GHz" in list( - j["appliedRadios"]): - lf_dut_data.append(j) - creates_profile = instantiate_profile.create_wep_ssid_profile(profile_data=j) - test_cases["wpa3_enterprise_5g"] = True - allure.attach(body=str(creates_profile), - name="SSID Profile Created") - except Exception as e: - print(e) - test_cases["wpa3_enterprise_5g"] = False - allure.attach(body=str(e), - name="SSID Profile Creation Failed") # Equipment AP Profile Creation try: instantiate_profile.set_ap_profile(profile_data=profile_data['equipment_ap']) @@ -531,11 +452,14 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment print("failed to create AP Profile") ap_ssh = get_apnos(get_configuration['access_point'][0], pwd="../libs/apnos/") + # ssid_names = [] + # for i in instantiate_profile.profile_creation_ids["ssid"]: + # ssid_names.append(instantiate_profile.get_ssid_name_by_profile_id(profile_id=i)) + # ssid_names.sort() ssid_names = [] - for i in instantiate_profile.profile_creation_ids["ssid"]: - ssid_names.append(instantiate_profile.get_ssid_name_by_profile_id(profile_id=i)) + for i in lf_dut_data: + ssid_names.append(i["ssid_name"]) ssid_names.sort() - # This loop will check the VIF Config with cloud profile vif_config = [] test_cases['vifc'] = False @@ -573,30 +497,47 @@ def setup_profiles(request, setup_controller, testbed, setup_vlan, get_equipment ssid_info = ap_ssh.get_ssid_info() ssid_data = [] print(ssid_info) + band_mapping = ap_ssh.get_bssid_band_mapping() + print(band_mapping) + idx_mapping = {} for i in range(0, len(ssid_info)): if ssid_info[i][1] == "OPEN": ssid_info[i].append("") if ssid_info[i][1] == "OPEN": ssid = ["ssid_idx=" + str(i) + " ssid=" + ssid_info[i][3] + " security=OPEN" + " password=" + ssid_info[i][2] + " bssid=" + ssid_info[i][0]] + idx_mapping[str(i)] = [ssid_info[i][3], ssid_info[i][2], ssid_info[i][1], band_mapping[ssid_info[i][0]], + ssid_info[i][0]] + if ssid_info[i][1] == "WPA": ssid = ["ssid_idx=" + str(i) + " ssid=" + ssid_info[i][3] + " security=WPA" + " password=" + ssid_info[i][2] + " bssid=" + ssid_info[i][0]] + idx_mapping[str(i)] = [ssid_info[i][3], ssid_info[i][2], ssid_info[i][1], band_mapping[ssid_info[i][0]], + ssid_info[i][0]] if ssid_info[i][1] == "WPA2": ssid = ["ssid_idx=" + str(i) + " ssid=" + ssid_info[i][3] + " security=WPA2" + " password=" + ssid_info[i][2] + " bssid=" + ssid_info[i][0]] + idx_mapping[str(i)] = [ssid_info[i][3], ssid_info[i][2], ssid_info[i][1], band_mapping[ssid_info[i][0]], + ssid_info[i][0]] if ssid_info[i][1] == "WPA3_PERSONAL": ssid = ["ssid_idx=" + str(i) + " ssid=" + ssid_info[i][3] + " security=WPA3" + " password=" + ssid_info[i][2] + " bssid=" + ssid_info[i][0]] + idx_mapping[str(i)] = [ssid_info[i][3], ssid_info[i][2], ssid_info[i][1], band_mapping[ssid_info[i][0]], + ssid_info[i][0]] + if ssid_info[i][1] == "WPA | WPA2": ssid = ["ssid_idx=" + str(i) + " ssid=" + ssid_info[i][3] + " security=WPA|WPA2" + " password=" + ssid_info[i][2] + " bssid=" + ssid_info[i][0]] + idx_mapping[str(i)] = [ssid_info[i][3], ssid_info[i][2], ssid_info[i][1], band_mapping[ssid_info[i][0]], + ssid_info[i][0]] + if ssid_info[i][1] == "EAP-TTLS": ssid = ["ssid_idx=" + str(i) + " ssid=" + ssid_info[i][3] + " security=EAP-TTLS" + " password=" + ssid_info[i][2] + " bssid=" + ssid_info[i][0]] - + idx_mapping[str(i)] = [ssid_info[i][3], ssid_info[i][2], ssid_info[i][1], band_mapping[ssid_info[i][0]], + ssid_info[i][0]] ssid_data.append(ssid) - + lf_tools.dut_idx_mapping = idx_mapping # Add bssid password and security from iwinfo data # Format SSID Data in the below format # ssid_data = [ @@ -660,6 +601,7 @@ def get_vif_state(get_apnos, get_configuration): allure.attach(name="vif_state", body=str(vif_state)) yield vif_state + @pytest.fixture(scope="class") def get_vlan_list(get_apnos, get_configuration): ap_ssh = get_apnos(get_configuration['access_point'][0], pwd="../libs/apnos/") @@ -667,4 +609,3 @@ def get_vlan_list(get_apnos, get_configuration): vlan_list.sort() allure.attach(name="vlan_list", body=str(vlan_list)) yield vlan_list - diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_bridge_mode.py index 80ac31500..ef117f2da 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_bridge_mode.py @@ -1,28 +1,28 @@ """ - Performance Test: Dataplane Throughput Test: Bridge Mode - pytest -m "dataplane_throughput_test and bridge" + Performance Test: Dataplane Throughput Test: BRIDGE Mode + pytest -m "dataplane_throughput_test and BRIDGE" """ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.bridge] #, pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, + pytest.mark.bridge, pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False } - -@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") +@allure.suite("performance") +@allure.feature("BRIDGE MODE Dataplane Throughput Test") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -30,17 +30,18 @@ setup_params_general = { scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestDataplaneThroughputBridge(object): - """Dataplane THroughput Bridge Mode - pytest -m "dataplane_throughput_test and bridge" +class TestDataplaneThroughputBRIDGE(object): + """Dataplane THroughput BRIDGE Mode + pytest -m "dataplane_throughput_test and BRIDGE" """ + @pytest.mark.wpa2_personal @pytest.mark.twog - def test_client_wpa2_personal_2g(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): - """Dataplane THroughput Bridge Mode - pytest -m "dataplane_throughput_test and bridge and wpa2_personal and twog" + def test_tcp_upd_2g_band(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """Dataplane THroughput BRIDGE Mode + pytest -m "dataplane_throughput_test and BRIDGE and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -62,15 +63,7 @@ class TestDataplaneThroughputBridge(object): instance_name="TIP_DPT_DPT_WPA2_2G_BRIDGE", vlan_id=vlan, dut_name=dut_name) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_dataplane") - print("Test Completed... Cleaning up Stations") + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") lf_test.Client_disconnect(station_name=station_names_twog) assert station else: @@ -78,10 +71,10 @@ class TestDataplaneThroughputBridge(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_client_wpa2_personal_5g(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): - """Dataplane THroughput Bridge Mode - pytest -m "dataplane_throughput_test and bridge and wpa2_personal and fiveg" + def test_tcp_upd_5g_band(self, get_vif_state, lf_tools, + lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): + """Dataplane THroughput BRIDGE Mode + pytest -m "dataplane_throughput_test and BRIDGE and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssid_name = profile_data["ssid_name"] @@ -99,19 +92,13 @@ class TestDataplaneThroughputBridge(object): station_name=station_names_fiveg, vlan_id=vlan) if station: - dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP_DPT_DPT_WPA2_5G_BRIDGE", - vlan_id=vlan, dut_name=dut_name) + dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, + instance_name="TIP_DPT_DPT_WPA2_5G_BRIDGE", + vlan_id=vlan, dut_name=dut_name) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/"+report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, name=get_configuration["access_point"][0]["model"] + "_dataplane") + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") print("Test Completed... Cleaning up Stations") lf_test.Client_disconnect(station_name=station_names_fiveg) assert station else: assert False - diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_nat_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_nat_mode.py index 922d94cf8..0983fbc44 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_nat_mode.py @@ -8,20 +8,22 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.nat, pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, + pytest.mark.nat, pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False } +@allure.suite("performance") +@allure.feature("BRIDGE MODE Dataplane Throughput Test") @allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', @@ -34,11 +36,12 @@ class TestDataplaneThroughputNAT(object): """Dataplane THroughput nat Mode pytest -m "dataplane_throughput_test and nat" """ + @pytest.mark.wpa2_personal @pytest.mark.twog - def test_client_wpa2_personal_2g(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + def test_tcp_upd_2g_band(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """Dataplane THroughput nat Mode pytest -m "dataplane_throughput_test and nat and wpa2_personal and twog" """ @@ -62,15 +65,7 @@ class TestDataplaneThroughputNAT(object): instance_name="TIP_DPT_DPT_WPA2_2G_NAT", vlan_id=vlan, dut_name=dut_name) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_dataplane") - print("Test Completed... Cleaning up Stations") + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") lf_test.Client_disconnect(station_name=station_names_twog) assert station else: @@ -78,8 +73,8 @@ class TestDataplaneThroughputNAT(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_client_wpa2_personal_5g(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): + def test_tcp_upd_5g_band(self, get_vif_state, lf_tools, + lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): """Dataplane THroughput nat Mode pytest -m "dataplane_throughput_test and nat and wpa2_personal and fiveg" """ @@ -99,19 +94,13 @@ class TestDataplaneThroughputNAT(object): station_name=station_names_fiveg, vlan_id=vlan) if station: - dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP_DPT_DPT_WPA2_5G_NAT", - vlan_id=vlan, dut_name=dut_name) + dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, + instance_name="TIP_DPT_DPT_WPA2_5G_NAT", + vlan_id=vlan, dut_name=dut_name) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/"+report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, name=get_configuration["access_point"][0]["model"] + "_dataplane") + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") print("Test Completed... Cleaning up Stations") lf_test.Client_disconnect(station_name=station_names_fiveg) assert station else: assert False - diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_vlan_mode.py index bcf0f876b..da7ac0081 100644 --- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/test_vlan_mode.py @@ -1,28 +1,29 @@ """ - Performance Test: Dataplane Throughput Test: vlan Mode - pytest -m "dataplane_throughput_test and vlan" + Performance Test: Dataplane Throughput Test: VLAN Mode + pytest -m "dataplane_throughput_test and VLAN" """ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.vlan, pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, + pytest.mark.vlan, pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something", "vlan": 100}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something", "vlan": 100}]}, "rf": {}, "radius": False } -@allure.feature("VLAN MODE CLIENT CONNECTIVITY") +@allure.suite("performance") +@allure.feature("VLAN MODE Dataplane Throughput Test") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -30,17 +31,25 @@ 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 vlan" + """Dataplane THroughput VLAN Mode + pytest -m "dataplane_throughput_test and VLAN" """ + @pytest.mark.wpa2_personal @pytest.mark.twog - def test_client_wpa2_personal_2g(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): - """Dataplane THroughput vlan Mode - pytest -m "dataplane_throughput_test and vlan and wpa2_personal and twog" + def test_tcp_upd_2g_band(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """Dataplane THroughput VLAN Mode + pytest -m "dataplane_throughput_test and VLAN and wpa2_personal and twog" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -62,15 +71,7 @@ class TestDataplaneThroughputVLAN(object): instance_name="TIP_DPT_DPT_WPA2_2G_VLAN", vlan_id=vlan, dut_name=dut_name) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_dataplane") - print("Test Completed... Cleaning up Stations") + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") lf_test.Client_disconnect(station_name=station_names_twog) assert station else: @@ -78,10 +79,10 @@ class TestDataplaneThroughputVLAN(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_client_wpa2_personal_5g(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): - """Dataplane THroughput vlan Mode - pytest -m "dataplane_throughput_test and vlan and wpa2_personal and fiveg" + def test_tcp_upd_5g_band(self, get_vif_state, lf_tools, + lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): + """Dataplane THroughput VLAN Mode + pytest -m "dataplane_throughput_test and VLAN and wpa2_personal and fiveg" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssid_name = profile_data["ssid_name"] @@ -100,18 +101,12 @@ class TestDataplaneThroughputVLAN(object): if station: dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, - instance_name="TIP_DPT_DPT_WPA2_5G_VLAN", vlan_id=vlan, dut_name=dut_name) + instance_name="TIP_DPT_DPT_WPA2_5G_VLAN", + vlan_id=vlan, dut_name=dut_name) report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/"+report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, name=get_configuration["access_point"][0]["model"] + "_dataplane") + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") print("Test Completed... Cleaning up Stations") lf_test.Client_disconnect(station_name=station_names_fiveg) assert station else: assert False - diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py index 7a30dec91..1f4a2aee7 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_bridge_mode.py @@ -1,6 +1,6 @@ """ - Dual Band Performance Test : Bridge Mode - pytest -m "dual_band_test and bridge" + Dual Band Performance Test : NAT Mode + pytest -m "performance and dual_band_test and nat" """ @@ -9,14 +9,15 @@ import os import allure import pytest -pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, - pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.performance_release]#, +# pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} + ]}, "rf": {}, "radius": False } @@ -31,37 +32,40 @@ setup_params_general = { indirect=True, scope="class" ) - @pytest.mark.usefixtures("setup_profiles") -class TestDualbandPerformanceBridge(object): +class TestDualbandPerformanceNat(object): """ - pytest -m "dual_band_test and bridge and open and twog and fiveg" + pytest -m "performance and dual_band_test and nat and wpa2_personal and twog and fiveg" """ - @pytest.mark.open + @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_open(self,get_vif_state,create_lanforge_chamberview_dut, lf_test,get_configuration): - profile_data = setup_params_general["ssid_modes"]["open"] + def test_client_wpa2_personal(self, get_vif_state, lf_tools, + create_lanforge_chamberview_dut, lf_test, get_configuration): + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 + print(lf_tools.dut_idx_mapping) + dut_5g = "" + dut_2g = "" + for i in lf_tools.dut_idx_mapping: + if lf_tools.dut_idx_mapping[i][3] == "5G": + dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": + dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_2g) if ssid_2G and ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") - dbpt_obj = lf_test.dualbandperformancetest(mode=mode,ssid_2G=ssid_2G,ssid_5G=ssid_5G, - instance_name="dbp_instance_open_bridge", - vlan_id=vlan, dut_name=dut_name) + dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + instance_name="dbp_instance_wpa2p_nat_p", + vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_dualbandperfomance") - + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") + assert True diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py index c7781f1b2..7ad7aac11 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_nat_mode.py @@ -1,6 +1,6 @@ """ Dual Band Performance Test : NAT Mode - pytest -m "dual_band_test and nat" + pytest -m "performance and dual_band_test and nat" """ @@ -9,14 +9,15 @@ import os import allure import pytest -pytestmark = [pytest.mark.dual_band_test, pytest.mark.nat, - pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.nat, pytest.mark.performance_release]#, +# pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "NAT", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} + ]}, "rf": {}, "radius": False } @@ -31,37 +32,40 @@ setup_params_general = { indirect=True, scope="class" ) - @pytest.mark.usefixtures("setup_profiles") class TestDualbandPerformanceNat(object): """ - pytest -m "dual_band_test and nat and open and twog and fiveg" + pytest -m "performance and dual_band_test and nat and wpa2_personal and twog and fiveg" """ - @pytest.mark.open + @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_open(self,get_vif_state,create_lanforge_chamberview_dut, lf_test,get_configuration): - profile_data = setup_params_general["ssid_modes"]["open"] + def test_client_wpa2_personal(self, get_vif_state, lf_tools, + create_lanforge_chamberview_dut, lf_test, get_configuration): + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "NAT" vlan = 1 + print(lf_tools.dut_idx_mapping) + dut_5g = "" + dut_2g = "" + for i in lf_tools.dut_idx_mapping: + if lf_tools.dut_idx_mapping[i][3] == "5G": + dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": + dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_2g) if ssid_2G and ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") - dbpt_obj = lf_test.dualbandperformancetest(mode=mode,ssid_2G=ssid_2G,ssid_5G=ssid_5G, - instance_name="dbp_instance_open_nat", - vlan_id=vlan, dut_name=dut_name) + dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + instance_name="dbp_instance_wpa2p_nat_p", + vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_dualbandperfomance") - + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") + assert True diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py index 5e1ada71c..5304b8cdf 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/open/test_vlan_mode.py @@ -1,6 +1,6 @@ """ Dual Band Performance Test : VLAN Mode - pytest -m "dual_band_test and vlan" + pytest -m "performance and dual_band_test and VLAN" """ @@ -9,14 +9,15 @@ import os import allure import pytest -pytestmark = [pytest.mark.dual_band_test, pytest.mark.vlan, - pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release]#, +# pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} + ]}, "rf": {}, "radius": False } @@ -31,42 +32,40 @@ setup_params_general = { indirect=True, scope="class" ) -@pytest.mark.parametrize( - "create_vlan", - [setup_params_general], - indirect=True, - scope="class" -) - -@pytest.mark.usefixtures("setup_profiles","create_vlan") -class TestDualbandPerformanceVlan(object): +@pytest.mark.usefixtures("setup_profiles") +class TestDualbandPerformanceVLAN(object): """ - pytest -m "dual_band_test and vlan and open and twog and fiveg" + pytest -m "performance and dual_band_test and VLAN and wpa2_personal and twog and fiveg" """ - @pytest.mark.open + @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_open(self,get_vif_state,create_lanforge_chamberview_dut, lf_test,get_configuration): - profile_data = setup_params_general["ssid_modes"]["open"] + def test_client_wpa2_personal(self, get_vif_state, lf_tools, + create_lanforge_chamberview_dut, lf_test, get_configuration): + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "VLAN" vlan = 100 + print(lf_tools.dut_idx_mapping) + dut_5g = "" + dut_2g = "" + for i in lf_tools.dut_idx_mapping: + if lf_tools.dut_idx_mapping[i][3] == "5G": + dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": + dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_2g) if ssid_2G and ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") - dbpt_obj = lf_test.dualbandperformancetest(mode=mode,ssid_2G=ssid_2G,ssid_5G=ssid_5G, - instance_name="dbp_instance_open_vlan", - vlan_id=vlan, dut_name=dut_name) + dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, + instance_name="dbp_instance_wpa2p_VLAN_p", + vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_dualbandperfomance") + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") + assert True diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py index cab1c47e5..7e5ff5cd4 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py @@ -1,6 +1,6 @@ """ - Dual Band Performance Test : Bridge Mode - pytest -m "performance and dual_band_test and bridge" + Dual Band Performance Test : NAT Mode + pytest -m "performance and dual_band_test and nat" """ @@ -9,16 +9,15 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance,pytest.mark.dual_band_test, pytest.mark.bridge, - pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, + pytest.mark.single_station_dual_band_throughput, pytest.mark.usefixtures("setup_test_run")] setup_params_general = { - "mode": "BRIDGE", + "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} + ]}, "rf": {}, "radius": False } @@ -33,36 +32,40 @@ setup_params_general = { indirect=True, scope="class" ) - @pytest.mark.usefixtures("setup_profiles") -class TestDualbandPerformanceBridge(object): +class TestDualbandPerformanceNat(object): """ - pytest -m "performance and dual_band_test and bridge and wpa2_personal and twog and fiveg" + pytest -m "performance and dual_band_test and nat and wpa2_personal and twog and fiveg" """ + @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa2_personal(self,get_vif_state,create_lanforge_chamberview_dut,lf_test,get_configuration): + def test_client_wpa2_personal(self, get_vif_state, lf_tools, + create_lanforge_chamberview_dut, lf_test, get_configuration): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "BRIDGE" vlan = 1 + print(lf_tools.dut_idx_mapping) + dut_5g = "" + dut_2g = "" + for i in lf_tools.dut_idx_mapping: + if lf_tools.dut_idx_mapping[i][3] == "5G": + dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": + dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_2g) if ssid_2G and ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpa2p_bridge", - vlan_id=vlan, dut_name=dut_name) + instance_name="dbp_instance_wpa2p_nat_p", + vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_dualbandperfomance") - + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") + assert True diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py index c91135faf..855069a09 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_nat_mode.py @@ -9,16 +9,15 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance,pytest.mark.dual_band_test, pytest.mark.nat, - pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.nat, + pytest.mark.single_station_dual_band_throughput, pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} + ]}, "rf": {}, "radius": False } @@ -33,37 +32,40 @@ setup_params_general = { indirect=True, scope="class" ) - @pytest.mark.usefixtures("setup_profiles") class TestDualbandPerformanceNat(object): - """ pytest -m "performance and dual_band_test and nat and wpa2_personal and twog and fiveg" """ + @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa2_personal(self,get_vif_state,create_lanforge_chamberview_dut,lf_test,get_configuration): + def test_client_wpa2_personal(self, get_vif_state, lf_tools, + create_lanforge_chamberview_dut, lf_test, get_configuration): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "NAT" vlan = 1 + print(lf_tools.dut_idx_mapping) + dut_5g = "" + dut_2g = "" + for i in lf_tools.dut_idx_mapping: + if lf_tools.dut_idx_mapping[i][3] == "5G": + dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": + dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_2g) if ssid_2G and ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpa2p_nat", - vlan_id=vlan, dut_name=dut_name) + instance_name="dbp_instance_wpa2p_nat_p", + vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_dualbandperfomance") - + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") + assert True diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_vlan_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_vlan_mode.py index 8cb708957..d545ee00e 100644 --- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_vlan_mode.py @@ -1,6 +1,6 @@ """ Dual Band Performance Test : VLAN Mode - pytest -m "performance and dual_band_test and vlan" + pytest -m "performance and dual_band_test and VLAN" """ @@ -9,16 +9,15 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance,pytest.mark.dual_band_test, pytest.mark.vlan, - pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.vlan]#, +# pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} + ]}, "rf": {}, "radius": False } @@ -33,43 +32,40 @@ setup_params_general = { indirect=True, scope="class" ) -@pytest.mark.parametrize( - "create_vlan", - [setup_params_general], - indirect=True, - scope="class" -) - -@pytest.mark.usefixtures("setup_profiles","create_vlan") -class TestDualbandPerformanceVlan(object): - +@pytest.mark.usefixtures("setup_profiles") +class TestDualbandPerformanceVLAN(object): """ - pytest -m "dual_band_test and vlan and wpa2_personal and twog and fiveg" + pytest -m "performance and dual_band_test and VLAN and wpa2_personal and twog and fiveg" """ + @pytest.mark.wpa2_personal @pytest.mark.twog @pytest.mark.fiveg - def test_client_wpa2_personal(self,get_vif_state,create_lanforge_chamberview_dut,lf_test,get_configuration): + def test_client_wpa2_personal(self, get_vif_state, lf_tools, + create_lanforge_chamberview_dut, lf_test, get_configuration): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[1]["ssid_name"] + ssid_5G = profile_data[0]["ssid_name"] dut_name = create_lanforge_chamberview_dut mode = "VLAN" vlan = 100 + print(lf_tools.dut_idx_mapping) + dut_5g = "" + dut_2g = "" + for i in lf_tools.dut_idx_mapping: + if lf_tools.dut_idx_mapping[i][3] == "5G": + dut_5g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_5g) + if lf_tools.dut_idx_mapping[i][3] == "2G": + dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4] + print(dut_2g) if ssid_2G and ssid_5G not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE") dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G, - instance_name="dbp_instance_wpa2p_vlan", - vlan_id=vlan, dut_name=dut_name) + instance_name="dbp_instance_wpa2p_VLAN_p", + vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_dualbandperfomance") - + lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") + assert True diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_bridge_mode.py index 6418c2eee..21989fc6f 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_bridge_mode.py @@ -17,14 +17,14 @@ pytestmark = [pytest.mark.throughput_benchmark_test, pytest.mark.bridge] # pytes setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is20MHz"}, @@ -599,14 +599,14 @@ class TestThroughputUnderCombinationsBridge20MHz(object): setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is80MHz"}, @@ -1197,14 +1197,14 @@ class TestThroughputUnderCombinationsBridge80MHz(object): setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is160MHz"}, diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_nat_mode.py index cb3284f72..0d7e67c4e 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_nat_mode.py @@ -17,14 +17,14 @@ pytestmark = [pytest.mark.throughput_benchmark_test, pytest.mark.nat] # pytest.m setup_params_general = { "mode": "NAT", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is20MHz"}, @@ -599,14 +599,14 @@ class TestThroughputUnderCombinationsnat20MHz(object): setup_params_general = { "mode": "NAT", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is80MHz"}, @@ -1197,14 +1197,14 @@ class TestThroughputUnderCombinationsnat80MHz(object): setup_params_general = { "mode": "NAT", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is160MHz"}, diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_vlan_mode.py index 2d16ac88b..117339383 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_vlan_mode.py @@ -17,14 +17,14 @@ pytestmark = [pytest.mark.throughput_benchmark_test, pytest.mark.vlan, pytest.ma setup_params_general = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"],"vlan":100}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something", "vlan": 125}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"],"vlan":100}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something", "vlan": 125}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something","vlan": 150}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something","vlan": 150}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is20MHz"}, @@ -609,14 +609,14 @@ class TestThroughputUnderCombinationsVlan20MHz(object): setup_params_general = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something","vlan": 100}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something","vlan": 100}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something","vlan": 100}]}, "rf": { "is5GHz": {"channelBandwidth": "is80MHz"}, @@ -1215,14 +1215,14 @@ class TestThroughputUnderCombinationsVLAN80MHz(object): setup_params_general = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something","vlan": 100}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something","vlan": 100}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something","vlan": 100}]}, "rf": { "is5GHz": {"channelBandwidth": "is160MHz"}, diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_bridge_mode.py index a10e74001..b3d0dcdf0 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_bridge_mode.py @@ -20,8 +20,8 @@ setup_params_general_20Mhz = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is20MHz"}, @@ -134,8 +134,8 @@ setup_params_general_40Mhz = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is40MHz"}, @@ -247,8 +247,8 @@ setup_params_general_80Mhz = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is80MHz"}, @@ -361,8 +361,8 @@ setup_params_general_160Mhz = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is160MHz"}, diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_nat_mode.py index 76eafa008..4f35f2ca4 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_nat_mode.py @@ -15,8 +15,8 @@ setup_params_general_20Mhz = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is20MHz"}, @@ -129,8 +129,8 @@ setup_params_general_40Mhz = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is40MHz"}, @@ -242,8 +242,8 @@ setup_params_general_80Mhz = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is80MHz"}, @@ -356,8 +356,8 @@ setup_params_general_160Mhz = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is160MHz"}, diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_vlan_mode.py index f5660474e..6571551a5 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_vlan_mode.py @@ -15,8 +15,8 @@ setup_params_general_20Mhz = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is20MHz"}, @@ -129,8 +129,8 @@ setup_params_general_40Mhz = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is40MHz"}, @@ -242,8 +242,8 @@ setup_params_general_80Mhz = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is80MHz"}, @@ -356,8 +356,8 @@ setup_params_general_160Mhz = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": { "is5GHz": {"channelBandwidth": "is160MHz"}, diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_bridge_mode.py index fbc5d6f55..f9c0e2cc6 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_bridge_mode.py @@ -14,8 +14,8 @@ pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.Bridge, pytest.mark.ope setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": False } @@ -318,8 +318,8 @@ class TestThroughputVsPktBridge2G(object): setup_params_5g = { "mode": "BRIDGE", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": False } diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_nat_mode.py index d5e4358ef..e3a608674 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_nat_mode.py @@ -14,8 +14,8 @@ pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.nat, pytest.mark.open, setup_params_general = { "mode": "NAT", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": False } @@ -312,8 +312,8 @@ class TestThroughputVsPktNatOpen2G(object): setup_params_5g = { "mode": "NAT", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": False } diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_vlan_mode.py index cc91169fd..3505c0be8 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_vlan_mode.py @@ -14,8 +14,8 @@ pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.vlan, pytest.mark.open, setup_params_general = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": False @@ -315,8 +315,8 @@ class TestThroughputVsPktVlanOpen2G(object): setup_params_5g = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": False } diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_bridge_mode.py index 6a1ffc2e9..4e26faa56 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_bridge_mode.py @@ -15,8 +15,8 @@ setup_params_general = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -322,8 +322,8 @@ setup_params_5g = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_nat_mode.py index 9ac02660c..bfe4d971b 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_nat_mode.py @@ -15,8 +15,8 @@ setup_params_general = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -79,8 +79,8 @@ setup_params_general_5g = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_vlan_mode.py index b19562e20..1a807a7b0 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_vlan_mode.py @@ -15,8 +15,8 @@ setup_params_general = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -79,8 +79,8 @@ setup_params_general_5g = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_bridge_mode.py index d14343151..a67dfbb62 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_bridge_mode.py @@ -15,8 +15,8 @@ setup_params_general = { "mode": "BRIDGE", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, @@ -323,8 +323,8 @@ setup_params_5g = { "mode": "BRIDGE", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_nat_mode.py index be077a2f7..2196fe2fc 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_nat_mode.py @@ -15,8 +15,8 @@ setup_params_general = { "mode": "NAT", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, @@ -324,8 +324,8 @@ setup_params_5g = { "mode": "NAT", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_vlan_mode.py index 55349300e..d6364140b 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_vlan_mode.py @@ -15,8 +15,8 @@ setup_params_general = { "mode": "VLAN", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, @@ -322,8 +322,8 @@ setup_params_5g = { "mode": "VLAN", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_bridge_mode.py index fc11487dc..ed14b3b27 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_bridge_mode.py @@ -14,8 +14,8 @@ pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.bridge] setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -321,8 +321,8 @@ class TestThroughputVsPktBridgeWpa2G(object): setup_params_5g = { "mode": "BRIDGE", "ssid_modes": { - "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_nat_mode.py index 7a069b654..41af82f4a 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_nat_mode.py @@ -14,8 +14,8 @@ pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.nat, pytest.mark.wpa, setup_params_general = { "mode": "NAT", "ssid_modes": { - "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, @@ -323,8 +323,8 @@ class TestThroughputVsPktNatAWpa2G(object): setup_params_5g = { "mode": "NAT", "ssid_modes": { - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_vlan_mode.py index 4a85c3f3d..922a49b5b 100644 --- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_vlan_mode.py @@ -14,8 +14,8 @@ pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.vlan, pytest.mark.wpa, setup_params_general = { "mode": "VLAN", "ssid_modes": { - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, @@ -322,8 +322,8 @@ class TestThroughputVsPktVlanWpa2G(object): setup_params_5g = { "mode": "VLAN", "ssid_modes": { - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py index 429f1e5d4..ea8726cdc 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_bridge_mode.py @@ -8,16 +8,17 @@ import os import pytest import allure -pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.bridge, - pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.wifi_capacity_test, pytest.mark.bridge] +# """pytest.mark.usefixtures("setup_test_run")"""] -setup_params_general = { + +setup_params_general_dual_band = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something"} + ] + }, "rf": {}, "radius": False } @@ -26,90 +27,390 @@ setup_params_general = { @allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', - [setup_params_general], + [setup_params_general_dual_band], indirect=True, scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestWifiCapacityBridgeMode(object): +@pytest.mark.wpa2_personal +@pytest.mark.twog +@pytest.mark.fiveg +@pytest.mark.dual_band +class TestWifiCapacityBridgeModeDualBand(object): """ Wifi Capacity Test Bridge mode pytest -m "wifi_capacity_test and bridge" """ - @pytest.mark.wpa2_personal - @pytest.mark.twog - def test_client_wpa2_bridge_2g(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + @pytest.mark.tcp_download + def test_client_wpa2_bridge_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test Bridge mode pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] - security = "wpa2" mode = "BRIDGE" - security_key = profile_data["security_key"] - band = "twog" vlan = 1 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, - mode=mode, band=band, - station_name=station_names_twog, vlan_id=vlan) - if station: - wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_twog[0], - instance_name="test_wct_wpa2_bridge", mode=mode, vlan_id=vlan) - report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_wifi_capacity_test") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_twog) - assert station - else: - assert False + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="TCP-IPv4", duration="60000") - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - def test_client_wpa2_bridge_5gg(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration): + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_download + def test_client_wpa2_bridge_udp_dl(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and fiveg" + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] - security = "wpa2" mode = "BRIDGE" - security_key = profile_data["security_key"] - band = "fiveg" vlan = 1 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, - mode=mode, band=band, - station_name=station_names_fiveg, vlan_id=vlan) - if station: - wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_fiveg[0], - instance_name="test_wct_wpa2_bridge", mode=mode, vlan_id=vlan) - report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_wifi_capacity_test") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - assert station - else: - assert False + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.tcp_bidirectional + def test_client_wpa2_bridge_tcp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_bidirectional + def test_client_wpa2_bridge_udp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + +setup_params_general_2G = { + "mode": "BRIDGE", + "ssid_modes": { + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"} + ] + }, + "rf": {}, + "radius": False +} + + +@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") +@pytest.mark.parametrize( + 'setup_profiles', + [setup_params_general_2G], + indirect=True, + scope="class" +) +@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.wpa2_personal +@pytest.mark.twog +@pytest.mark.fiveg_band +class TestWifiCapacityBridgeMode2G(object): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge" + """ + + @pytest.mark.tcp_download + def test_client_wpa2_bridge_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_download + def test_client_wpa2_bridge_udp_dl(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.tcp_bidirectional + def test_client_wpa2_bridge_tcp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_bidirectional + def test_client_wpa2_bridge_udp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + +setup_params_general_5G = { + "mode": "BRIDGE", + "ssid_modes": { + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is5GHz"], "security_key": "something"} + ] + }, + "rf": {}, + "radius": False +} + + +@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") +@pytest.mark.parametrize( + 'setup_profiles', + [setup_params_general_5G], + indirect=True, + scope="class" +) +@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.wpa2_personal +@pytest.mark.fiveg +@pytest.mark.fiveg_band +class TestWifiCapacityBridgeMode5G(object): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge" + """ + + @pytest.mark.tcp_download + def test_client_wpa2_bridge_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_download + def test_client_wpa2_bridge_udp_dl(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.tcp_bidirectional + def test_client_wpa2_bridge_tcp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_tcp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_bidirectional + def test_client_wpa2_bridge_udp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test Bridge mode + pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "BRIDGE" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_bridge_udp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_nat_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_nat_mode.py index f9189d280..03ae13df3 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_nat_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_nat_mode.py @@ -1,23 +1,24 @@ """ - Performance Test: Wifi Capacity Test : Bridge Mode - pytest -m "wifi_capacity_test and bridge" + Performance Test: Wifi Capacity Test : NAT Mode + pytest -m "wifi_capacity_test and NAT" """ import os import pytest import allure -pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.nat, - pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.wifi_capacity_test, pytest.mark.nat] +# """pytest.mark.usefixtures("setup_test_run")"""] -setup_params_general = { + +setup_params_general_dual_band = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something"} + ] + }, "rf": {}, "radius": False } @@ -26,90 +27,413 @@ setup_params_general = { @allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', - [setup_params_general], + [setup_params_general_dual_band], indirect=True, scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestWifiCapacityNATMode(object): +@pytest.mark.wpa2_personal +@pytest.mark.twog +@pytest.mark.fiveg +@pytest.mark.dual_band +@pytest.mark.performance_release +class TestWifiCapacityNATModeDualBand(object): """ Wifi Capacity Test NAT mode pytest -m "wifi_capacity_test and NAT" """ - @pytest.mark.wpa2_personal - @pytest.mark.twog - def test_client_wpa2_NAT_2g(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + @pytest.mark.tcp_download + def test_client_wpa2_NAT_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test NAT mode pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] - security = "wpa2" mode = "NAT" - security_key = profile_data["security_key"] - band = "twog" vlan = 1 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, - mode=mode, band=band, - station_name=station_names_twog, vlan_id=vlan) - if station: - wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_twog[0], - instance_name="test_wct_wpa2_NAT", mode=mode, vlan_id=vlan) - report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_wifi_capacity_test") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_twog) - assert station - else: - assert False + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="TCP-IPv4", duration="60000") - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - def test_client_wpa2_NAT_5gg(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration): + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_download + def test_client_wpa2_NAT_udp_dl(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): """ Wifi Capacity Test NAT mode - pytest -m "wifi_capacity_test and NAT and wpa2_personal and fiveg" + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] - security = "wpa2" mode = "NAT" - security_key = profile_data["security_key"] - band = "fiveg" vlan = 1 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, - mode=mode, band=band, - station_name=station_names_fiveg, vlan_id=vlan) - if station: - wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_fiveg[0], - instance_name="test_wct_wpa2_NAT", mode=mode, vlan_id=vlan) - report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_wifi_capacity_test") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - assert station - else: - assert False + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.tcp_bidirectional + def test_client_wpa2_NAT_tcp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_bidirectional + def test_client_wpa2_NAT_udp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True + + +setup_params_general_2G = { + "mode": "NAT", + "ssid_modes": { + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"} + ] + }, + "rf": {}, + "radius": False +} + + +@allure.feature("NAT MODE CLIENT CONNECTIVITY") +@pytest.mark.parametrize( + 'setup_profiles', + [setup_params_general_2G], + indirect=True, + scope="class" +) +@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.wpa2_personal +@pytest.mark.twog +@pytest.mark.fiveg_band +class TestWifiCapacityNATMode2G(object): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT" + """ + + @pytest.mark.tcp_download + def test_client_wpa2_NAT_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_download + def test_client_wpa2_NAT_udp_dl(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.tcp_bidirectional + def test_client_wpa2_NAT_tcp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_bidirectional + def test_client_wpa2_NAT_udp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True + + +setup_params_general_5G = { + "mode": "NAT", + "ssid_modes": { + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is5GHz"], "security_key": "something"} + ] + }, + "rf": {}, + "radius": False +} + + +@allure.feature("NAT MODE CLIENT CONNECTIVITY") +@pytest.mark.parametrize( + 'setup_profiles', + [setup_params_general_5G], + indirect=True, + scope="class" +) +@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.wpa2_personal +@pytest.mark.fiveg +@pytest.mark.fiveg_band +class TestWifiCapacityNATMode5G(object): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT" + """ + + @pytest.mark.tcp_download + def test_client_wpa2_NAT_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_download + def test_client_wpa2_NAT_udp_dl(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.tcp_bidirectional + def test_client_wpa2_NAT_tcp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_bidirectional + def test_client_wpa2_NAT_udp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test NAT mode + pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "NAT" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphss(report_name=report_name) + lf_tools.reset_scenario() + + print("Test Completed... Cleaning up Stations") + assert True diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_vlan_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_vlan_mode.py index 3fec9b77d..3e2b8064f 100644 --- a/tests/e2e/basic/performance_tests/wifi_capacity_test/test_vlan_mode.py +++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/test_vlan_mode.py @@ -1,23 +1,24 @@ """ Performance Test: Wifi Capacity Test : VLAN Mode - pytest -m "wifi_capacity_test and VLAN" + pytest -m "wifi_capacity_test and vlan" """ import os import pytest import allure -pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.vlan, - pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.vlan] +# """pytest.mark.usefixtures("setup_test_run")"""] -setup_params_general = { + +setup_params_general_dual_band = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], - "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something"} + ] + }, "rf": {}, "radius": False } @@ -26,90 +27,390 @@ setup_params_general = { @allure.feature("VLAN MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', - [setup_params_general], + [setup_params_general_dual_band], indirect=True, scope="class" ) @pytest.mark.usefixtures("setup_profiles") -class TestWifiCapacityVLANMode(object): - """ Wifi Capacity Test vlan mode - pytest -m "wifi_capacity_test and vlan" +@pytest.mark.wpa2_personal +@pytest.mark.twog +@pytest.mark.fiveg +@pytest.mark.dual_band +class TestWifiCapacityVLANModeDualBand(object): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN" """ - @pytest.mark.wpa2_personal - @pytest.mark.twog - def test_client_wpa2_VLAN_2g(self, get_vif_state, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): - """ Wifi Capacity Test vlan mode - pytest -m "wifi_capacity_test and vlan and wpa2_personal and twog" + @pytest.mark.tcp_download + def test_client_wpa2_VLAN_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] - security = "wpa2" mode = "VLAN" - security_key = profile_data["security_key"] - band = "twog" vlan = 1 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, - mode=mode, band=band, - station_name=station_names_twog, vlan_id=vlan) - if station: - wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_twog[0], - instance_name="test_wct_wpa2_vlan", mode=mode, vlan_id=vlan) - report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_wifi_capacity_test") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_twog) - assert station - else: - assert False + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="TCP-IPv4", duration="60000") - @pytest.mark.wpa2_personal - @pytest.mark.fiveg - def test_client_wpa2_vlan_5gg(self, get_vif_state, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, - get_configuration): - """ Wifi Capacity Test vlan mode - pytest -m "wifi_capacity_test and vlan and wpa2_personal and fiveg" + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_download + def test_client_wpa2_VLAN_udp_dl(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" """ - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] - security = "wpa2" mode = "VLAN" - security_key = profile_data["security_key"] - band = "fiveg" vlan = 1 if ssid_name not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, - mode=mode, band=band, - station_name=station_names_fiveg, vlan_id=vlan) - if station: - wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_fiveg[0], - instance_name="test_wct_wpa2_vlan", mode=mode, vlan_id=vlan) - report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - entries = os.listdir("../reports/" + report_name + '/') - pdf = False - for i in entries: - if ".pdf" in i: - pdf = i - if pdf: - allure.attach.file(source="../reports/" + report_name + "/" + pdf, - name=get_configuration["access_point"][0]["model"] + "_wifi_capacity_test") - print("Test Completed... Cleaning up Stations") - lf_test.Client_disconnect(station_name=station_names_fiveg) - assert station - else: - assert False + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.tcp_bidirectional + def test_client_wpa2_VLAN_tcp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_bidirectional + def test_client_wpa2_VLAN_udp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + +setup_params_general_2G = { + "mode": "VLAN", + "ssid_modes": { + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"} + ] + }, + "rf": {}, + "radius": False +} + + +@allure.feature("VLAN MODE CLIENT CONNECTIVITY") +@pytest.mark.parametrize( + 'setup_profiles', + [setup_params_general_2G], + indirect=True, + scope="class" +) +@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.wpa2_personal +@pytest.mark.twog +@pytest.mark.fiveg_band +class TestWifiCapacityVLANMode2G(object): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN" + """ + + @pytest.mark.tcp_download + def test_client_wpa2_VLAN_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_download + def test_client_wpa2_VLAN_udp_dl(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.tcp_bidirectional + def test_client_wpa2_VLAN_tcp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_bidirectional + def test_client_wpa2_VLAN_udp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_2G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + +setup_params_general_5G = { + "mode": "VLAN", + "ssid_modes": { + "wpa2_personal": [ + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is5GHz"], "security_key": "something"} + ] + }, + "rf": {}, + "radius": False +} + + +@allure.feature("VLAN MODE CLIENT CONNECTIVITY") +@pytest.mark.parametrize( + 'setup_profiles', + [setup_params_general_5G], + indirect=True, + scope="class" +) +@pytest.mark.usefixtures("setup_profiles") +@pytest.mark.wpa2_personal +@pytest.mark.fiveg +@pytest.mark.fiveg_band +class TestWifiCapacityVLANMode5G(object): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN" + """ + + @pytest.mark.tcp_download + def test_client_wpa2_VLAN_tcp_dl(self, get_vif_state, lf_tools, setup_profiles, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_download + def test_client_wpa2_VLAN_udp_dl(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_dl", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="0", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.tcp_bidirectional + def test_client_wpa2_VLAN_tcp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True + + @pytest.mark.udp_bidirectional + def test_client_wpa2_VLAN_udp_bidirectional(self, get_vif_state, lf_tools, + lf_test, station_names_twog, create_lanforge_chamberview_dut, + get_configuration): + """ Wifi Capacity Test VLAN mode + pytest -m "wifi_capacity_test and VLAN and wpa2_personal and twog" + """ + profile_data = setup_params_general_5G["ssid_modes"]["wpa2_personal"][0] + ssid_name = profile_data["ssid_name"] + mode = "VLAN" + vlan = 1 + if ssid_name not in get_vif_state: + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name) + lf_tools.Chamber_View() + wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_bi", mode=mode, vlan_id=vlan, + download_rate="1Gbps", + upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000") + + report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] + + lf_tools.attach_report_graphs(report_name=report_name) + print("Test Completed... Cleaning up Stations") + assert True diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_tls.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_tls.py index 87c8716fa..466eb3b5c 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_tls.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_tls.py @@ -8,14 +8,14 @@ # "mode": "BRIDGE", # "ssid_modes": { # "wpa_enterprise": [ -# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, # # "rf": {}, # "radius": True @@ -219,14 +219,14 @@ # "mode": "BRIDGE", # "ssid_modes": { # "wpa_enterprise": [ -# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, # # "rf": {}, # "radius": True diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py index 2e20321b4..02d3ce7b5 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_enterprise_ttls.py @@ -10,14 +10,14 @@ setup_params_enterprise = { "mode": mode, "ssid_modes": { "wpa_enterprise": [ - {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": True @@ -264,11 +264,11 @@ setup_params_enterprise_two = { "mode": mode, "ssid_modes": { "wpa_wpa2_enterprise_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] }, "rf": {}, "radius": True diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py index afb702353..829e52f32 100644 --- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py +++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py @@ -16,14 +16,14 @@ pytestmark = [pytest.mark.client_connectivity, pytest.mark.bridge, pytest.mark.g setup_params_general = { "mode": mode, "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -260,16 +260,16 @@ setup_params_general_two = { "mode": mode, "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}] }, "rf": {}, @@ -509,9 +509,9 @@ class TestbridgeModeConnectivitySuiteB(object): # setup_params_wep = { # "mode": "BRIDGE", # "ssid_modes": { -# "wep": [ {"ssid_name": "ssid_wep_2g", "appliedRadios": ["is2dot4GHz"], "default_key_id": 1, +# "wep": [ {"ssid_name": "ssid_wep_2g", "appliedRadios": ["2G"], "default_key_id": 1, # "wep_key": 1234567890}, -# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], +# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["5G"], # "default_key_id": 1, "wep_key": 1234567890}] # }, # "rf": {}, diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_tls.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_tls.py index 574e05e18..fb901b6fa 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_tls.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_tls.py @@ -7,14 +7,14 @@ # "mode": "NAT", # "ssid_modes": { # "wpa_enterprise": [ -# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, # # "rf": {}, # "radius": True @@ -218,14 +218,14 @@ # "mode": "NAT", # "ssid_modes": { # "wpa_enterprise": [ -# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, # # "rf": {}, # "radius": True diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py index 8aac530cc..49bb6cee9 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_enterprise_ttls.py @@ -11,14 +11,14 @@ setup_params_enterprise = { "mode": mode, "ssid_modes": { "wpa_enterprise": [ - {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": True @@ -265,11 +265,11 @@ setup_params_enterprise_two = { "mode": mode, "ssid_modes": { "wpa_wpa2_enterprise_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] }, "rf": {}, "radius": True diff --git a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py index c2f734a27..00dd3a442 100644 --- a/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py +++ b/tests/e2e/basic/validation_of_operating_modes/nat_mode/client_connectivity/test_general_security_modes.py @@ -16,14 +16,14 @@ pytestmark = [pytest.mark.client_connectivity, pytest.mark.nat, pytest.mark.gene setup_params_general = { "mode": mode, "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -260,16 +260,16 @@ setup_params_general_two = { "mode": mode, "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}] }, "rf": {}, @@ -509,9 +509,9 @@ class TestNATModeConnectivitySuiteB(object): # setup_params_wep = { # "mode": "BRIDGE", # "ssid_modes": { -# "wep": [ {"ssid_name": "ssid_wep_2g", "appliedRadios": ["is2dot4GHz"], "default_key_id": 1, +# "wep": [ {"ssid_name": "ssid_wep_2g", "appliedRadios": ["2G"], "default_key_id": 1, # "wep_key": 1234567890}, -# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], +# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["5G"], # "default_key_id": 1, "wep_key": 1234567890}] # }, # "rf": {}, diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_tls.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_tls.py index 59246411d..34c5e3e58 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_tls.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_tls.py @@ -7,14 +7,14 @@ # "mode": "VLAN", # "ssid_modes": { # "wpa_enterprise": [ -# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, # # "rf": {}, # "radius": True @@ -218,14 +218,14 @@ # "mode": "VLAN", # "ssid_modes": { # "wpa_enterprise": [ -# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, # # "rf": {}, # "radius": True diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py index 9b0a8f0ef..02f9df09d 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_enterprise_ttls.py @@ -11,14 +11,14 @@ setup_params_enterprise = { "mode": mode, "ssid_modes": { "wpa_enterprise": [ - {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, "rf": {}, "radius": True @@ -265,11 +265,11 @@ setup_params_enterprise_two = { "mode": mode, "ssid_modes": { "wpa_wpa2_enterprise_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] }, "rf": {}, "radius": True diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py index 4ed6c6327..75d7b8e6a 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/client_connectivity/test_general_security_modes.py @@ -16,14 +16,14 @@ pytestmark = [pytest.mark.client_connectivity, pytest.mark.vlan, pytest.mark.gen setup_params_general = { "mode": mode, "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, "rf": {}, "radius": False @@ -260,16 +260,16 @@ setup_params_general_two = { "mode": mode, "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}] }, "rf": {}, @@ -509,9 +509,9 @@ class TestvlanModeConnectivitySuiteB(object): # setup_params_wep = { # "mode": "vlan", # "ssid_modes": { -# "wep": [ {"ssid_name": "ssid_wep_2g", "appliedRadios": ["is2dot4GHz"], "default_key_id": 1, +# "wep": [ {"ssid_name": "ssid_wep_2g", "appliedRadios": ["2G"], "default_key_id": 1, # "wep_key": 1234567890}, -# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], +# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["5G"], # "default_key_id": 1, "wep_key": 1234567890}] # }, # "rf": {}, diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/fiveg_radio/test_vlan_fiveg.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/fiveg_radio/test_vlan_fiveg.py index a3be95bcc..dfdf835cb 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/fiveg_radio/test_vlan_fiveg.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/fiveg_radio/test_vlan_fiveg.py @@ -10,21 +10,21 @@ import pytest setup_params_general = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "vlan": 100}], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"], "vlan": 100}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something", "vlan": 125}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something", "vlan": 200}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], "security_key": "something", "vlan": 150}], }, "rf": {}, diff --git a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/twog_radio/test_vlan_twog.py b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/twog_radio/test_vlan_twog.py index 94ac6d9d6..be89562fb 100644 --- a/tests/e2e/basic/validation_of_operating_modes/vlan_mode/twog_radio/test_vlan_twog.py +++ b/tests/e2e/basic/validation_of_operating_modes/vlan_mode/twog_radio/test_vlan_twog.py @@ -10,22 +10,22 @@ import pytest setup_params_general = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"], "vlan": 100}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"], "vlan": 100}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something", "vlan": 125}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something", "vlan": 125}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something", "vlan": 200}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something", "vlan": 200}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something", + {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something", "vlan": 150}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], "security_key": "something"}], }, "rf": {}, diff --git a/tests/e2e/interOp/android/AccessPointConnection/test_AccessPointConnection.py b/tests/e2e/interOp/android/AccessPointConnection/test_AccessPointConnection.py index 8577dc7dd..e09d164fc 100644 --- a/tests/e2e/interOp/android/AccessPointConnection/test_AccessPointConnection.py +++ b/tests/e2e/interOp/android/AccessPointConnection/test_AccessPointConnection.py @@ -18,7 +18,7 @@ pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.interop_and, if 'perfecto_libs' not in sys.path: sys.path.append(f'../libs/perfecto_libs') -from android_lib import closeApp, verifyUploadDownloadSpeed_android, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, setup_perfectoMobile_android +from android_lib import closeApp, verifyUploadDownloadSpeed_android, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp setup_params_general = { "mode": "NAT", @@ -46,15 +46,15 @@ class TestAcessPointConnection(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal def test_AccessPointConnection_5g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_android[1] @@ -75,13 +75,12 @@ class TestAcessPointConnection(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_AccessPointConnection_2g_WPA2_Personal(self,request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - + def test_AccessPointConnection_2g_WPA2_Personal(self,request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -105,13 +104,12 @@ class TestAcessPointConnection(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_AccessPointConnection_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - + def test_AccessPointConnection_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -136,12 +134,11 @@ class TestAcessPointConnection(object): @pytest.mark.twog @pytest.mark.wpa def test_AccessPointConnection_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) diff --git a/tests/e2e/interOp/android/AirplaneMode/test_ToggleAirplaneMode.py b/tests/e2e/interOp/android/AirplaneMode/test_ToggleAirplaneMode.py index 411a3d655..8d4b9fcc3 100644 --- a/tests/e2e/interOp/android/AirplaneMode/test_ToggleAirplaneMode.py +++ b/tests/e2e/interOp/android/AirplaneMode/test_ToggleAirplaneMode.py @@ -18,7 +18,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.ToggleAirplaneMode] -from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, setup_perfectoMobile_android +from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp setup_params_general = { "mode": "NAT", @@ -46,12 +46,11 @@ class TestToggleAirplaneModeAndroid(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal def test_ToogleAirplaneMode_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -72,13 +71,12 @@ class TestToggleAirplaneModeAndroid(object): @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ToogleAirplaneMode_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - + def test_ToogleAirplaneMode_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -99,13 +97,12 @@ class TestToggleAirplaneModeAndroid(object): @pytest.mark.fiveg @pytest.mark.wpa - def test_ToogleAirplaneMode_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - + def test_ToogleAirplaneMode_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -126,13 +123,12 @@ class TestToggleAirplaneModeAndroid(object): @pytest.mark.twog @pytest.mark.wpa - def test_ToogleAirplaneMode_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - + def test_ToogleAirplaneMode_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) diff --git a/tests/e2e/interOp/android/OpenRoamingPassPoint/test_OpenRoaming_BridgeMode.py b/tests/e2e/interOp/android/OpenRoamingPassPoint/test_OpenRoaming_BridgeMode.py index c26440b91..ebc58f34b 100644 --- a/tests/e2e/interOp/android/OpenRoamingPassPoint/test_OpenRoaming_BridgeMode.py +++ b/tests/e2e/interOp/android/OpenRoamingPassPoint/test_OpenRoaming_BridgeMode.py @@ -18,7 +18,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.openRoaming, pytest.mark.bridge] -from android_lib import closeApp, set_APconnMobileDevice_android, verify_APconnMobileDevice_Android, deleteOpenRoamingInstalledProfile, downloadInstallOpenRoamingProfile, verifyUploadDownloadSpeed_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, setup_perfectoMobile_android +from android_lib import closeApp, set_APconnMobileDevice_android, verify_APconnMobileDevice_Android, deleteOpenRoamingInstalledProfile, downloadInstallOpenRoamingProfile, verifyUploadDownloadSpeed_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp """ EAP Passpoint Test: BRIDGE Mode @@ -95,18 +95,13 @@ class TestOpenRoamingBridgeMode(object): downloadProfileSSID = setup_params_eap["ssid_modes"]["open"][0]["ssid_name"] downloadProfileSSIDPass = "" - #profileDownloadURL = passpoint_profile_info["profile_download_url_ios"] profileDownloadURL = "https://onboard.almondlabs.net/ttls/androidconfig.cfg" profileName = passpoint_profile_info["profile_name_on_device"] profileNameSSID = setup_params_eap["ssid_modes"]["wpa2_eap"][1]["ssid_name"] - #Delete Profile Under Settings deleteOpenRoamingInstalledProfile(request, profileName, setup_perfectoMobile_android, connData) - #ForgetWifi - #ForgetWifiConnection(request, setup_perfectoMobile_android, profileNameSSID, connData) - #Set Wifi/AP Mode set_APconnMobileDevice_android(request, downloadProfileSSID, downloadProfileSSIDPass, setup_perfectoMobile_android, connData) @@ -118,7 +113,6 @@ class TestOpenRoamingBridgeMode(object): try: verify_APconnMobileDevice_Android(request, profileNameSSID, setup_perfectoMobile_android, connData) - #Verify Upload download Speed from device Selection verifyUploadDownloadSpeed_android(request, setup_perfectoMobile_android, connData) @@ -172,12 +166,11 @@ class TestOpenRoamingBridgeMode(object): downloadProfileSSID = setup_params_eap["ssid_modes"]["open"][0]["ssid_name"] downloadProfileSSIDPass = "" - #profileDownloadURL = passpoint_profile_info["profile_download_url_ios"] profileDownloadURL = "https://onboard.almondlabs.net/ttls/androidconfig.cfg" profileName = passpoint_profile_info["profile_name_on_device"] profileNameSSID = setup_params_eap["ssid_modes"]["wpa2_eap"][1]["ssid_name"] - #Delete Profile Under Settings + #Delete Profile Under Settings deleteOpenRoamingInstalledProfile(request, profileName, setup_perfectoMobile_android, connData) #Set Wifi/AP Mode @@ -191,7 +184,6 @@ class TestOpenRoamingBridgeMode(object): try: verify_APconnMobileDevice_Android(request, profileName, setup_perfectoMobile_android, connData) - #Verify Upload download Speed from device Selection verifyUploadDownloadSpeed_android(request, setup_perfectoMobile_android, connData) @@ -211,7 +203,7 @@ class TestOpenRoamingBridgeMode(object): scope="function" ) @pytest.mark.usefixtures("push_ap_profile") - def test_wpa2_only_eap_2g(self, passpoint_profile_info, push_ap_profile, request, get_APToMobileDevice_data, setup_perfectoMobile_android): + def test_OpenRoaming_wpa2_only_eap_2g(self, passpoint_profile_info, push_ap_profile, request, get_APToMobileDevice_data, setup_perfectoMobile_android): """ EAP Passpoint BRIDGE Mode pytest -m "interop_iOS and eap_passpoint and bridge and wpa2_only_eap and twog" @@ -282,7 +274,7 @@ class TestOpenRoamingBridgeMode(object): scope="function" ) @pytest.mark.usefixtures("push_ap_profile") - def test_wpa2_only_eap_5g(self, passpoint_profile_info, push_ap_profile, request, get_APToMobileDevice_data, setup_perfectoMobile_android): + def test_OpenRoaming_wpa2_only_eap_5g(self, passpoint_profile_info, push_ap_profile, request, get_APToMobileDevice_data, setup_perfectoMobile_android): """ EAP Passpoint BRIDGE Mode pytest -m "interop_iOS and eap_passpoint and bridge and wpa2_only_eap and fiveg" @@ -311,7 +303,6 @@ class TestOpenRoamingBridgeMode(object): downloadProfileSSID = setup_params_eap["ssid_modes"]["open"][0]["ssid_name"] downloadProfileSSIDPass = "" - #profileDownloadURL = passpoint_profile_info["profile_download_url_ios"] profileDownloadURL = "https://onboard.almondlabs.net/ttls/androidconfig.cfg" profileName = passpoint_profile_info["profile_name_on_device"] profileNameSSID = setup_params_eap["ssid_modes"]["wpa2_eap"][1]["ssid_name"] @@ -319,9 +310,6 @@ class TestOpenRoamingBridgeMode(object): #Delete Profile Under Settings deleteOpenRoamingInstalledProfile(request, profileName, setup_perfectoMobile_android, connData) - #ForgetWifi - #ForgetWifiConnection(request, setup_perfectoMobile_android, profileNameSSID, connData) - #Set Wifi/AP Mode set_APconnMobileDevice_android(request, downloadProfileSSID, downloadProfileSSIDPass, setup_perfectoMobile_android, connData) @@ -333,7 +321,6 @@ class TestOpenRoamingBridgeMode(object): try: verify_APconnMobileDevice_Android(request, profileNameSSID, setup_perfectoMobile_android, connData) - #Verify Upload download Speed from device Selection verifyUploadDownloadSpeed_android(request, setup_perfectoMobile_android, connData) diff --git a/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py b/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py index fa591638b..eb12091c2 100644 --- a/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py +++ b/tests/e2e/interOp/android/PassPointConnection/test_PassPointConnection.py @@ -18,7 +18,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.PassPointConnection] -from android_lib import closeApp, set_APconnMobileDevice_android, verifyUploadDownloadSpeed_android, Toggle_WifiMode_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, setup_perfectoMobile_android +from android_lib import closeApp, set_APconnMobileDevice_android, verifyUploadDownloadSpeed_android, Toggle_WifiMode_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp setup_params_general = { "mode": "NAT", @@ -46,12 +46,11 @@ class TestPassPointConnection(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal def test_PassPointConnection_5g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -76,12 +75,11 @@ class TestPassPointConnection(object): @pytest.mark.twog @pytest.mark.wpa2_personal def test_PassPointConnection_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -106,12 +104,11 @@ class TestPassPointConnection(object): @pytest.mark.fiveg @pytest.mark.wpa def test_PassPointConnection_5g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -136,12 +133,11 @@ class TestPassPointConnection(object): @pytest.mark.twog @pytest.mark.wpa def test_PassPointConnection_2g_WPA(self, request, get_vif_state, get_ToggleAirplaneMode_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) diff --git a/tests/e2e/interOp/android/WifiMode/test_ToggleWifiMode.py b/tests/e2e/interOp/android/WifiMode/test_ToggleWifiMode.py index 3c36497c9..9f516e04f 100644 --- a/tests/e2e/interOp/android/WifiMode/test_ToggleWifiMode.py +++ b/tests/e2e/interOp/android/WifiMode/test_ToggleWifiMode.py @@ -18,7 +18,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.interop_and, pytest.mark.android, pytest.mark.ToggleWifiMode] -from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_WifiMode_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, setup_perfectoMobile_android +from android_lib import closeApp, set_APconnMobileDevice_android, Toggle_WifiMode_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp setup_params_general = { "mode": "NAT", @@ -45,13 +45,12 @@ class TestToggleWifiMode(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal - def test_ToogleWifiMode_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_android): - + def test_ToogleWifiMode_5g_WPA2_Personal(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -73,12 +72,11 @@ class TestToggleWifiMode(object): @pytest.mark.twog @pytest.mark.wpa2_personal def test_ToogleWifiMode_2g_WPA2_Personal(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -100,12 +98,11 @@ class TestToggleWifiMode(object): @pytest.mark.fiveg @pytest.mark.wpa def test_ToogleWifiMode_5g_WPA(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -126,13 +123,12 @@ class TestToggleWifiMode(object): @pytest.mark.twog @pytest.mark.wpa - def test_ToogleWifiMode_2g_WPA(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_android): - + def test_ToogleWifiMode_2g_WPA(self, request, get_vif_state, get_ToggleWifiMode_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) diff --git a/tests/e2e/interOp/android/client_connectivity/test_NatMode.py b/tests/e2e/interOp/android/client_connectivity/test_NatMode.py index a903be39f..7c71b855f 100644 --- a/tests/e2e/interOp/android/client_connectivity/test_NatMode.py +++ b/tests/e2e/interOp/android/client_connectivity/test_NatMode.py @@ -18,7 +18,7 @@ if 'perfecto_libs' not in sys.path: pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.android, pytest.mark.interop_and, pytest.mark.ClientConnectivity] -from android_lib import closeApp, set_APconnMobileDevice_android, verifyUploadDownloadSpeed_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp, setup_perfectoMobile_android +from android_lib import closeApp, set_APconnMobileDevice_android, verifyUploadDownloadSpeed_android, Toggle_AirplaneMode_android, ForgetWifiConnection, openApp setup_params_general = { "mode": "NAT", @@ -46,12 +46,11 @@ class TestNatMode(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal def test_ClientConnectivity_5g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -63,26 +62,26 @@ class TestNatMode(object): #Set Wifi/AP Mode set_APconnMobileDevice_android(request, ssidName, ssidPassword, setup_perfectoMobile_android, connData) - + #Verify Upload download Speed from device Selection assert verifyUploadDownloadSpeed_android(request, setup_perfectoMobile_android, connData) #ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) + @pytest.mark.twog @pytest.mark.wpa2_personal - def test_ClientConnectivity_2g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_android): - + def test_ClientConnectivity_2g_WPA2_Personal(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_android): profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: - allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) - pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") + allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) + pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") report = setup_perfectoMobile_android[1] driver = setup_perfectoMobile_android[0] @@ -97,15 +96,16 @@ class TestNatMode(object): #ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) + + @pytest.mark.twog @pytest.mark.wpa def test_ClientConnectivity_2g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -123,16 +123,15 @@ class TestNatMode(object): #ForgetWifi ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) - + @pytest.mark.fiveg @pytest.mark.wpa def test_ClientConnectivity_5g_WPA(self, request, get_vif_state, get_APToMobileDevice_data, setup_perfectoMobile_android): - profile_data = setup_params_general["ssid_modes"]["wpa"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -149,4 +148,4 @@ class TestNatMode(object): assert Toggle_AirplaneMode_android(request, setup_perfectoMobile_android, connData) #ForgetWifi - ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) \ No newline at end of file + ForgetWifiConnection(request, setup_perfectoMobile_android, ssidName, connData) diff --git a/tests/e2e/interOp/conftest.py b/tests/e2e/interOp/conftest.py index 0f6e6d2ad..e82a06ee8 100644 --- a/tests/e2e/interOp/conftest.py +++ b/tests/e2e/interOp/conftest.py @@ -39,167 +39,11 @@ from configuration import CONFIGURATION from urllib3 import exceptions -@pytest.fixture(scope="class") -def setup_perfectoMobileWeb(request): - from selenium import webdriver - rdriver = None - reporting_client = None - - warnings.simplefilter("ignore", ResourceWarning) - urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) - - capabilities = { - 'platformName': request.config.getini("platformName-iOS"), - 'model': request.config.getini("model-iOS"), - 'browserName': request.config.getini("browserType-iOS"), - 'securityToken' : request.config.getini("securityToken"), - } - - rdriver = webdriver.Remote('https://'+request.config.getini("perfectoURL")+'.perfectomobile.com/nexperience/perfectomobile/wd/hub', capabilities) - rdriver.implicitly_wait(35) - - projectname = request.config.getini("projectName") - projectversion = request.config.getini("projectVersion") - jobname = request.config.getini("jobName") - jobnumber = request.config.getini("jobNumber") - tags = request.config.getini("reportTags") - testCaseName = request.config.getini("jobName") - - print("Setting Perfecto ReportClient....") - perfecto_execution_context = PerfectoExecutionContext(rdriver, tags, Job(jobname, jobnumber),Project(projectname, projectversion)) - reporting_client = PerfectoReportiumClient(perfecto_execution_context) - reporting_client.test_start(testCaseName, TestContext([], "Perforce")) - - def teardown(): - try: - print(" -- Tear Down --") - reporting_client.test_stop(TestResultFactory.create_success()) - print('Report-Url: ' + reporting_client.report_url() + '\n') - rdriver.close() - except Exception as e: - print(" -- Exception Not Able To close --") - print (e.message) - finally: - try: - rdriver.quit() - except Exception as e: - print(" -- Exception Not Able To Quit --") - print (e.message) - - request.addfinalizer(teardown) - - if rdriver is None: - yield -1 - else: - yield rdriver,reporting_client - - -@pytest.fixture(scope="function") -def setup_perfectoMobile_iOS(request): - from appium import webdriver - driver = None - reporting_client = None - - warnings.simplefilter("ignore", ResourceWarning) - urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) - - capabilities = { - 'platformName': request.config.getini("platformName-iOS"), - 'model': request.config.getini("model-iOS"), - 'browserName': 'safari', - #'automationName' : 'Appium', - 'securityToken' : request.config.getini("securityToken"), - 'useAppiumForWeb' : 'false', - 'autoAcceptAlerts' : 'true', - #'bundleId' : request.config.getini("bundleId-iOS"), - 'useAppiumForHybrid' : 'false', - } - - driver = webdriver.Remote('https://'+request.config.getini("perfectoURL")+'.perfectomobile.com/nexperience/perfectomobile/wd/hub', capabilities) - driver.implicitly_wait(35) - - TestCaseFullName = os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0] - nCurrentTestMethodNameSplit = re.sub(r'\[.*?\]\ *', "", TestCaseFullName) - try: - TestCaseName = nCurrentTestMethodNameSplit.removeprefix('test_') - print ("\nTestCaseName: " + TestCaseName) - except Exception as e: - TestCaseName = nCurrentTestMethodNameSplit - print("\nUpgrade Python to 3.9 to avoid test_ string in your test case name, see below URL") - print("https://www.andreagrandi.it/2020/10/11/python39-introduces-removeprefix-removesuffix/") - - projectname = request.config.getini("projectName") - projectversion = request.config.getini("projectVersion") - jobname = request.config.getini("jobName") - jobnumber = request.config.getini("jobNumber") - tags = request.config.getini("reportTags") - testCaseName = TestCaseName - - print("\nSetting Perfecto ReportClient....") - perfecto_execution_context = PerfectoExecutionContext(driver, tags, Job(jobname, jobnumber),Project(projectname, projectversion)) - reporting_client = PerfectoReportiumClient(perfecto_execution_context) - reporting_client.test_start(testCaseName, TestContext([], "Perforce")) - - def teardown(): - reporting_client.test_stop(TestResultFactory.create_failure("See Allure Report")) - driver.close() - print("\n------------") - print("Driver Closed") - try: - driver.quit() - print("Driver Quit") - print("------------") - except Exception as e: - print(" -- Exception Not Able To Quit --") - print(e) - - # try: - # print("\n\n---------- Tear Down ----------") - # - # testFailed = request.session.testsfailed - # if testFailed>0: - # print ("Test Case Failure, please check report link: " + testCaseName) - # reporting_client.test_stop(TestResultFactory.create_failure(request.config.cache.get("SelectingWifiFailed", None))) - # request.config.cache.set(key="SelectingWifiFailed", value="Cache Cleared!!") - # #seen = {None} - # #session = request.node - # #print(session) - # elif testFailed<=0: - # reporting_client.test_stop(TestResultFactory.create_success()) - # - # #amount = len(request.session.items) - # #print("Test Session Items: ") - # #print(amount) - # - # #tests_count = request.session.testscollected - # #print("Test Collected: ") - # #print(tests_count) - # - # print('Report-Url: ' + reporting_client.report_url()) - # print("----------------------------------------------------------") - # driver.close() - # except Exception as e: - # print(" -- Exception While Tear Down --") - # reporting_client.test_stop(TestResultFactory.create_failure("Exception")) - # print('Report-Url-Failure: ' + reporting_client.report_url() + '\n') - # - # driver.close() - # - # print (e) - # finally: - # try: - # driver.quit() - # except Exception as e: - # print(" -- Exception Not Able To Quit --") - # print (e) - - - request.addfinalizer(teardown) - - if driver is None: - yield -1 - else: - yield driver,reporting_client +reporting_client = None +testCaseNameList = [] +testCaseStatusList = [] +testCaseErrorMsg = [] +testCaseReportURL = [] @pytest.fixture(scope="function") @@ -775,3 +619,313 @@ def get_vif_state(get_apnos, get_configuration): vif_state.sort() allure.attach(name="vif_state", body=str(vif_state)) yield vif_state + + + +@pytest.hookimpl(tryfirst=True, hookwrapper=True) +def pytest_runtest_makereport(item, call): + outcome = yield + result = outcome.get_result() + #testCaseStatusValue = "" + testCasePassedStatusValue = "" + testCaseFailedStatusValue = "" + testCaseNameList = [] + testCaseStatusList = [] + testCaseErrorMsg = [] + testCaseReportURL = [] + + if result.when == 'call': + item.session.results[item] = result + + #Gets the Current Test Case Name + TestCaseFullName = os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0] + nCurrentTestMethodNameSplit = re.sub(r'\[.*?\]\ *', "", TestCaseFullName) + #print("TestCasefullNameTEST: " + TestCaseFullName) + try: + #TestCaseName = nCurrentTestMethodNameSplit.removeprefix('test_') + TestCaseName = nCurrentTestMethodNameSplit.replace('test_', '') + #print ("\nTestCaseName: " + TestCaseName) + except Exception as e: + TestCaseName = nCurrentTestMethodNameSplit + print("\nUpgrade Python to 3.9 to avoid test_ string in your test case name, see below URL") + #print("https://www.andreagrandi.it/2020/10/11/python39-introduces-removeprefix-removesuffix/") + + #exception = call.excinfo.value + #exception_class = call.excinfo.type + #exception_class_name = call.excinfo.typename + + #exception_traceback = call.excinfo.traceback + + if result.outcome == "failed": + exception_type_and_message_formatted = call.excinfo.exconly() + testCaseFailedStatusValue = "FAILED" + reporting_client.test_stop(TestResultFactory.create_failure(str(testCaseErrorMsg))) + testCaseNameList.append(TestCaseName) + testCaseStatusList.append(testCaseFailedStatusValue) + testCaseErrorMsg.append(exception_type_and_message_formatted) + testCaseReportURL.append(reporting_client.report_url()) + + print("\n TestStatus: " + testCaseFailedStatusValue) + print(" FailureMsg: " + str(testCaseErrorMsg)) + reportPerfecto(TestCaseName, testCaseFailedStatusValue, testCaseErrorMsg, str(reporting_client.report_url())) + + if result.outcome == "passed": + testCasePassedStatusValue = "PASSED" + reporting_client.test_stop(TestResultFactory.create_success()) + testCaseNameList.append(TestCaseName) + testCaseStatusList.append(testCasePassedStatusValue) + testCaseReportURL.append(reporting_client.report_url()) + print("\n TestStatus: " + testCasePassedStatusValue) + reportPerfecto(TestCaseName, testCasePassedStatusValue, "N/A", str(reporting_client.report_url())) + + if result.outcome == "skipped": + testCaseSkippedStatusValue = "SKIPPED" + exception_type_Skipped_message_formatted = call.excinfo.exconly() + reporting_client.test_stop(TestResultFactory.create_failure(str(exception_type_Skipped_message_formatted))) + testCaseNameList.append(TestCaseName) + testCaseStatusList.append("SKIPPED") + testCaseErrorMsg.append(str(exception_type_Skipped_message_formatted)) + testCaseReportURL.append(reporting_client.report_url()) + print("\n TestStatus: " + testCaseSkippedStatusValue) + print(" FailureMsg: " + str(testCaseErrorMsg)) + reportPerfecto(TestCaseName, testCaseSkippedStatusValue, testCaseErrorMsg, str(reporting_client.report_url())) + + +def pytest_sessionfinish(session, exitstatus): + + print() + skipped_amount = 0 + #print('Perfecto TestCase Execution Status:', exitstatus) + passed_amount = sum(1 for result in session.results.values() if result.passed) + failed_amount = sum(1 for result in session.results.values() if result.failed) + skipped_amount = sum(1 for result in session.results.values() if result.skipped) + # print(f'There are {passed_amount} passed and {failed_amount} failed tests') + TotalExecutedCount = failed_amount + passed_amount + skipped_amount + + print('\n------------------------------------') + print('Perfecto TestCase Execution Summary') + print('------------------------------------') + print('Total TestCase Executed: ' + str(TotalExecutedCount)) + print('Total Passed: ' + str(passed_amount)) + print('Total Failed: ' + str(failed_amount)) + print('Total Skipped: ' + str(skipped_amount) + "\n") + + for index in range(len(testCaseNameList)): + print(str(index+1) + ") " + str(testCaseNameList[index]) + " : " + str(testCaseStatusList[index])) + print(" ReportURL: " + str(testCaseReportURL[index])) + print(" FailureMsg: " + str(testCaseErrorMsg[index]) + "\n") + + print('------------------------------------------------------------------\n\n\n\n') + +@pytest.fixture(scope="function") +def setup_perfectoMobile_android(request): + from appium import webdriver + driver = None + reporting_client = None + + warnings.simplefilter("ignore", ResourceWarning) + urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) + + capabilities = { + 'platformName': request.config.getini("platformName-android"), + 'model': request.config.getini("model-android"), + 'browserName': 'mobileOS', + #'automationName' : 'Appium', + 'securityToken' : request.config.getini("securityToken"), + 'useAppiumForWeb' : 'false', + 'useAppiumForHybrid' : 'false', + #'bundleId' : request.config.getini("appPackage-android"), + } + + driver = webdriver.Remote('https://'+request.config.getini("perfectoURL")+'.perfectomobile.com/nexperience/perfectomobile/wd/hub', capabilities) + driver.implicitly_wait(35) + + TestCaseFullName = os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0] + nCurrentTestMethodNameSplit = re.sub(r'\[.*?\]\ *', "", TestCaseFullName) + try: + #TestCaseName = nCurrentTestMethodNameSplit.removeprefix('test_') + TestCaseName = nCurrentTestMethodNameSplit.replace('test_', '') + print ("\n\nExecuting TestCase: " + TestCaseName) + except Exception as e: + TestCaseName = nCurrentTestMethodNameSplit + print("\nUpgrade Python to 3.9 to avoid test_ string in your test case name, see below URL") + #print("https://www.andreagrandi.it/2020/10/11/python39-introduces-removeprefix-removesuffix/") + + projectname = request.config.getini("projectName") + projectversion = request.config.getini("projectVersion") + jobname = request.config.getini("jobName") + jobnumber = request.config.getini("jobNumber") + tags = request.config.getini("reportTags") + testCaseName = TestCaseName + + #print("\nSetting Perfecto ReportClient....") + perfecto_execution_context = PerfectoExecutionContext(driver, tags, Job(jobname, jobnumber),Project(projectname, projectversion)) + reporting_client = PerfectoReportiumClient(perfecto_execution_context) + reporting_client.test_start(testCaseName, TestContext([], "Perforce")) + reportClient(reporting_client) + + def teardown(): + try: + print("\n---------- Tear Down ----------") + print('Report-Url: ' + reporting_client.report_url()) + print("----------------------------------------------------------\n\n\n\n") + driver.close() + except Exception as e: + print(" -- Exception While Tear Down --") + driver.close() + print (e) + finally: + try: + driver.quit() + except Exception as e: + print(" -- Exception Not Able To Quit --") + print (e) + + request.addfinalizer(teardown) + + if driver is None: + yield -1 + else: + yield driver,reporting_client + +def reportClient(value): + global reporting_client # declare a to be a global + reporting_client = value # this sets the global value of a + +def reportPerfecto(testCaseName, testCaseStatus, testErrorMsg, reportURL): + global testCaseNameList # declare a to be a global + global testCaseStatusList + global testCaseErrorMsg + global testCaseReportURL + + testCaseNameList.append(testCaseName) + testCaseStatusList.append(testCaseStatus) + testCaseErrorMsg.append(str(testErrorMsg)) + testCaseReportURL.append(reportURL) + +@pytest.fixture(scope="class") +def setup_perfectoMobileWeb(request): + from selenium import webdriver + rdriver = None + reporting_client = None + + warnings.simplefilter("ignore", ResourceWarning) + urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) + + capabilities = { + 'platformName': request.config.getini("platformName-iOS"), + 'model': request.config.getini("model-iOS"), + 'browserName': request.config.getini("browserType-iOS"), + 'securityToken' : request.config.getini("securityToken"), + } + + rdriver = webdriver.Remote('https://'+request.config.getini("perfectoURL")+'.perfectomobile.com/nexperience/perfectomobile/wd/hub', capabilities) + rdriver.implicitly_wait(35) + + projectname = request.config.getini("projectName") + projectversion = request.config.getini("projectVersion") + jobname = request.config.getini("jobName") + jobnumber = request.config.getini("jobNumber") + tags = request.config.getini("reportTags") + testCaseName = request.config.getini("jobName") + + print("Setting Perfecto ReportClient....") + perfecto_execution_context = PerfectoExecutionContext(rdriver, tags, Job(jobname, jobnumber),Project(projectname, projectversion)) + reporting_client = PerfectoReportiumClient(perfecto_execution_context) + reporting_client.test_start(testCaseName, TestContext([], "Perforce")) + + def teardown(): + try: + print(" -- Tear Down --") + reporting_client.test_stop(TestResultFactory.create_success()) + print('Report-Url: ' + reporting_client.report_url() + '\n') + rdriver.close() + except Exception as e: + print(" -- Exception Not Able To close --") + print (e.message) + finally: + try: + rdriver.quit() + except Exception as e: + print(" -- Exception Not Able To Quit --") + print (e.message) + + request.addfinalizer(teardown) + + if rdriver is None: + yield -1 + else: + yield rdriver,reporting_client + +@pytest.fixture(scope="function") +def setup_perfectoMobile_iOS(request): + from appium import webdriver + driver = None + reporting_client = None + + warnings.simplefilter("ignore", ResourceWarning) + urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) + + capabilities = { + 'platformName': request.config.getini("platformName-iOS"), + 'model': request.config.getini("model-iOS"), + 'browserName': 'safari', + #'automationName' : 'Appium', + 'securityToken' : request.config.getini("securityToken"), + 'useAppiumForWeb' : 'false', + 'autoAcceptAlerts' : 'true', + #'bundleId' : request.config.getini("bundleId-iOS"), + 'useAppiumForHybrid' : 'false', + } + + driver = webdriver.Remote('https://'+request.config.getini("perfectoURL")+'.perfectomobile.com/nexperience/perfectomobile/wd/hub', capabilities) + driver.implicitly_wait(35) + + TestCaseFullName = os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0] + nCurrentTestMethodNameSplit = re.sub(r'\[.*?\]\ *', "", TestCaseFullName) + try: + #TestCaseName = nCurrentTestMethodNameSplit.removeprefix('test_') + TestCaseName = nCurrentTestMethodNameSplit.replace('test_', '') + print ("\n\nExecuting TestCase: " + TestCaseName) + except Exception as e: + TestCaseName = nCurrentTestMethodNameSplit + print("\nUpgrade Python to 3.9 to avoid test_ string in your test case name, see below URL") + #print("https://www.andreagrandi.it/2020/10/11/python39-introduces-removeprefix-removesuffix/") + + projectname = request.config.getini("projectName") + projectversion = request.config.getini("projectVersion") + jobname = request.config.getini("jobName") + jobnumber = request.config.getini("jobNumber") + tags = request.config.getini("reportTags") + testCaseName = TestCaseName + + print("\nSetting Perfecto ReportClient....") + perfecto_execution_context = PerfectoExecutionContext(driver, tags, Job(jobname, jobnumber),Project(projectname, projectversion)) + reporting_client = PerfectoReportiumClient(perfecto_execution_context) + reporting_client.test_start(testCaseName, TestContext([], "Perforce")) + reportClient(reporting_client) + + def teardown(): + try: + print("\n---------- Tear Down ----------") + print('Report-Url: ' + reporting_client.report_url()) + print("----------------------------------------------------------\n\n\n\n") + driver.close() + except Exception as e: + print(" -- Exception While Tear Down --") + driver.close() + print (e) + finally: + try: + driver.quit() + except Exception as e: + print(" -- Exception Not Able To Quit --") + print (e) + + request.addfinalizer(teardown) + + if driver is None: + yield -1 + else: + yield driver,reporting_client + diff --git a/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py b/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py index b69fddcee..092e73fc9 100644 --- a/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py +++ b/tests/e2e/interOp/iOS/AccessPointConnection/test_AccessPointConnection.py @@ -19,7 +19,7 @@ if 'perfecto_libs' not in sys.path: from iOS_lib import closeApp, openApp, get_WifiIPAddress_iOS, ForgetWifiConnection, ping_deftapps_iOS, Toggle_AirplaneMode_iOS, set_APconnMobileDevice_iOS, verify_APconnMobileDevice_iOS, Toggle_WifiMode_iOS, tearDown -pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.AccessPassPointConnectivety] +pytestmark = [pytest.mark.sanity, pytest.mark.interop, pytest.mark.ios, pytest.mark.interop_ios, pytest.mark.AccessPointConnection] setup_params_general = { "mode": "NAT", @@ -47,13 +47,11 @@ class TestAccessPointConnectivety(object): @pytest.mark.fiveg @pytest.mark.wpa2_personal def test_AccessPointConnection_5g_WPA2_Personal(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] - print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) @@ -80,17 +78,16 @@ class TestAccessPointConnectivety(object): @pytest.mark.twog @pytest.mark.wpa2_personal def test_AccessPointConnection_2g_WPA2_Personal(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): - profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") - + report = setup_perfectoMobile_iOS[1] driver = setup_perfectoMobile_iOS[0] connData = get_AccessPointConn_data @@ -118,8 +115,8 @@ class TestAccessPointConnectivety(object): ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) - + #print ("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE") @@ -145,12 +142,12 @@ class TestAccessPointConnectivety(object): @pytest.mark.twog @pytest.mark.wpa def test_AccessPointConnection_2g_WPA(self, request, get_vif_state, get_AccessPointConn_data, setup_perfectoMobile_iOS): - profile_data = setup_params_general["ssid_modes"]["wpa"][0] ssidName = profile_data["ssid_name"] ssidPassword = profile_data["security_key"] print ("SSID_NAME: " + ssidName) - print ("SSID_PASS: " + ssidPassword) + #print ("SSID_PASS: " + ssidPassword) + if ssidName not in get_vif_state: allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state)) pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")