mirror of
https://github.com/Telecominfraproject/wlan-testing.git
synced 2026-01-27 10:23:37 +00:00
Wifi 6731 (#421)
* Created a local variable for upstream_port to prevent appending of vlan_id to previous upstream_port * corrected vlan_id
This commit is contained in:
@@ -498,15 +498,16 @@ class RunTest:
|
||||
|
||||
self.upstream_port = self.upstream_port
|
||||
elif mode == "VLAN":
|
||||
self.upstream_port = self.upstream_port + "." + str(vlan_id)
|
||||
# self.upstream_port = self.upstream_port + "." + str(vlan_id)
|
||||
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.client_connect.upstream_port = self.upstream_port
|
||||
self.client_connect.upstream_port = upstream_port
|
||||
elif mode == "VLAN":
|
||||
self.client_connect.upstream_port = self.upstream_port + "." + str(vlan_id)
|
||||
self.client_connect.upstream_port = 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'],
|
||||
@@ -521,7 +522,7 @@ class RunTest:
|
||||
lf_password="lanforge",
|
||||
instance_name=instance_name,
|
||||
config_name="dpt_config",
|
||||
upstream="1.1." + self.upstream_port,
|
||||
upstream="1.1." + upstream_port,
|
||||
pull_report=True,
|
||||
load_old_cfg=False,
|
||||
download_speed=download_rate,
|
||||
|
||||
@@ -43,13 +43,13 @@ class TestThroughputVsPktWpa2Vlan2G(object):
|
||||
"""Throughput Vs Pkt Sizes Vlan Mode
|
||||
pytest -m "throughput_vs_pkt and Vlan and wpa2 and twog and pkt60"
|
||||
"""
|
||||
profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
|
||||
profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
|
||||
ssid_name = profile_data["ssid_name"]
|
||||
security_key = profile_data["security_key"]
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "twog"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 60'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -98,7 +98,7 @@ class TestThroughputVsPktWpa2Vlan2G(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "twog"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 142'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -147,7 +147,7 @@ class TestThroughputVsPktWpa2Vlan2G(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "twog"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 256'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -196,7 +196,7 @@ class TestThroughputVsPktWpa2Vlan2G(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "twog"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 512'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -245,7 +245,7 @@ class TestThroughputVsPktWpa2Vlan2G(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "twog"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 1024'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -294,7 +294,7 @@ class TestThroughputVsPktWpa2Vlan2G(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "twog"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: MTU'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -367,7 +367,7 @@ class TestThroughputVsPktWpa2Vlan5g(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 60'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -416,7 +416,7 @@ class TestThroughputVsPktWpa2Vlan5g(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 142'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -465,7 +465,7 @@ class TestThroughputVsPktWpa2Vlan5g(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 256'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -514,7 +514,7 @@ class TestThroughputVsPktWpa2Vlan5g(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 512'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -563,7 +563,7 @@ class TestThroughputVsPktWpa2Vlan5g(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 1024'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -612,7 +612,7 @@ class TestThroughputVsPktWpa2Vlan5g(object):
|
||||
security = "wpa2"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: MTU'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
|
||||
@@ -366,7 +366,7 @@ class TestThroughputVsPktVLANWpa5G(object):
|
||||
security = "wpa"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 60'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -415,7 +415,7 @@ class TestThroughputVsPktVLANWpa5G(object):
|
||||
security = "wpa"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 142'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -464,7 +464,7 @@ class TestThroughputVsPktVLANWpa5G(object):
|
||||
security = "wpa"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 256'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -513,7 +513,7 @@ class TestThroughputVsPktVLANWpa5G(object):
|
||||
security = "wpa"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 512'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -562,7 +562,7 @@ class TestThroughputVsPktVLANWpa5G(object):
|
||||
security = "wpa"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: 1024'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
@@ -611,7 +611,7 @@ class TestThroughputVsPktVLANWpa5G(object):
|
||||
security = "wpa"
|
||||
mode = "VLAN"
|
||||
band = "fiveg"
|
||||
vlan = 1
|
||||
vlan = 100
|
||||
dut_name = create_lanforge_chamberview_dut
|
||||
raw_lines = [['pkts: MTU'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
|
||||
Reference in New Issue
Block a user