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

lf_tx_power.py : adjusted naming for batch naming.

Browse Source 
lf_check.py : batch mode can reprocess the original json to allow for
multiple iterations varing the
BATCH: channel, nss, channel bandwidth, tx power , OR
BATCH: channel, nss, channel bandwidth and COMMAND LINE: tx_power list OR
BATCH: channel, nss, and COMMAND LINE: channel bandwidth list, tx_power list
This commit is contained in:
Chuck SmileyRekiere
2022-03-07 15:59:06 -07:00
committed by shivam
parent 10c8c501dc
commit 702d75c22b
2 changed files with 83 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lf_tx_power.py
View File

@@ -45,7 +45,6 @@ lf_report = importlib.import_module("py-scripts.lf_report")
lf_kpi_csv = importlib.import_module("py-scripts.lf_kpi_csv") lf_kpi_csv = importlib.import_module("py-scripts.lf_kpi_csv")
EPILOG = '''\ EPILOG = '''\
############################################################################################## ##############################################################################################
@@ -305,6 +304,8 @@ def usage():
# see https://stackoverflow.com/a/13306095/11014343 # see https://stackoverflow.com/a/13306095/11014343
# TODO use common logger library # TODO use common logger library
class FileAdapter(object): class FileAdapter(object):
def __init__(self, logger): def __init__(self, logger):
self.logger = logger self.logger = logger
@@ -418,11 +419,8 @@ def main():
parser.add_argument("--test_priority", default="", help="dut model for kpi.csv, test-priority is arbitrary number") parser.add_argument("--test_priority", default="", help="dut model for kpi.csv, test-priority is arbitrary number")
parser.add_argument("--test_id", default="TX power", help="test-id for kpi.csv, script or test name") parser.add_argument("--test_id", default="TX power", help="test-id for kpi.csv, script or test name")
parser.add_argument('--local_lf_report_dir', help='--local_lf_report_dir override the report path, primary use when running test in test suite', default="") parser.add_argument('--local_lf_report_dir', help='--local_lf_report_dir override the report path, primary use when running test in test suite', default="")
# TODO ADD KPI configuration # TODO ADD KPI configuration
# debug configuration # debug configuration
@@ -464,17 +462,24 @@ def main():
# test_priority = args.test_priority # this may need to be set per test # test_priority = args.test_priority # this may need to be set per test
test_id = args.test_id test_id = args.test_id
# put in test information in title name
results_dir_name = ("tx_power"
+ '_ch_' + args.channel.replace(' ', '_')
+ '_nss_' + args.nss.replace(' ', '_')
+ '_bw_' + args.bandwidth.replace(' ', '_')
+ '_txpw_' + args.txpower.replace(' ', '_'))
if local_lf_report_dir != "": if local_lf_report_dir != "":
report = lf_report.lf_report( report = lf_report.lf_report(
_path=local_lf_report_dir, _path=local_lf_report_dir,
_results_dir_name="tx_power", _results_dir_name=results_dir_name,
_output_html="tx_power.html", _output_html="{results_dir}.html".format(results_dir=results_dir_name),
_output_pdf="tx_power.pdf") _output_pdf="{results_dir}.pdf".format(results_dir=results_dir_name))
else: else:
report = lf_report.lf_report( report = lf_report.lf_report(
_results_dir_name="tx_power", _results_dir_name=results_dir_name,
_output_html="tx_power.html", _output_html="{results_dir}.html".format(results_dir=results_dir_name),
_output_pdf="tx_power.pdf") _output_pdf="{results_dir}.pdf".format(results_dir=results_dir_name))
kpi_path = report.get_report_path() kpi_path = report.get_report_path()
# kpi_filename = "kpi.csv" # kpi_filename = "kpi.csv"
@@ -491,8 +496,6 @@ def main():
_kpi_dut_serial_num=dut_serial_num, _kpi_dut_serial_num=dut_serial_num,
_kpi_test_id=test_id) _kpi_test_id=test_id)
lfstation = args.station lfstation = args.station
upstream_port = args.upstream_port upstream_port = args.upstream_port
lfmgr = args.lfmgr lfmgr = args.lfmgr
@@ -505,21 +508,20 @@ def main():
outfile_path = report.get_report_path() outfile_path = report.get_report_path()
current_time = time.strftime("%m_%d_%Y_%H_%M_%S", time.localtime()) current_time = time.strftime("%m_%d_%Y_%H_%M_%S", time.localtime())
if (args.outfile): if (args.outfile):
outfile_tmp = (outfile_path + '/' + current_time + '_' + args.outfile) outfile_tmp = (outfile_path + '/' + current_time + '_' + args.outfile
# TODO - have the channel, nss, bw, txpower in outfile # TODO - have the channel, nss, bw, txpower in outfile
# + '_' + args.channel + '_ch_' + args.channel.replace(' ', '_')
# + '_' + args.nss.replace(' ','_') + '_' + + '_nss_' + args.nss.replace(' ', '_')
# + str(args.bandwidth).replace(' ','_') + '_' + '_bw_' + args.bandwidth.replace(' ', '_')
# + str(args.txpower).replace(' ','_')) + '_tx_pw_' + args.txpower.replace(' ', '_'))
else: else:
outfile_tmp = (outfile_path + '/' + current_time + '_' + args.outfile) outfile_tmp = (outfile_path + '/' + current_time + '_' + 'tx_power'
# + '_' + args.outfile + 'tx_power' + '_' + args.channel + '_ch_' + args.channel.replace(' ', '_')
# + '_' + args.nss.replace(' ','_') + '_' + + '_nss_' + args.nss.replace(' ', '_')
# + str(args.bandwidth).replace(' ','_') + '_' + '_bw_' + args.bandwidth.replace(' ', '_')
# + str(args.tx_power).replace(' ','_')) + '_tx_pw_' + args.txpower.replace(' ', '_'))
print("outfile_tmp {outfile_tmp}".format(outfile_tmp=outfile_tmp)) print("outfile_tmp {outfile_tmp}".format(outfile_tmp=outfile_tmp))
# note: there would always be an args.outfile due to the default # note: there would always be an args.outfile due to the default
full_outfile = "{}_full.txt".format(outfile_tmp) full_outfile = "{}_full.txt".format(outfile_tmp)
outfile_xlsx = "{}.xlsx".format(outfile_tmp) outfile_xlsx = "{}.xlsx".format(outfile_tmp)
@@ -562,7 +564,6 @@ def main():
# usage() # usage()
# exit(2) # exit(2)
# dynamic import of the controller module # dynamic import of the controller module
series = importlib.import_module(args.module) series = importlib.import_module(args.module)

77
py-scripts/tools/lf_check.py
View File

@@ -121,14 +121,12 @@ logger = logging.getLogger(__name__)
lf_logger_config = importlib.import_module("lf_logger_config") lf_logger_config = importlib.import_module("lf_logger_config")
# lf_report is from the parent of the current file # lf_report is from the parent of the current file
dir_path = os.path.dirname(os.path.realpath(__file__)) dir_path = os.path.dirname(os.path.realpath(__file__))
parent_dir_path = os.path.abspath(os.path.join(dir_path, os.pardir)) parent_dir_path = os.path.abspath(os.path.join(dir_path, os.pardir))
sys.path.insert(0, parent_dir_path) sys.path.insert(0, parent_dir_path)
# setup logging FORMAT # setup logging FORMAT
FORMAT = '%(asctime)s %(name)s %(levelname)s: %(message)s' FORMAT = '%(asctime)s %(name)s %(levelname)s: %(message)s'
@@ -159,6 +157,8 @@ class lf_check():
self.report_path = _report_path self.report_path = _report_path
self.log_path = _log_path self.log_path = _log_path
self.test_dict = {} self.test_dict = {}
# This is needed for iterations and batch testing.
self.test_dict_original_json = {}
path_parent = os.path.dirname(os.getcwd()) path_parent = os.path.dirname(os.getcwd())
os.chdir(path_parent) os.chdir(path_parent)
# TODO have method to pass in other # TODO have method to pass in other
@@ -200,7 +200,7 @@ class lf_check():
# lanforge configuration # lanforge configuration
self.lf_mgr_ip = "192.168.0.102" self.lf_mgr_ip = "192.168.0.102"
self.lf_mgr_port = "8080" self.lf_mgr_port = "8080"
#TODO allow for json configuration # TODO allow for json configuration
self.lf_mgr_ssh_port = "22" self.lf_mgr_ssh_port = "22"
self.lf_mgr_user = "lanforge" self.lf_mgr_user = "lanforge"
self.lf_mgr_pass = "lanforge" self.lf_mgr_pass = "lanforge"
@@ -586,6 +586,7 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
# self.logger.info("test_suites {}".format(self.json_test["test_suites"])) # self.logger.info("test_suites {}".format(self.json_test["test_suites"]))
if self.test_suite in self.json_test["test_suites"]: if self.test_suite in self.json_test["test_suites"]:
self.test_dict = self.json_test["test_suites"][self.test_suite] self.test_dict = self.json_test["test_suites"][self.test_suite]
self.test_dict_original_json = self.json_test["test_suites"][self.test_suite]
# self.logger.info("self.test_dict {}".format(self.test_dict)) # self.logger.info("self.test_dict {}".format(self.test_dict))
else: else:
self.logger.info( self.logger.info(
@@ -602,7 +603,6 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
self.logger.info("EXITING ERROR test_suites not in json test") self.logger.info("EXITING ERROR test_suites not in json test")
exit(1) exit(1)
# TODO change code so if parameter is not present then implied to be false
def read_test_rig_parameters(self): def read_test_rig_parameters(self):
if "TEST_RIG" in self.json_rig["test_rig_parameters"]: if "TEST_RIG" in self.json_rig["test_rig_parameters"]:
self.test_rig = self.json_rig["test_rig_parameters"]["TEST_RIG"] self.test_rig = self.json_rig["test_rig_parameters"]["TEST_RIG"]
@@ -788,12 +788,12 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
print( print(
"self.test_dict[self.test]['args_list']: {}".format( "self.test_dict[self.test]['args_list']: {}".format(
self.test_dict[self.test]['args_list'])) self.test_dict[self.test]['args_list']))
# Walk all the args in the args list then construct the # Walk all the args in the args list then construct the arguments
# arguments
if self.test_dict[self.test]['args'] == "": # since there may be multiple iterations or batches need original json syntax for replacements
self.test_dict[self.test]['args'] = self.test_dict[self.test]['args'].replace(self.test_dict[self.test]['args'], self.test_dict[self.test]['args'] = self.test_dict_original_json[self.test]['args'].replace(self.test_dict[self.test]['args'],
''.join(self.test_dict[self.test][ ''.join(self.test_dict[self.test][
'args_list'])) 'args_list']))
if 'DATABASE_SQLITE' in self.test_dict[self.test]['args']: if 'DATABASE_SQLITE' in self.test_dict[self.test]['args']:
self.test_dict[self.test]['args'] = self.test_dict[self.test]['args'].replace( self.test_dict[self.test]['args'] = self.test_dict[self.test]['args'].replace(
'DATABASE_SQLITE', self.database_sqlite) 'DATABASE_SQLITE', self.database_sqlite)
@@ -873,11 +873,10 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
print("self.test_dict[self.test]['args']: {}".format(self.test_dict[self.test]['args'])) print("self.test_dict[self.test]['args']: {}".format(self.test_dict[self.test]['args']))
# END of command line arg processing # END of command line arg processing
# if self.test_dict[self.test]['args'] == "":
if self.test_dict[self.test]['args'] == "": # self.test_dict[self.test]['args'] = self.test_dict[self.test]['args'].replace(self.test_dict[self.test]['args'],
self.test_dict[self.test]['args'] = self.test_dict[self.test]['args'].replace(self.test_dict[self.test]['args'], # ''.join(self.test_dict[self.test][
''.join(self.test_dict[self.test][ # 'args_list']))
'args_list']))
if 'timeout' in self.test_dict[self.test]: if 'timeout' in self.test_dict[self.test]:
self.logger.info( self.logger.info(
"timeout : {}".format( "timeout : {}".format(
@@ -907,6 +906,7 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
"failed to change to {}".format( "failed to change to {}".format(
self.scripts_wd)) self.scripts_wd))
cmd_args = "{}".format(self.test_dict[self.test]['args']) cmd_args = "{}".format(self.test_dict[self.test]['args'])
# TODO the the tx_power went back in the command
command = "./{} {}".format( command = "./{} {}".format(
self.test_dict[self.test]['command'], cmd_args) self.test_dict[self.test]['command'], cmd_args)
self.logger.info("command: {}".format(command)) self.logger.info("command: {}".format(command))
@@ -928,7 +928,9 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
# need to take into account --raw_line parameters thus need to use shlex.split # need to take into account --raw_line parameters thus need to use shlex.split
# need to preserve command to have correct command syntax # need to preserve command to have correct command syntax
# in command output # in command output
# TODO this is where the batch needs to itterate
command_to_run = command command_to_run = command
self.logger.info("command : {command}".format(command=command))
command_to_run = shlex.split(command_to_run) command_to_run = shlex.split(command_to_run)
self.logger.info( self.logger.info(
@@ -944,7 +946,7 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
# have stderr go to stdout # have stderr go to stdout
try: try:
summary = subprocess.Popen(command_to_run, shell=False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, summary = subprocess.Popen(command_to_run, shell=False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
universal_newlines=True) universal_newlines=True)
except FileNotFoundError: except FileNotFoundError:
# TODO tx_power is one directory up from py-scripts # TODO tx_power is one directory up from py-scripts
@@ -952,7 +954,7 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
os.chdir(self.lanforge_wd) os.chdir(self.lanforge_wd)
self.logger.info("Changed Current Working Directory to {}".format(os.getcwd())) self.logger.info("Changed Current Working Directory to {}".format(os.getcwd()))
summary = subprocess.Popen(command_to_run, shell=False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, summary = subprocess.Popen(command_to_run, shell=False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
universal_newlines=True) universal_newlines=True)
except PermissionError: except PermissionError:
self.logger.info("PermissionError on execution of {command}".format(command=command_to_run)) self.logger.info("PermissionError on execution of {command}".format(command=command_to_run))
@@ -1199,6 +1201,7 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
# self.logger.info("row: {}".format(row)) # self.logger.info("row: {}".format(row))
self.logger.info("test: {} executed".format(self.test)) self.logger.info("test: {} executed".format(self.test))
# TODO the command needs to be updated for the batch iterations
def run_script_test(self): def run_script_test(self):
self.start_html_results() self.start_html_results()
self.start_csv_results() self.start_csv_results()
@@ -1239,7 +1242,6 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
self.logger.info("batch_tx_power : {batch_tx_power}".format(batch_tx_power=self.test_dict[self.test]['batch_tx_power'])) self.logger.info("batch_tx_power : {batch_tx_power}".format(batch_tx_power=self.test_dict[self.test]['batch_tx_power']))
self.tx_power_list = self.test_dict[self.test]['batch_tx_power'].split() self.tx_power_list = self.test_dict[self.test]['batch_tx_power'].split()
# TODO have addional methods # TODO have addional methods
# in python an empty list returns false . # in python an empty list returns false .
# If channel_list and bandwidth_list are populated then # If channel_list and bandwidth_list are populated then
@@ -1255,22 +1257,36 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
self.report_index = 0 self.report_index = 0
for self.iteration in range(self.test_iterations): for self.iteration in range(self.test_iterations):
self.iteration += 1 self.iteration += 1
# Runs the scripts # Runs the scripts
self.run_script() self.run_script()
elif self.channel_list and self.nss_list and self.bandwidth_list and not self.tx_power_list: elif self.channel_list and self.nss_list and self.bandwidth_list and not self.tx_power_list:
for self.channel in self.channel_list: for self.channel in self.channel_list:
for self.nss in self.nss_list: for self.nss in self.nss_list:
for self.bandwidth in self.bandwidth_list: for self.bandwidth in self.bandwidth_list:
# tx_power is passed in as # tx_power is passed in so run will contain all tx powers from command line
for self.tx_power in self.tx_power_list: # log may contain multiple runs - this helps put the meta.txt
# log may contain multiple runs - this helps put the meta.txt # in right directory
# in right directory self.iteration = 0
self.iteration = 0 self.report_index = 0
self.report_index = 0 for self.iteration in range(self.test_iterations):
for self.iteration in range(self.test_iterations): self.iteration += 1
self.iteration += 1 # in batch mode need to set the VARIABLES back into the test
# Runs the scripts # Runs the scripts
self.run_script() self.run_script()
elif self.channel_list and self.nss_list and not self.bandwidth_list and not self.tx_power_list:
for self.channel in self.channel_list:
for self.nss in self.nss_list:
# use bandwidth tx_power is passed in from command line
# one run will contain all the bandwiths and tx_power settings
# log may contain multiple runs - this helps put the meta.txt
# in right directory
self.iteration = 0
self.report_index = 0
for self.iteration in range(self.test_iterations):
self.iteration += 1
# Runs the scripts
self.run_script()
else: else:
# log may contain multiple runs - this helps put the meta.txt # log may contain multiple runs - this helps put the meta.txt
@@ -1283,7 +1299,6 @@ QA Report Dashboard: lf_qa.py was not run as last script of test suite"""
# Runs the scripts # Runs the scripts
self.run_script() self.run_script()
else: else:
self.logger.warning( self.logger.warning(
"enable value {} for test: {} ".format(self.test_dict[self.test]['enabled'], self.test)) "enable value {} for test: {} ".format(self.test_dict[self.test]['enabled'], self.test))
@@ -1373,7 +1388,6 @@ note if all json data (rig,dut,tests) in same json file pass same json in for a
parser.add_argument("--lf_logger_config_json", parser.add_argument("--lf_logger_config_json",
help="--lf_logger_config_json <json file> , json configuration of logger") help="--lf_logger_config_json <json file> , json configuration of logger")
args = parser.parse_args() args = parser.parse_args()
# set up logger # set up logger
@@ -1383,8 +1397,6 @@ note if all json data (rig,dut,tests) in same json file pass same json in for a
logger_config.lf_logger_config_json = args.lf_logger_config_json logger_config.lf_logger_config_json = args.lf_logger_config_json
logger_config.load_lf_logger_config() logger_config.load_lf_logger_config()
# load test config file information either <config>.json # load test config file information either <config>.json
json_rig = "" json_rig = ""
try: try:
@@ -1431,7 +1443,6 @@ note if all json data (rig,dut,tests) in same json file pass same json in for a
server_override = args.server_override server_override = args.server_override
db_override = args.db_override db_override = args.db_override
# TODO create config for --no_email
if args.production: if args.production:
production = True production = True
print("Email to production list") print("Email to production list")