From 2c57467c99f6a9905804df35a4a31af3e5b4ba6e Mon Sep 17 00:00:00 2001 From: shivamcandela Date: Sun, 25 Jul 2021 02:30:03 +0530 Subject: [PATCH] Revert "Merge pull request #94 from Telecominfraproject/staing-wifi-fix-wifi-capacity" This reverts commit cef570b275327687ac6df0b22bbb5426b9ca34aa, reversing changes made to acdc1df92f96f659b1a8c41a73b656dd04752149. --- libs/apnos/apnos.py | 49 +- libs/lanforge/lf_tests.py | 158 +++-- libs/lanforge/lf_tools.py | 75 +-- tests/configuration.py | 584 ++++++++---------- ...enterprise_security_modes_configuration.py | 20 +- ...st_general_security_modes_configuration.py | 24 +- ...enterprise_security_modes_configuration.py | 20 +- ...st_general_security_modes_configuration.py | 24 +- ...enterprise_security_modes_configuration.py | 20 +- ...st_general_security_modes_configuration.py | 24 +- tests/e2e/basic/conftest.py | 423 +++++++------ .../test_bridge_mode.py | 65 +- .../test_nat_mode.py | 45 +- .../test_vlan_mode.py | 67 +- .../open/test_bridge_mode.py | 54 +- .../open/test_nat_mode.py | 50 +- .../open/test_vlan_mode.py | 59 +- .../wpa2_personal/test_bridge_mode.py | 55 +- .../wpa2_personal/test_nat_mode.py | 42 +- .../wpa2_personal/test_vlan_mode.py | 58 +- .../wpa2_personal/test_bridge_mode.py | 36 +- .../wpa2_personal/test_nat_mode.py | 36 +- .../wpa2_personal/test_vlan_mode.py | 36 +- .../test_bridge_mode.py | 16 +- .../test_nat_mode.py | 16 +- .../test_vlan_mode.py | 16 +- .../open_security/test_bridge_mode.py | 8 +- .../open_security/test_nat_mode.py | 8 +- .../open_security/test_vlan_mode.py | 8 +- .../wpa2_security/test_bridge_mode.py | 8 +- .../wpa2_security/test_nat_mode.py | 8 +- .../wpa2_security/test_vlan_mode.py | 8 +- .../wpa3_security/test_bridge_mode.py | 8 +- .../wpa3_security/test_nat_mode.py | 8 +- .../wpa3_security/test_vlan_mode.py | 8 +- .../wpa_security/test_bridge_mode.py | 8 +- .../wpa_security/test_nat_mode.py | 8 +- .../wpa_security/test_vlan_mode.py | 8 +- .../wifi_capacity_test/test_bridge_mode.py | 435 ++----------- .../wifi_capacity_test/test_nat_mode.py | 462 +++----------- .../wifi_capacity_test/test_vlan_mode.py | 447 +++----------- .../test_enterprise_tls.py | 24 +- .../test_enterprise_ttls.py | 20 +- .../test_general_security_modes.py | 28 +- .../test_enterprise_tls.py | 24 +- .../test_enterprise_ttls.py | 20 +- .../test_general_security_modes.py | 28 +- .../test_enterprise_tls.py | 24 +- .../test_enterprise_ttls.py | 20 +- .../test_general_security_modes.py | 28 +- .../vlan_mode/fiveg_radio/test_vlan_fiveg.py | 16 +- .../vlan_mode/twog_radio/test_vlan_twog.py | 16 +- 52 files changed, 1366 insertions(+), 2394 deletions(-) diff --git a/libs/apnos/apnos.py b/libs/apnos/apnos.py index d32f10a37..100121284 100644 --- a/libs/apnos/apnos.py +++ b/libs/apnos/apnos.py @@ -81,38 +81,18 @@ class APNOS: return output # Method to get the iwinfo status of AP using AP-CLI/ JUMPHOST-CLI - def get_bssid_band_mapping(self): + def iwinfo_status(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) - data = stdout.read() + output = stdout.read() client.close() - allure.attach(name="iwinfo Output Msg: ", body=str(data)) + allure.attach(name="iwinfo Output Msg: ", body=str(output)) allure.attach(name="iwinfo config Err Msg: ", body=str(stderr)) - 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 + return output # Method to get the vif_config of AP using AP-CLI/ JUMPHOST-CLI def get_vif_config(self): @@ -382,20 +362,15 @@ class APNOS: if __name__ == '__main__': obj = { 'jumphost': True, - 'ip': "10.28.3.100", + 'ip': "localhost", 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, - 'jumphost_tty': '/dev/ttyAP1' + 'port': 8803, + 'jumphost_tty': '/dev/ttyAP2' } var = APNOS(credentials=obj) - 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 + 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 dd736c7db..432f4b89c 100644 --- a/libs/lanforge/lf_tests.py +++ b/libs/lanforge/lf_tests.py @@ -24,9 +24,6 @@ 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 @@ -203,44 +200,42 @@ 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", download_rate="1Gbps", - upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000"): - instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S)) + def wifi_capacity(self, mode="BRIDGE", vlan_id=100, instance_name="wct_instance", stations=None): if mode == "BRIDGE": - upstream_port = self.upstream_port + self.client_connect.upstream_port = self.upstream_port elif mode == "NAT": - upstream_port = self.upstream_port + self.client_connect.upstream_port = self.upstream_port elif mode == "VLAN": - upstream_port = self.upstream_port + "." + str(vlan_id) + self.client_connect.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." + 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=[]) + 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=[]) wificapacity_obj.setup() wificapacity_obj.run() @@ -287,25 +282,18 @@ class RunTest: return True def dataplane(self, station_name=None, mode="BRIDGE", vlan_id=100, download_rate="85%", dut_name="TIP", - upload_rate="0", duration="15s", instance_name="test_demo", raw_lines=None): - instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S)) - + upload_rate="85%", duration="1m", instance_name="test_demo"): if mode == "BRIDGE": self.client_connect.upstream_port = self.upstream_port elif mode == "NAT": self.client_connect.upstream_port = self.upstream_port - elif mode == "VLAN": + else: 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_lf_report_dir=self.local_report_path, + local_path=self.local_report_path, lf_user="lanforge", lf_password="lanforge", instance_name=instance_name, @@ -318,63 +306,61 @@ class RunTest: duration=duration, dut=dut_name, station="1.1." + station_name[0], - raw_lines=raw_lines) - + 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"]], + ) 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", dut_5g="", dut_2g=""): - instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S)) - + def dualbandperformancetest(self,ssid_5G="[BLANK]",ssid_2G="[BLANK]",mode="BRIDGE", vlan_id=100,dut_name="TIP", + instance_name="test_demo"): if mode == "BRIDGE": - self.upstream_port = self.upstream_port + self.client_connect.upstream_port = self.upstream_port elif mode == "NAT": - self.upstream_port = self.upstream_port + self.client_connect.upstream_port = self.upstream_port else: - self.upstream_port = self.upstream_port + "." + str(vlan_id) + self.client_connect.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_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']] - ) + 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']] + ) self.dualbandptest_obj.setup() self.dualbandptest_obj.run() - 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() + 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() 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 6362a752a..eef0fb60b 100644 --- a/libs/lanforge/lf_tools.py +++ b/libs/lanforge/lf_tools.py @@ -1,6 +1,3 @@ -import re - -import allure from create_chamberview import CreateChamberview from create_chamberview_dut import DUT import time @@ -9,7 +6,6 @@ import json import os import pandas as pd - class ChamberView: def __init__(self, lanforge_data=None, access_point_data=None, debug=True, testbed=None): @@ -32,7 +28,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"], @@ -61,15 +57,6 @@ 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) @@ -83,38 +70,6 @@ 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() @@ -151,7 +106,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: @@ -159,36 +114,14 @@ 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/tests/configuration.py b/tests/configuration.py index f326a83f1..baaf49d46 100644 --- a/tests/configuration.py +++ b/tests/configuration.py @@ -1,7 +1,61 @@ +""" + 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 = { - "basic-01": { + "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": { "controller": { 'url': "https://wlan-portal-svc-nola-02.cicd.lab.wlan.tip.build", # API base url for the controller 'username': 'support@example.com', @@ -15,32 +69,32 @@ CONFIGURATION = { 'mode': 'wifi5', 'serial': '3c2c99f44e77', 'jumphost': True, - 'ip': "10.28.3.100", + 'ip': "localhost", # localhost 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, + 'port': 8801, # 22, 'jumphost_tty': '/dev/ttyAP1', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/dev/ecw5410-2021-06-25-pending-b6743c3.tar.gz" + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/dev/ecw5410-2021-06-16-pending-e8418c0.tar.gz" } ], "traffic_generator": { "name": "lanforge", "details": { - "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"], + "ip": "localhost", # localhost, + "port": 8802, # 8802, + "ssh_port": 8803, + "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": "wlan0", - "5G-Station-Name": "wlan1", + "2.4G-Station-Name": "twog0", + "5G-Station-Name": "fiveg0", "AX-Station-Name": "ax" } } - }, # checked deployed + }, # 1.X wifi-5 basic-01 "basic-02": { "controller": { 'url': "https://wlan-portal-svc-nola-02.cicd.lab.wlan.tip.build", # API base url for the controller @@ -55,233 +109,35 @@ CONFIGURATION = { 'mode': 'wifi6', 'serial': '34efb6af48db', 'jumphost': True, - 'ip': "10.28.3.100", + 'ip': "localhost", 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, + 'port': 8801, 'jumphost_tty': '/dev/ttyAP2', - 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/eap101/dev/eap101-2021-06-25-pending-b6743c3.tar.gz" + 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/eap101/dev/eap101-2021-06-15-pending-39bd8f3.tar.gz" } ], "traffic_generator": { "name": "lanforge", "details": { - "ip": "10.28.3.8", - "port": 8080, - "ssh_port": 22, + "ip": "localhost", + "port": 8804, + "ssh_port": 8805, "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": "wlan0", - "5G-Station-Name": "wlan0", + "2.4G-Station-Name": "sta0", + "5G-Station-Name": "sta1", "AX-Station-Name": "ax" } } - }, # checked deployed - "basic-03": { + }, # 1.x wifi-6 basic-02 + "ext-03-01": { "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 + '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', @@ -291,37 +147,37 @@ CONFIGURATION = { { 'model': 'ecw5410', 'mode': 'wifi5', - 'serial': '68215fd2f724', + 'serial': '903cb3944857', 'jumphost': True, - 'ip': "localhost", # 10.28.3.103 + 'ip': "192.168.200.80", # localhost 'username': "lanforge", - 'password': "pumpkin77", - 'port': 8883, # 22 - 'jumphost_tty': '/dev/ttyAP4', + '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": "localhost", # 10.28.3.34 - "port": 8882, # 8080 + "ip": "192.168.200.80", # localhost, + "port": 8080, # 8802, "ssh_port": 22, - "2.4G-Radio": ["wiphy4"], + "2.4G-Radio": ["wiphy0"], "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" + "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" } } - }, # checked - "basic-08-02": { + }, # Anjali 192.168.200.80 + "ext-03-02": { "controller": { - 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the 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', @@ -329,40 +185,39 @@ CONFIGURATION = { }, 'access_point': [ { - 'model': 'wf194c', - 'mode': 'wifi6', - 'serial': '089B4BB2F10C', + 'model': 'ecw5410', + 'mode': 'wifi5', + 'serial': '903cb394486f', 'jumphost': True, - 'ip': "localhost", # 10.28.3.103 + 'ip': "192.168.200.81", # localhost 'username': "lanforge", - '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" + '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": "localhost", # 10.28.3.34 - "port": 8882, # 8080 + "ip": "192.168.200.81", # localhost, + "port": 8080, # 8802, "ssh_port": 22, - "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" + "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" } } - }, # checked - - "mesh": { + }, + "ext-03-03": { "controller": { - 'url': "http://wlan-portal-svc-digicert.cicd.lab.wlan.tip.build", # API base url for the 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', @@ -370,36 +225,146 @@ CONFIGURATION = { }, 'access_point': [ { - 'model': 'eap101', - 'mode': 'wifi6', - 'serial': '34efb6af4a7a', + 'model': 'ecw5410', + 'mode': 'wifi5', + 'serial': '903cb3944817', 'jumphost': True, - 'ip': "10.28.3.101", # 10.28.3.103 + 'ip': "192.168.200.82", # localhost 'username': "lanforge", - '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" + '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": "10.28.3.14", # 10.28.3.34 - "port": 8080, # 8080 + "ip": "192.168.200.82", # localhost, + "port": 8080, # 8802, "ssh_port": 22, - "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" + "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" } } - }, # checked + }, # 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": { "controller": { 'url': "https://wlan-portal-svc-nola-01.cicd.lab.wlan.tip.build", # API base url for the controller @@ -417,7 +382,7 @@ CONFIGURATION = { 'ip': "localhost", 'username': "lanforge", 'password': "pumpkin77", - 'port': 22, + 'port': 8843, 'jumphost_tty': '/dev/ttyAP1', 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/ecw5410/trunk/ecw5410-1.1.0.tar.gz" } @@ -430,55 +395,15 @@ 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": "10.10.10.72", + "ip": "192.168.200.75", "port": 1812, "secret": "testing123", - "user": "user", - "password": "password", + "user": "nolaradius", + "password": "nolastart", "pk_password": "whatever" } @@ -556,7 +481,6 @@ PASSPOINT_PROFILE_INFO = { } } - TEST_CASES = { "ap_upgrade": 2233, "5g_wpa2_bridge": 2236, @@ -744,4 +668,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/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 d005dee73..12885f557 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": ["2G"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "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": ["2G"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] }, "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 f6f95f96d..ec219f5eb 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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], + {"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"], "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 cd37873a2..ed032e5eb 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": ["2G"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "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": ["2G"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] }, "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 5e6a69e63..e474bd2d7 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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], + {"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"], "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 b0b4ba4a3..3eb3dd487 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": ["2G"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "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": ["2G"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] }, "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 1c309d242..67716637c 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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], + {"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"], "security_key": "something"}] }, "rf": {}, diff --git a/tests/e2e/basic/conftest.py b/tests/e2e/basic/conftest.py index 5ac29910c..da719e185 100644 --- a/tests/e2e/basic/conftest.py +++ b/tests/e2e/basic/conftest.py @@ -27,10 +27,6 @@ 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 @@ -145,292 +141,375 @@ 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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( + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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 j["appliedRadios"].__contains__("2G"): + if "twog" in get_markers.keys() and get_markers["twog"] and "is2dot4GHz" in list( + j["appliedRadios"]): lf_dut_data.append(j) - 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") + 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']) @@ -452,14 +531,11 @@ 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 lf_dut_data: - ssid_names.append(i["ssid_name"]) + 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() + # This loop will check the VIF Config with cloud profile vif_config = [] test_cases['vifc'] = False @@ -497,47 +573,30 @@ 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 = [ @@ -601,7 +660,6 @@ 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/") @@ -609,3 +667,4 @@ 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 ef117f2da..80ac31500 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } -@allure.suite("performance") -@allure.feature("BRIDGE MODE Dataplane Throughput Test") + +@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -30,18 +30,17 @@ 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_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" + 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" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -63,7 +62,15 @@ 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] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") + 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_test.Client_disconnect(station_name=station_names_twog) assert station else: @@ -71,10 +78,10 @@ class TestDataplaneThroughputBRIDGE(object): @pytest.mark.wpa2_personal @pytest.mark.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" + 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" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssid_name = profile_data["ssid_name"] @@ -92,13 +99,19 @@ 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] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") + 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_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 0983fbc44..922d94cf8 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,22 +8,20 @@ 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]}, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "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', @@ -36,12 +34,11 @@ class TestDataplaneThroughputNAT(object): """Dataplane THroughput nat Mode pytest -m "dataplane_throughput_test and nat" """ - @pytest.mark.wpa2_personal @pytest.mark.twog - def test_tcp_upd_2g_band(self, get_vif_state, lf_tools, - lf_test, station_names_twog, create_lanforge_chamberview_dut, - get_configuration): + def test_client_wpa2_personal_2g(self, get_vif_state, + 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" """ @@ -65,7 +62,15 @@ 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] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") + 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_test.Client_disconnect(station_name=station_names_twog) assert station else: @@ -73,8 +78,8 @@ class TestDataplaneThroughputNAT(object): @pytest.mark.wpa2_personal @pytest.mark.fiveg - def test_tcp_upd_5g_band(self, get_vif_state, lf_tools, - lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration): + def test_client_wpa2_personal_5g(self, get_vif_state, + 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" """ @@ -94,13 +99,19 @@ 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] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") + 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_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 da7ac0081..bcf0f876b 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,29 +1,28 @@ """ - 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.vlan, pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.vlan, pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something", "vlan": 100}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something", "vlan": 100}]}, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } -@allure.suite("performance") -@allure.feature("VLAN MODE Dataplane Throughput Test") +@allure.feature("VLAN MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', [setup_params_general], @@ -31,25 +30,17 @@ 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_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" + 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" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0] ssid_name = profile_data["ssid_name"] @@ -71,7 +62,15 @@ 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] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G") + 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_test.Client_disconnect(station_name=station_names_twog) assert station else: @@ -79,10 +78,10 @@ class TestDataplaneThroughputVLAN(object): @pytest.mark.wpa2_personal @pytest.mark.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" + 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" """ profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] ssid_name = profile_data["ssid_name"] @@ -101,12 +100,18 @@ 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] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G") + 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_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 1f4a2aee7..7a30dec91 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 : NAT Mode - pytest -m "performance and dual_band_test and nat" + Dual Band Performance Test : Bridge Mode + pytest -m "dual_band_test and bridge" """ @@ -9,15 +9,14 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.bridge, pytest.mark.performance_release]#, -# pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.dual_band_test, pytest.mark.bridge, + pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "BRIDGE", "ssid_modes": { - "wpa2_personal": [ - {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} - ]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "rf": {}, "radius": False } @@ -32,40 +31,37 @@ setup_params_general = { indirect=True, scope="class" ) + @pytest.mark.usefixtures("setup_profiles") -class TestDualbandPerformanceNat(object): +class TestDualbandPerformanceBridge(object): """ - pytest -m "performance and dual_band_test and nat and wpa2_personal and twog and fiveg" + pytest -m "dual_band_test and bridge and open and twog and fiveg" """ - @pytest.mark.wpa2_personal + @pytest.mark.open @pytest.mark.twog @pytest.mark.fiveg - 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"] + def test_client_open(self,get_vif_state,create_lanforge_chamberview_dut, lf_test,get_configuration): + profile_data = setup_params_general["ssid_modes"]["open"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_5G = profile_data[1]["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_nat_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + 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) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") - assert True + 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") + 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 7ad7aac11..c7781f1b2 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 "performance and dual_band_test and nat" + pytest -m "dual_band_test and nat" """ @@ -9,15 +9,14 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.nat, pytest.mark.performance_release]#, -# pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.dual_band_test, pytest.mark.nat, + pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "NAT", "ssid_modes": { - "wpa2_personal": [ - {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} - ]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "rf": {}, "radius": False } @@ -32,40 +31,37 @@ 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 -m "dual_band_test and nat and open and twog and fiveg" """ - @pytest.mark.wpa2_personal + @pytest.mark.open @pytest.mark.twog @pytest.mark.fiveg - 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"] + def test_client_open(self,get_vif_state,create_lanforge_chamberview_dut, lf_test,get_configuration): + profile_data = setup_params_general["ssid_modes"]["open"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_5G = profile_data[1]["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_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + 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) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") - assert True + 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") + 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 5304b8cdf..5e1ada71c 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 "performance and dual_band_test and VLAN" + pytest -m "dual_band_test and vlan" """ @@ -9,15 +9,14 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release]#, -# pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.dual_band_test, pytest.mark.vlan, + pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "VLAN", "ssid_modes": { - "wpa2_personal": [ - {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} - ]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "rf": {}, "radius": False } @@ -32,40 +31,42 @@ setup_params_general = { indirect=True, scope="class" ) -@pytest.mark.usefixtures("setup_profiles") -class TestDualbandPerformanceVLAN(object): +@pytest.mark.parametrize( + "create_vlan", + [setup_params_general], + indirect=True, + scope="class" +) + +@pytest.mark.usefixtures("setup_profiles","create_vlan") +class TestDualbandPerformanceVlan(object): """ - pytest -m "performance and dual_band_test and VLAN and wpa2_personal and twog and fiveg" + pytest -m "dual_band_test and vlan and open and twog and fiveg" """ - @pytest.mark.wpa2_personal + @pytest.mark.open @pytest.mark.twog @pytest.mark.fiveg - 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"] + def test_client_open(self,get_vif_state,create_lanforge_chamberview_dut, lf_test,get_configuration): + profile_data = setup_params_general["ssid_modes"]["open"] ssid_2G = profile_data[0]["ssid_name"] - ssid_5G = profile_data[0]["ssid_name"] + ssid_5G = profile_data[1]["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_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + 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) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") - assert True + 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") 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 7e5ff5cd4..cab1c47e5 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 : NAT Mode - pytest -m "performance and dual_band_test and nat" + Dual Band Performance Test : Bridge Mode + pytest -m "performance and dual_band_test and bridge" """ @@ -9,15 +9,16 @@ import os import allure import pytest -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")] +pytestmark = [pytest.mark.performance,pytest.mark.dual_band_test, pytest.mark.bridge, + pytest.mark.usefixtures("setup_test_run")] setup_params_general = { - "mode": "NAT", + "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} - ]}, + {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } @@ -32,40 +33,36 @@ 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.usefixtures("setup_profiles") +class TestDualbandPerformanceBridge(object): + """ + pytest -m "performance and dual_band_test and bridge 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, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + def test_client_wpa2_personal(self,get_vif_state,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[0]["ssid_name"] + ssid_5G = profile_data[1]["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_nat_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + instance_name="dbp_instance_wpa2p_bridge", + vlan_id=vlan, dut_name=dut_name) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") - assert True + 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") + 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 855069a09..c91135faf 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,15 +9,16 @@ import os import allure import pytest -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")] +pytestmark = [pytest.mark.performance,pytest.mark.dual_band_test, pytest.mark.nat, + pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} - ]}, + {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } @@ -32,40 +33,37 @@ 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, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + def test_client_wpa2_personal(self,get_vif_state,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[0]["ssid_name"] + ssid_5G = profile_data[1]["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_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + instance_name="dbp_instance_wpa2p_nat", + vlan_id=vlan, dut_name=dut_name) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") - assert True + 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") + 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 d545ee00e..8cb708957 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,15 +9,16 @@ import os import allure import pytest -pytestmark = [pytest.mark.performance, pytest.mark.vlan]#, -# pytest.mark.usefixtures("setup_test_run")] +pytestmark = [pytest.mark.performance,pytest.mark.dual_band_test, pytest.mark.vlan, + pytest.mark.usefixtures("setup_test_run")] setup_params_general = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"} - ]}, + {"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } @@ -32,40 +33,43 @@ setup_params_general = { indirect=True, scope="class" ) -@pytest.mark.usefixtures("setup_profiles") -class TestDualbandPerformanceVLAN(object): - """ - pytest -m "performance and dual_band_test and VLAN and wpa2_personal and twog and fiveg" - """ +@pytest.mark.parametrize( + "create_vlan", + [setup_params_general], + indirect=True, + scope="class" +) +@pytest.mark.usefixtures("setup_profiles","create_vlan") +class TestDualbandPerformanceVlan(object): + + """ + pytest -m "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, lf_tools, - create_lanforge_chamberview_dut, lf_test, get_configuration): + def test_client_wpa2_personal(self,get_vif_state,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[0]["ssid_name"] + ssid_5G = profile_data[1]["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_p", - vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g) + instance_name="dbp_instance_wpa2p_vlan", + vlan_id=vlan, dut_name=dut_name) report_name = dbpt_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1] - lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dual Band Performance Test") - assert True + 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") + 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 21989fc6f..6418c2eee 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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 0d7e67c4e..cb3284f72 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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 117339383..2d16ac88b 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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something","vlan": 150}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something","vlan": 150}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something","vlan": 100}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something","vlan": 100}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something","vlan": 100}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something","vlan": 100}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 b3d0dcdf0..a10e74001 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 4f35f2ca4..76eafa008 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 6571551a5..f5660474e 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 f9c0e2cc6..fbc5d6f55 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": ["2G"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "rf": {}, "radius": False } @@ -318,8 +318,8 @@ class TestThroughputVsPktBridge2G(object): setup_params_5g = { "mode": "BRIDGE", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "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 e3a608674..d5e4358ef 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": ["2G"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "rf": {}, "radius": False } @@ -312,8 +312,8 @@ class TestThroughputVsPktNatOpen2G(object): setup_params_5g = { "mode": "NAT", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "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 3505c0be8..cc91169fd 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": ["2G"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "rf": {}, "radius": False @@ -315,8 +315,8 @@ class TestThroughputVsPktVlanOpen2G(object): setup_params_5g = { "mode": "VLAN", "ssid_modes": { - "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]}, + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "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 4e26faa56..6a1ffc2e9 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 bfe4d971b..9ac02660c 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 1a807a7b0..b19562e20 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 a67dfbb62..d14343151 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}]}, "rf": {}, @@ -323,8 +323,8 @@ setup_params_5g = { "mode": "BRIDGE", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 2196fe2fc..be077a2f7 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}]}, "rf": {}, @@ -324,8 +324,8 @@ setup_params_5g = { "mode": "NAT", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 d6364140b..55349300e 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}]}, "rf": {}, @@ -322,8 +322,8 @@ setup_params_5g = { "mode": "VLAN", "ssid_modes": { "wpa3_personal": [ - {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 ed14b3b27..fc11487dc 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], + "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], + "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 41af82f4a..7a069b654 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], + "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 922a49b5b..4a85c3f3d 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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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 ea8726cdc..429f1e5d4 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,17 +8,16 @@ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.wifi_capacity_test, pytest.mark.bridge] -# """pytest.mark.usefixtures("setup_test_run")"""] +pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.bridge, + pytest.mark.usefixtures("setup_test_run")] - -setup_params_general_dual_band = { +setup_params_general = { "mode": "BRIDGE", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something"} - ] - }, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } @@ -27,390 +26,90 @@ setup_params_general_dual_band = { @allure.feature("BRIDGE MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', - [setup_params_general_dual_band], + [setup_params_general], indirect=True, scope="class" ) @pytest.mark.usefixtures("setup_profiles") -@pytest.mark.wpa2_personal -@pytest.mark.twog -@pytest.mark.fiveg -@pytest.mark.dual_band -class TestWifiCapacityBridgeModeDualBand(object): +class TestWifiCapacityBridgeMode(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): + @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): """ 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] + profile_data = setup_params_general["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") - 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") + 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 - 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): + @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): """ Wifi Capacity Test Bridge mode - pytest -m "wifi_capacity_test and bridge and wpa2_personal and twog" + pytest -m "wifi_capacity_test and bridge and wpa2_personal and fiveg" """ - profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] 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") - 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 + 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 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 03ae13df3..f9189d280 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,24 +1,23 @@ """ - Performance Test: Wifi Capacity Test : NAT Mode - pytest -m "wifi_capacity_test and NAT" + Performance Test: Wifi Capacity Test : Bridge Mode + pytest -m "wifi_capacity_test and bridge" """ import os import pytest import allure -pytestmark = [pytest.mark.performance, pytest.mark.wifi_capacity_test, pytest.mark.nat] -# """pytest.mark.usefixtures("setup_test_run")"""] +pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.nat, + pytest.mark.usefixtures("setup_test_run")] - -setup_params_general_dual_band = { +setup_params_general = { "mode": "NAT", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something"} - ] - }, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } @@ -27,413 +26,90 @@ setup_params_general_dual_band = { @allure.feature("NAT MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', - [setup_params_general_dual_band], + [setup_params_general], indirect=True, scope="class" ) @pytest.mark.usefixtures("setup_profiles") -@pytest.mark.wpa2_personal -@pytest.mark.twog -@pytest.mark.fiveg -@pytest.mark.dual_band -@pytest.mark.performance_release -class TestWifiCapacityNATModeDualBand(object): +class TestWifiCapacityNATMode(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): + @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): """ 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] + profile_data = setup_params_general["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") - 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") + 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 - 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): + @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): """ Wifi Capacity Test NAT mode - pytest -m "wifi_capacity_test and NAT and wpa2_personal and twog" + pytest -m "wifi_capacity_test and NAT and wpa2_personal and fiveg" """ - profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] 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") - 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 + 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 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 3e2b8064f..3fec9b77d 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,24 +1,23 @@ """ 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.performance, pytest.mark.vlan] -# """pytest.mark.usefixtures("setup_test_run")"""] +pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.vlan, + pytest.mark.usefixtures("setup_test_run")] - -setup_params_general_dual_band = { +setup_params_general = { "mode": "VLAN", "ssid_modes": { "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_dual_band", "appliedRadios": ["2G", "5G"], "security_key": "something"} - ] - }, + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], + "security_key": "something"}]}, "rf": {}, "radius": False } @@ -27,390 +26,90 @@ setup_params_general_dual_band = { @allure.feature("VLAN MODE CLIENT CONNECTIVITY") @pytest.mark.parametrize( 'setup_profiles', - [setup_params_general_dual_band], + [setup_params_general], indirect=True, scope="class" ) @pytest.mark.usefixtures("setup_profiles") -@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" +class TestWifiCapacityVLANMode(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" + @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" """ - profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + profile_data = setup_params_general["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") - 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") + 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 - 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" + @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" """ - profile_data = setup_params_general_dual_band["ssid_modes"]["wpa2_personal"][0] + profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1] 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") - 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 + 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 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 466eb3b5c..87c8716fa 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": ["2G"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, # # "rf": {}, # "radius": True @@ -219,14 +219,14 @@ # "mode": "BRIDGE", # "ssid_modes": { # "wpa_enterprise": [ -# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, # # "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 02d3ce7b5..2e20321b4 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": ["2G"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "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": ["2G"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] }, "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 829e52f32..afb702353 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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], + {"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"], "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": ["2G"], "default_key_id": 1, +# "wep": [ {"ssid_name": "ssid_wep_2g", "appliedRadios": ["is2dot4GHz"], "default_key_id": 1, # "wep_key": 1234567890}, -# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["5G"], +# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], # "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 fb901b6fa..574e05e18 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": ["2G"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, # # "rf": {}, # "radius": True @@ -218,14 +218,14 @@ # "mode": "NAT", # "ssid_modes": { # "wpa_enterprise": [ -# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, # # "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 49bb6cee9..8aac530cc 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": ["2G"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "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": ["2G"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] }, "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 00dd3a442..c2f734a27 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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], + {"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"], "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": ["2G"], "default_key_id": 1, +# "wep": [ {"ssid_name": "ssid_wep_2g", "appliedRadios": ["is2dot4GHz"], "default_key_id": 1, # "wep_key": 1234567890}, -# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["5G"], +# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], # "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 34c5e3e58..59246411d 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": ["2G"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, # # "rf": {}, # "radius": True @@ -218,14 +218,14 @@ # "mode": "VLAN", # "ssid_modes": { # "wpa_enterprise": [ -# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa2_enterprise": [ -# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], +# {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], # "wpa3_enterprise": [ -# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, -# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, +# {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, +# {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, # # "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 02f9df09d..9b0a8f0ef 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": ["2G"]}, - {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa2_enterprise": [ - {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise": [ - {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["5G"]}]}, + {"ssid_name": "ssid_wpa3_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}]}, "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": ["2G"]}, - {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["5G"]}], + {"ssid_name": "ssid_wpa_wpa2_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa_wpa2_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}], "wpa3_enterprise_mixed": [ - {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["2G"]}, - {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["5G"]}] + {"ssid_name": "ssid_wpa3_mixed_eap_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_wpa3_mixed_eap_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"]}] }, "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 75d7b8e6a..4ed6c6327 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": ["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"], + "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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "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": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa3_personal_mixed": [ - {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa3_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa3_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], + {"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"], "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": ["2G"], "default_key_id": 1, +# "wep": [ {"ssid_name": "ssid_wep_2g", "appliedRadios": ["is2dot4GHz"], "default_key_id": 1, # "wep_key": 1234567890}, -# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["5G"], +# {"ssid_name": "ssid_wep_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], # "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 dfdf835cb..a3be95bcc 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": ["2G"]}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"], "vlan": 100}], + "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["is2dot4GHz"]}, + {"ssid_name": "ssid_open_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "vlan": 100}], - "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"], + "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something", "vlan": 125}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something"}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something", "vlan": 200}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something"}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], + {"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"], "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 be89562fb..94ac6d9d6 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": ["2G"], "vlan": 100}, - {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}], + "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": ["2G"], "security_key": "something", "vlan": 125}, - {"ssid_name": "ssid_wpa_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"], "security_key": "something"}], "wpa2_personal": [ - {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something", "vlan": 200}, - {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something", "vlan": 200}, + {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], "wpa_wpa2_personal_mixed": [ - {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["2G"], "security_key": "something", + {"ssid_name": "ssid_wpa_wpa2_p_m_2g", "appliedRadios": ["is2dot4GHz"], "security_key": "something", "vlan": 150}, - {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["5G"], + {"ssid_name": "ssid_wpa_wpa2_p_m_5g", "appliedRadios": ["is5GHzU", "is5GHz", "is5GHzL"], "security_key": "something"}], }, "rf": {},