Wifi 7960 (#548)

* Added move_to_influx

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>

* Added move_to_influx

Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
This commit is contained in:
jitendracandela
2022-05-18 15:44:37 +05:30
committed by GitHub
parent c9849f9056
commit e445e0acd2
7 changed files with 55 additions and 53 deletions

View File

@@ -442,7 +442,7 @@ class RunTest:
def wifi_capacity(self, mode="BRIDGE", vlan_id=100, batch_size="1,5,10,20,40,64,128",
instance_name="wct_instance", download_rate="1Gbps", influx_tags="",
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000", stations="", create_stations=True,
sort="interleave", raw_lines=[], sets=[]):
sort="interleave", raw_lines=[], sets=[], move_to_influx=False):
instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S))
if mode == "BRIDGE":
upstream_port = self.upstream_port
@@ -483,16 +483,16 @@ class RunTest:
sets=sets)
wificapacity_obj.setup()
wificapacity_obj.run()
if move_to_influx:
report_name = "../reports/" + wificapacity_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
influx = CSVtoInflux(influx_host=self.influx_params["influx_host"],
influx_port=self.influx_params["influx_port"],
influx_org=self.influx_params["influx_org"],
influx_token=self.influx_params["influx_token"],
influx_bucket=self.influx_params["influx_bucket"],
path=report_name)
report_name = "../reports/" + wificapacity_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
influx = CSVtoInflux(influx_host=self.influx_params["influx_host"],
influx_port=self.influx_params["influx_port"],
influx_org=self.influx_params["influx_org"],
influx_token=self.influx_params["influx_token"],
influx_bucket=self.influx_params["influx_bucket"],
path=report_name)
influx.glob()
influx.glob()
return wificapacity_obj
def Client_Connect(self, ssid="[BLANK]", passkey="[BLANK]", security="wpa2", mode="BRIDGE", band="twog",
@@ -606,7 +606,8 @@ 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, influx_tags=""):
upload_rate="0", duration="15s", instance_name="test_demo", raw_lines=None, influx_tags="",
move_to_influx=False):
instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S))
if mode == "BRIDGE":
@@ -652,21 +653,21 @@ class RunTest:
self.dataplane_obj.setup()
self.dataplane_obj.run()
report_name = self.dataplane_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
if move_to_influx:
report_name = "../reports/" + self.dataplane_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
influx = CSVtoInflux(influx_host=self.influx_params["influx_host"],
influx_port=self.influx_params["influx_port"],
influx_org=self.influx_params["influx_org"],
influx_token=self.influx_params["influx_token"],
influx_bucket=self.influx_params["influx_bucket"],
path=report_name)
influx = CSVtoInflux(influx_host=self.influx_params["influx_host"],
influx_port=self.influx_params["influx_port"],
influx_org=self.influx_params["influx_org"],
influx_token=self.influx_params["influx_token"],
influx_bucket=self.influx_params["influx_bucket"],
path=report_name)
influx.glob()
influx.glob()
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="", influx_tags=""):
instance_name="test_demo", dut_5g="", dut_2g="", influx_tags="", move_to_influx=False):
instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S))
if mode == "BRIDGE":
@@ -705,15 +706,16 @@ class RunTest:
)
self.dualbandptest_obj.setup()
self.dualbandptest_obj.run()
report_name = self.dualbandptest_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
influx = CSVtoInflux(influx_host=self.influx_params["influx_host"],
influx_port=self.influx_params["influx_port"],
influx_org=self.influx_params["influx_org"],
influx_token=self.influx_params["influx_token"],
influx_bucket=self.influx_params["influx_bucket"],
path=report_name)
if move_to_influx:
report_name = "../reports/" + self.dualbandptest_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
influx = CSVtoInflux(influx_host=self.influx_params["influx_host"],
influx_port=self.influx_params["influx_port"],
influx_org=self.influx_params["influx_org"],
influx_token=self.influx_params["influx_token"],
influx_bucket=self.influx_params["influx_bucket"],
path=report_name)
influx.glob()
influx.glob()
return self.dualbandptest_obj
def apstabilitytest(self, ssid_5G="[BLANK]", ssid_2G="[BLANK]", mode="BRIDGE", vlan_id=100, dut_name="TIP",

View File

@@ -62,7 +62,7 @@ class TestDataplaneThroughputBRIDGE(object):
if station:
dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
instance_name="TIP_DPT_DPT_WPA2_2G_BRIDGE",
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags)
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags, move_to_influx=True)
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")
lf_test.Client_disconnect(station_name=station_names_twog)
@@ -95,7 +95,7 @@ class TestDataplaneThroughputBRIDGE(object):
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, influx_tags=influx_tags)
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags, move_to_influx=True)
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")
print("Test Completed... Cleaning up Stations")
@@ -128,7 +128,7 @@ class TestDataplaneThroughputBRIDGE(object):
if station:
dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode,
instance_name="TIP_DPT_DPT_WPA2_5G_BRIDGE_AX",
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags)
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags, move_to_influx=True)
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")
print("Test Completed... Cleaning up Stations")
@@ -161,7 +161,7 @@ class TestDataplaneThroughputBRIDGE(object):
if station:
dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode,
instance_name="TIP_DPT_DPT_WPA2_2G_BRIDGE_AX",
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags)
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags, move_to_influx=True)
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")
lf_test.Client_disconnect(station_name=station_names_ax)

