marker adjustments

performance and dataplane_throughput_test
performance and dual_band_test
performance and wifi_capacity_test

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>
This commit is contained in:
shivamcandela
2021-07-23 08:03:00 +05:30
parent e91be1fe61
commit 32769542cb
11 changed files with 104 additions and 87 deletions

View File

@@ -24,6 +24,9 @@ sys.path.append(f'../libs')
sys.path.append(f'../libs/lanforge/')
from sta_connect2 import StaConnect2
import time
import string
import random
S = 12
# from eap_connect import EAPConnect
from test_ipv4_ttls import TTLSTest
from lf_wifi_capacity_test import WiFiCapacityTest
@@ -202,6 +205,7 @@ class RunTest:
def wifi_capacity(self, mode="BRIDGE", vlan_id=100, instance_name="wct_instance", download_rate="1Gbps",
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000"):
instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S))
if mode == "BRIDGE":
upstream_port = self.upstream_port
elif mode == "NAT":
@@ -284,6 +288,8 @@ class RunTest:
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))
if mode == "BRIDGE":
self.client_connect.upstream_port = self.upstream_port
elif mode == "NAT":
@@ -292,7 +298,7 @@ class RunTest:
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'],
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"]]
@@ -325,6 +331,8 @@ class RunTest:
def dualbandperformancetest(self, ssid_5G="[BLANK]", ssid_2G="[BLANK]", mode="BRIDGE", vlan_id=100, dut_name="TIP",
instance_name="test_demo", dut_5g="", dut_2g=""):
instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S))
if mode == "BRIDGE":
self.upstream_port = self.upstream_port
elif mode == "NAT":

View File

@@ -83,7 +83,7 @@ class ChamberView:
self.CreateChamberview.sync_cv()
return self.CreateChamberview, self.scenario_name
def add_stations(self, band="2G", num_stations=50, dut="NA", ssid_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:
@@ -181,7 +181,7 @@ class ChamberView:
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 a if 'print' not in item]
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]

View File

@@ -27,6 +27,10 @@ def lf_tools(get_configuration, testbed):
lf_tools_obj = ChamberView(lanforge_data=get_configuration['traffic_generator']['details'],
access_point_data=get_configuration['access_point'],
testbed=testbed)
lf_tools_obj.add_stations(band="2G", num_stations=0, dut="NA", ssid_name=[])
lf_tools_obj.add_stations(band="5G", num_stations=0, dut="NA", ssid_name=[])
lf_tools_obj.add_stations(band="ax", num_stations=0, dut="NA", ssid_name=[])
lf_tools_obj.Chamber_View()
yield lf_tools_obj

View File

