scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-02 19:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source 
Signed-off-by: jitendracandela <jitendra.kushavah@candelatech.com>
This commit is contained in:
jitendracandela
2022-08-17 08:38:21 +05:30
parent 243f8f6bfd 284b6a142e
commit dd84deb663
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lf_libs/lf_libs.py
View File

@@ -143,27 +143,27 @@ class lf_libs:
logging.basicConfig(format='%(asctime)s - %(message)s', level=log_level) logging.basicConfig(format='%(asctime)s - %(message)s', level=log_level)
lf_data = dict(lf_data) lf_data = dict(lf_data)
self.dut_data = dut_data self.dut_data = dut_data
# try: try:
self.lanforge_data = lf_data.get("details") self.lanforge_data = lf_data.get("details")
self.testbed = lf_data.get("testbed") self.testbed = lf_data.get("testbed")
self.scenario = lf_data.get("scenario") self.scenario = lf_data.get("scenario")
self.setup_lf_data() self.setup_lf_data()
self.setup_relevent_profiles() self.setup_relevent_profiles()
# self.load_scenario() # self.load_scenario()
# self.setup_metadata() self.setup_metadata()
if self.scenario == "dhcp-bridge": if self.scenario == "dhcp-bridge":
logging.info("Scenario name: " + str(self.scenario)) logging.info("Scenario name: " + str(self.scenario))
# creating default raw lines for chamberview # creating default raw lines for chamberview
self.create_dhcp_bridge() self.create_dhcp_bridge()
elif self.scenario == "dhcp-external": elif self.scenario == "dhcp-external":
logging.info("Scenario name: " + str(self.scenario)) logging.info("Scenario name: " + str(self.scenario))
self.create_dhcp_external() self.create_dhcp_external()
self.chamber_view(raw_lines=self.default_scenario_raw_lines) self.chamber_view(raw_lines=self.default_scenario_raw_lines)
self.setup_dut() self.setup_dut()
# except Exception as e: except Exception as e:
# logging.error("lf_data has bad values: " + str(lf_data)) logging.error("lf_data has bad values: " + str(lf_data))
# logging.error(e) logging.error(e)
""" """
setup_lf_data : used to set object variables that are passed from lab_info.json setup_lf_data : used to set object variables that are passed from lab_info.json

18
lf_libs/lf_tests.py
View File

@@ -1,11 +1,13 @@
import csv
import importlib import importlib
import logging import logging
import os import os
import sys import sys
import time import time
from datetime import datetime
import allure
import paramiko import paramiko
from datetime import datetime
import allure
import pytest import pytest
import csv import csv
from scp import SCPClient from scp import SCPClient
@@ -151,7 +153,7 @@ class lf_tests(lf_libs):
if dict(dut_data.get(identifier)[-1]).keys().__contains__("2G") and \ if dict(dut_data.get(identifier)[-1]).keys().__contains__("2G") and \
dict(dut_data.get(identifier)[-1])["2G"] is not None: dict(dut_data.get(identifier)[-1])["2G"] is not None:
channel = dict(dut_data.get(identifier)[-1])["2G"][0] channel = dict(dut_data.get(identifier)[-1])["2G"][0]
self.start_sniffer(radio_channel=channel, radio=data["sniff_radio"].split(".")[2], self.start_sniffer(radio_channel=channel, radio=data["sniff_radio_2g"].split(".")[2],
duration=runtime_secs) duration=runtime_secs)
logging.info("started-sniffer") logging.info("started-sniffer")
for obj in sta_connect_obj: for obj in sta_connect_obj:
@@ -164,7 +166,7 @@ class lf_tests(lf_libs):
if dict(dut_data.get(identifier)[-1]).keys().__contains__("5G") and \ if dict(dut_data.get(identifier)[-1]).keys().__contains__("5G") and \
dict(dut_data.get(identifier)[-1])["5G"] is not None: dict(dut_data.get(identifier)[-1])["5G"] is not None:
channel = dict(dut_data.get(identifier)[-1])["5G"][0] channel = dict(dut_data.get(identifier)[-1])["5G"][0]
self.start_sniffer(radio_channel=channel, radio=data["sniff_radio"].split(".")[2], self.start_sniffer(radio_channel=channel, radio=data["sniff_radio_5g"].split(".")[2],
duration=runtime_secs) duration=runtime_secs)
for obj in sta_connect_obj: for obj in sta_connect_obj:
obj.start() obj.start()
@@ -175,13 +177,19 @@ class lf_tests(lf_libs):
if dict(dut_data.get(identifier)[-1]).keys().__contains__("6G") and \ if dict(dut_data.get(identifier)[-1]).keys().__contains__("6G") and \
dict(dut_data.get(identifier)[-1])["6G"] is not None: dict(dut_data.get(identifier)[-1])["6G"] is not None:
channel = dict(dut_data.get(identifier)[-1])["6G"][0] channel = dict(dut_data.get(identifier)[-1])["6G"][0]
self.start_sniffer(radio_channel=channel, radio=data["sniff_radio"].split(".")[2], self.start_sniffer(radio_channel=channel, radio=data["sniff_radio_6g"].split(".")[2],
duration=runtime_secs) duration=runtime_secs)
for obj in sta_connect_obj: for obj in sta_connect_obj:
obj.start() obj.start()
logging.info("napping %f sec" % runtime_secs) logging.info("napping %f sec" % runtime_secs)
time.sleep(runtime_secs) time.sleep(runtime_secs)
self.stop_sniffer() self.stop_sniffer()
else:
for obj in sta_connect_obj:
print(obj)
obj.start()
print("napping %f sec" % runtime_secs)
time.sleep(runtime_secs)
pass_fail_result = [] pass_fail_result = []
for obj in sta_connect_obj: for obj in sta_connect_obj:
sta_rows = ["4way time (us)", "channel", "cx time (us)", "dhcp (ms)", "ip", "signal"] sta_rows = ["4way time (us)", "channel", "cx time (us)", "dhcp (ms)", "ip", "signal"]