mirror of
https://github.com/Telecominfraproject/wlan-testing.git
synced 2025-11-01 11:28:09 +00:00
Merge branch 'master' into feature-wifi-2548
This commit is contained in:
@@ -64,7 +64,7 @@ class RunTest:
|
||||
# self.staConnect = StaConnect2(self.lanforge_ip, self.lanforge_port, debug_=self.debug)
|
||||
|
||||
def Client_Connectivity(self, ssid="[BLANK]", passkey="[BLANK]", security="open", extra_securities=[],
|
||||
station_name=[], mode="BRIDGE", vlan_id=1, band="twog"):
|
||||
station_name=[], mode="BRIDGE", vlan_id=1, band="twog", cleanup=True):
|
||||
"""SINGLE CLIENT CONNECTIVITY using test_connect2.py"""
|
||||
self.staConnect = StaConnect2(self.lanforge_ip, self.lanforge_port, debug_=self.debug)
|
||||
self.staConnect.sta_mode = 0
|
||||
@@ -108,7 +108,8 @@ class RunTest:
|
||||
except Exception as e:
|
||||
print(e)
|
||||
self.staConnect.stop()
|
||||
self.staConnect.cleanup()
|
||||
if cleanup:
|
||||
self.staConnect.cleanup()
|
||||
run_results = self.staConnect.get_result_list()
|
||||
for result in run_results:
|
||||
print("test result: " + result)
|
||||
@@ -243,11 +244,11 @@ class RunTest:
|
||||
if band == "fiveg":
|
||||
self.client_connect.radio = self.fiveg_radios[0]
|
||||
self.client_connect.build()
|
||||
self.client_connect.wait_for_ip(station_name)
|
||||
print(self.client_connect.wait_for_ip(station_name))
|
||||
if self.client_connect.wait_for_ip(station_name):
|
||||
|
||||
self.client_connect.wait_for_ip(station_name, timeout_sec=60)
|
||||
if self.client_connect.wait_for_ip(station_name, timeout_sec=60):
|
||||
self.client_connect._pass("ALL Stations got IP's", print_=True)
|
||||
return self.client_connect
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
@@ -263,14 +264,12 @@ class RunTest:
|
||||
self.client_connect.upstream_port = self.upstream_port
|
||||
elif mode == "NAT":
|
||||
self.client_connect.upstream_port = self.upstream_port
|
||||
else:
|
||||
elif mode == "VLAN":
|
||||
self.client_connect.upstream_port = self.upstream_port + "." + str(vlan_id)
|
||||
|
||||
if raw_lines is None:
|
||||
raw_lines = [['pkts: Custom;60;142;256;512;1024;MTU'],
|
||||
['directions: DUT Transmit;DUT Receive'],
|
||||
['traffic_types: UDP;TCP'], ["show_3s: 1"],
|
||||
["show_ll_graphs: 1"], ["show_log: 1"]]
|
||||
raw_lines = [['pkts: MTU'], ['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,
|
||||
@@ -288,15 +287,15 @@ class RunTest:
|
||||
duration=duration,
|
||||
dut=dut_name,
|
||||
station="1.1." + station_name[0],
|
||||
raw_lines=raw_lines,
|
||||
)
|
||||
raw_lines=raw_lines)
|
||||
|
||||
self.dataplane_obj.setup()
|
||||
self.dataplane_obj.run()
|
||||
report_name = self.dataplane_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
|
||||
influx = CSVtoInflux(influxdb=self.influxdb,
|
||||
_influx_tag=self.influx_params["influx_tag"],
|
||||
influx = CSVtoInflux(influxdb=self.influxdb, _influx_tag=self.influx_params["influx_tag"],
|
||||
target_csv=self.local_report_path + report_name + "/kpi.csv")
|
||||
influx.post_to_influx()
|
||||
|
||||
return self.dataplane_obj
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user