@@ -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_5g", "appliedRadios": ["5G"], "security_key": "something"}]},
"rf": {},
"radius": False
}
@allure.feature("BRIDGE MODE CLIENT CONNECTIVITY")
@allure.suite("performance")
@allure.feature("BRIDGE MODE Dataplane Throughput Test")
@pytest.mark.parametrize(
'setup_profiles',
[setup_params_general],
@@ -30,17 +30,18 @@ setup_params_general = {
scope="class"
)
@pytest.mark.usefixtures("setup_profiles")
class TestDataplaneThroughputBridge(object):
"""Dataplane THroughput Bridge Mode
pytest -m "dataplane_throughput_test and bridge"
class TestDataplaneThroughputBRIDGE(object):
"""Dataplane THroughput BRIDGE Mode
pytest -m "dataplane_throughput_test and BRIDGE"
"""
@pytest.mark.wpa2_personal
@pytest.mark.twog
def test_client_wpa2_personal_2g(self, get_vif_state,
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"
"""Dataplane THroughput BRIDGE Mode
pytest -m "dataplane_throughput_test and BRIDGE and wpa2_personal and twog"
"""
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"]
@@ -62,15 +63,7 @@ class TestDataplaneThroughputBridge(object):
instance_name="TIP_DPT_DPT_WPA2_2G_BRIDGE",
vlan_id=vlan, dut_name=dut_name)
report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
entries = os.listdir("../reports/" + report_name + '/')
pdf = False
for i in entries:
if ".pdf" in i:
pdf = i
if pdf:
allure.attach.file(source="../reports/" + report_name + "/" + pdf,
name=get_configuration["access_point"][0]["model"] + "_dataplane")
print("Test Completed... Cleaning up Stations")
lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G")
lf_test.Client_disconnect(station_name=station_names_twog)
assert station
else:
@@ -78,10 +71,10 @@ class TestDataplaneThroughputBridge(object):
@pytest.mark.wpa2_personal
@pytest.mark.fiveg
def test_client_wpa2_personal_5g(self, get_vif_state,
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"
"""Dataplane THroughput BRIDGE Mode
pytest -m "dataplane_throughput_test and BRIDGE and wpa2_personal and fiveg"
"""
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
ssid_name = profile_data["ssid_name"]
@@ -99,19 +92,13 @@ class TestDataplaneThroughputBridge(object):
station_name=station_names_fiveg, vlan_id=vlan)
if station:
dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP_DPT_DPT_WPA2_5G_BRIDGE",
dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
instance_name="TIP_DPT_DPT_WPA2_5G_BRIDGE",
vlan_id=vlan, dut_name=dut_name)
report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
entries = os.listdir("../reports/"+report_name + '/')
pdf = False
for i in entries:
if ".pdf" in i:
pdf = i
if pdf:
allure.attach.file(source="../reports/" + report_name + "/" + pdf, name=get_configuration["access_point"][0]["model"] + "_dataplane")
lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G")
print("Test Completed... Cleaning up Stations")
lf_test.Client_disconnect(station_name=station_names_fiveg)
assert station
else:
assert False

View File

@@ -8,7 +8,7 @@ import os
import pytest
import allure
pytestmark = [pytest.mark.performance, pytest.mark.performance_release, pytest.mark.dataplane_throughput_test,
pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test,
pytest.mark.nat, pytest.mark.usefixtures("setup_test_run")]
setup_params_general = {
@@ -16,13 +16,14 @@ setup_params_general = {
"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_5g", "appliedRadios": ["5G"], "security_key": "something"}]},
"rf": {},
"radius": False
}
@allure.suite("performance")
@allure.feature("BRIDGE MODE Dataplane Throughput Test")
@allure.feature("NAT MODE CLIENT CONNECTIVITY")
@pytest.mark.parametrize(
'setup_profiles',

View File

@@ -1,28 +1,29 @@
"""
Performance Test: Dataplane Throughput Test: vlan Mode
pytest -m "dataplane_throughput_test and vlan"
Performance Test: Dataplane Throughput Test: VLAN Mode
pytest -m "dataplane_throughput_test and VLAN"
"""
import os
import pytest
import allure
pytestmark = [pytest.mark.performance, pytest.mark.dataplane_throughput_test, pytest.mark.vlan, pytest.mark.usefixtures("setup_test_run")]
pytestmark = [pytest.mark.performance,
pytest.mark.vlan, pytest.mark.usefixtures("setup_test_run")]
setup_params_general = {
"mode": "VLAN",
"ssid_modes": {
"wpa2_personal": [
{"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
"security_key": "something"}]},
{"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something", "vlan": 100},
{"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something", "vlan": 100}]},
"rf": {},
"radius": False
}
@allure.feature("VLAN MODE CLIENT CONNECTIVITY")
@allure.suite("performance")
@allure.feature("VLAN MODE Dataplane Throughput Test")
@pytest.mark.parametrize(
'setup_profiles',
[setup_params_general],
@@ -30,17 +31,25 @@ setup_params_general = {
scope="class"
)
@pytest.mark.usefixtures("setup_profiles")
@pytest.mark.parametrize(
'create_vlan',
[setup_params_general],
indirect=True,
scope="class"
)
@pytest.mark.usefixtures("create_vlan")
class TestDataplaneThroughputVLAN(object):
"""Dataplane THroughput vlan Mode
pytest -m "dataplane_throughput_test and vlan"
"""Dataplane THroughput VLAN Mode
pytest -m "dataplane_throughput_test and VLAN"
"""
@pytest.mark.wpa2_personal
@pytest.mark.twog
def test_client_wpa2_personal_2g(self, get_vif_state,
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"
"""Dataplane THroughput VLAN Mode
pytest -m "dataplane_throughput_test and VLAN and wpa2_personal and twog"
"""
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
ssid_name = profile_data["ssid_name"]
@@ -62,15 +71,7 @@ class TestDataplaneThroughputVLAN(object):
instance_name="TIP_DPT_DPT_WPA2_2G_VLAN",
vlan_id=vlan, dut_name=dut_name)
report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
entries = os.listdir("../reports/" + report_name + '/')
pdf = False
for i in entries:
if ".pdf" in i:
pdf = i
if pdf:
allure.attach.file(source="../reports/" + report_name + "/" + pdf,
name=get_configuration["access_point"][0]["model"] + "_dataplane")
print("Test Completed... Cleaning up Stations")
lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 2.4G")
lf_test.Client_disconnect(station_name=station_names_twog)
assert station
else:
@@ -78,10 +79,10 @@ class TestDataplaneThroughputVLAN(object):
@pytest.mark.wpa2_personal
@pytest.mark.fiveg
def test_client_wpa2_personal_5g(self, get_vif_state,
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"
"""Dataplane THroughput VLAN Mode
pytest -m "dataplane_throughput_test and VLAN and wpa2_personal and fiveg"
"""
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
ssid_name = profile_data["ssid_name"]
@@ -100,18 +101,12 @@ class TestDataplaneThroughputVLAN(object):
if station:
dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
instance_name="TIP_DPT_DPT_WPA2_5G_VLAN", vlan_id=vlan, dut_name=dut_name)
instance_name="TIP_DPT_DPT_WPA2_5G_VLAN",
vlan_id=vlan, dut_name=dut_name)
report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
entries = os.listdir("../reports/"+report_name + '/')
pdf = False
for i in entries:
if ".pdf" in i:
pdf = i
if pdf:
allure.attach.file(source="../reports/" + report_name + "/" + pdf, name=get_configuration["access_point"][0]["model"] + "_dataplane")
lf_tools.attach_report_graphs(report_name=report_name, pdf_name="Dataplane Throughput Test - TCP-UDP 5G")
print("Test Completed... Cleaning up Stations")
lf_test.Client_disconnect(station_name=station_names_fiveg)
assert station
else:
assert False