View File

@@ -62,7 +62,7 @@ class TestDataplaneThroughputNAT(object):
if station:
dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
instance_name="TIP_DPT_DPT_WPA2_2G_NAT",
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags)
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags, move_to_influx=True)
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")
lf_test.Client_disconnect(station_name=station_names_twog)
@@ -94,7 +94,7 @@ class TestDataplaneThroughputNAT(object):
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, influx_tags=influx_tags)
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags, move_to_influx=True)
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")
print("Test Completed... Cleaning up Stations")
@@ -127,7 +127,7 @@ class TestDataplaneThroughputNAT(object):
if station:
dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode,
instance_name="TIP_DPT_DPT_WPA2_2G_NAT_AX",
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags)
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags, move_to_influx=True)
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")
lf_test.Client_disconnect(station_name=station_names_ax)
@@ -159,7 +159,7 @@ class TestDataplaneThroughputNAT(object):
if station:
dp_obj = lf_test.dataplane(station_name=station_names_ax, mode=mode,
instance_name="TIP_DPT_DPT_WPA2_5G_NAT_AX",
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags)
vlan_id=vlan, dut_name=dut_name, influx_tags=influx_tags, move_to_influx=True)
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")
print("Test Completed... Cleaning up Stations")

View File

@@ -63,7 +63,7 @@ class TestDualbandPerformanceBRIDGE(object):
dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G,
instance_name="dbp_instance_wpa2p_BRIDGE_p",
vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags)
vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, move_to_influx=True)
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 Wpa2 Bridge")
assert True

View File

@@ -65,7 +65,7 @@ class TestDualbandPerformanceNat(object):
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, influx_tags=influx_tags)
vlan_id=vlan, dut_5g=dut_5g, dut_2g=dut_2g, influx_tags=influx_tags, move_to_influx=True)
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 Wpa2 Nat")
assert True

View File

@@ -70,7 +70,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_dl", mode=mode, vlan_id=vlan,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="0", protocol="TCP-IPv4", duration="60000")
upload_rate="0", protocol="TCP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -102,7 +102,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_dl", mode=mode, vlan_id=vlan,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="0", protocol="UDP-IPv4", duration="60000")
upload_rate="0", protocol="UDP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -134,7 +134,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_bi", mode=mode, vlan_id=vlan,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000")
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -166,7 +166,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_bi", mode=mode, vlan_id=vlan,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000")
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -198,7 +198,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_ul", mode=mode, vlan_id=vlan,
download_rate="0", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000")
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -230,7 +230,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_ul", mode=mode, vlan_id=vlan,
download_rate="0", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000")
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]

View File

@@ -70,7 +70,7 @@ class TestWifiCapacityNATModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_dl", mode=mode, vlan_id=vlan,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="0", protocol="TCP-IPv4", duration="60000")
upload_rate="0", protocol="TCP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -102,7 +102,7 @@ class TestWifiCapacityNATModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_dl", mode=mode, vlan_id=vlan,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="100Mbps", protocol="UDP-IPv4", duration="60000")
upload_rate="100Mbps", protocol="UDP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -134,7 +134,7 @@ class TestWifiCapacityNATModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_bi", mode=mode, vlan_id=vlan,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000")
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -166,7 +166,7 @@ class TestWifiCapacityNATModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_bi", mode=mode, vlan_id=vlan,
download_rate="1Gbps", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000")
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -176,7 +176,7 @@ class TestWifiCapacityNATModeDualBand(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-7127", name="WIFI-7127")
@pytest.mark.tcp_upload
def test_client_wpa2_bridge_tcp_ul(self, lf_tools, get_apnos_max_clients,
def test_client_wpa2_NAT_tcp_ul(self, lf_tools, get_apnos_max_clients,
lf_test, station_names_twog, create_lanforge_chamberview_dut,
get_configuration):
""" Wifi Capacity Test NAT mode
@@ -198,7 +198,7 @@ class TestWifiCapacityNATModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_tcp_ul", mode=mode, vlan_id=vlan,
download_rate="0", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000")
upload_rate="1Gbps", protocol="TCP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
@@ -208,7 +208,7 @@ class TestWifiCapacityNATModeDualBand(object):
@allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-7128", name="WIFI-7128")
@pytest.mark.udp_upload
def test_client_wpa2_bridge_udp_ul(self, lf_tools, get_apnos_max_clients,
def test_client_wpa2_NAT_udp_ul(self, lf_tools, get_apnos_max_clients,
lf_test, station_names_twog, create_lanforge_chamberview_dut,
get_configuration):
""" Wifi Capacity Test NAT mode
@@ -230,7 +230,7 @@ class TestWifiCapacityNATModeDualBand(object):
wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_NAT_udp_ul", mode=mode, vlan_id=vlan,
download_rate="0", batch_size="1,5,10,20,40,64,128,256",
influx_tags=influx_tags, sets=sets,
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000")
upload_rate="1Gbps", protocol="UDP-IPv4", duration="60000", move_to_influx=True)
report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]