View File

@@ -9,11 +9,11 @@ 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.performance, pytest.mark.dual_band_test, pytest.mark.bridge,
pytest.mark.single_station_dual_band_throughput, pytest.mark.usefixtures("setup_test_run")]
setup_params_general = {
"mode": "BRIDGE",
"mode": "NAT",
"ssid_modes": {
"wpa2_personal": [
{"ssid_name": "ssid_wpa2p_2g", "appliedRadios": ["2G", "5G"], "security_key": "something"}

View File

@@ -9,8 +9,8 @@ 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.performance, pytest.mark.dual_band_test, pytest.mark.nat,
pytest.mark.single_station_dual_band_throughput, pytest.mark.usefixtures("setup_test_run")]
setup_params_general = {
"mode": "NAT",

View File

@@ -9,7 +9,7 @@ import os
import allure
import pytest
pytestmark = [pytest.mark.performance, pytest.mark.dual_band_test, pytest.mark.vlan, pytest.mark.performance_release]#,
pytestmark = [pytest.mark.performance, pytest.mark.vlan]#,
# pytest.mark.usefixtures("setup_test_run")]
setup_params_general = {

View File

@@ -66,6 +66,7 @@ class TestWifiCapacityNATModeDualBand(object):
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
@@ -93,6 +94,8 @@ class TestWifiCapacityNATModeDualBand(object):
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
@@ -120,6 +123,8 @@ class TestWifiCapacityNATModeDualBand(object):
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
@@ -147,6 +152,8 @@ class TestWifiCapacityNATModeDualBand(object):
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
@@ -202,6 +209,7 @@ class TestWifiCapacityNATMode2G(object):
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
@@ -228,6 +236,8 @@ class TestWifiCapacityNATMode2G(object):
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
@@ -254,6 +264,8 @@ class TestWifiCapacityNATMode2G(object):
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
@@ -280,6 +292,8 @@ class TestWifiCapacityNATMode2G(object):
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
@@ -335,6 +349,8 @@ class TestWifiCapacityNATMode5G(object):
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
@@ -361,6 +377,8 @@ class TestWifiCapacityNATMode5G(object):
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
@@ -387,6 +405,8 @@ class TestWifiCapacityNATMode5G(object):
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
@@ -413,5 +433,7 @@ class TestWifiCapacityNATMode5G(object):
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

View File

@@ -8,7 +8,7 @@ import os
import pytest
import allure
pytestmark = [pytest.mark.performance, pytest.mark.wifi_capacity_test, pytest.mark.vlan]
pytestmark = [pytest.mark.performance, pytest.mark.vlan]
# """pytest.mark.usefixtures("setup_test_run")"""]