lf_check.py : stored simplified version of LANforge in meta file

lf_qa.py : read test_tag from meta file

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-08-21 11:58:13 -06:00
parent d6fb708406
commit 93b983d0cf
2 changed files with 60 additions and 16 deletions

View File

@@ -126,6 +126,10 @@ class lf_check():
self.background_purple = "background-color:purple"
self.background_blue = "background-color:blue"
# LANforge information
self.lanforge_gui_version_full = ""
self.lanforge_gui_version = ""
# results
self.test_start_time = ""
self.test_end_time = ""
@@ -285,12 +289,14 @@ class lf_check():
ssh.connect(hostname=self.lf_mgr_ip, port=22, username=self.lf_mgr_user, password=self.lf_mgr_pass,
allow_agent=False, look_for_keys=False, banner_timeout=600)
stdin, stdout, stderr = ssh.exec_command('./btserver --version | grep Version')
lanforge_gui_version = stdout.readlines()
self.lanforge_gui_version_full = stdout.readlines()
# print('\n'.join(output))
lanforge_gui_version = [line.replace('\n', '') for line in lanforge_gui_version]
self.lanforge_gui_version_full = [line.replace('\n', '') for line in self.lanforge_gui_version_full]
self.lanforge_gui_version = self.lanforge_gui_verion_full.split('Version:',maxsplit=1)[-1].split(maxsplit=1)[0]
self.lanforge_gui_version = self.lanforge_gui_version.strip()
ssh.close()
time.sleep(1)
return lanforge_gui_version
return self.lanforge_gui_version_full
def get_radio_status(self):
radio_status = self.json_get("/radiostatus/all")
@@ -1042,21 +1048,21 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
break
stdout_log_fd.close()
if meta_data_path != "":
meta_data = open(meta_data_path,'w')
meta_data.write('$ Generated by Candela Technologies LANforge network testing tool\n')
meta_data.write('$ meta.txt file location\n')
meta_data.write("file {path}\n".format(path=meta_data_path))
meta_data.write('$ LANforge command\n')
meta_data.write("command {command}\n".format(command=command))
meta_data_fd = open(meta_data_path,'w')
meta_data_fd.write('$ Generated by Candela Technologies LANforge network testing tool\n')
meta_data_fd.write('$ meta.txt file location\n')
meta_data_fd.write("file {path}\n".format(path=meta_data_path))
meta_data_fd.write('$ LANforge GUI\n')
meta_data_fd.write('gui_version: {gui_version}'.format(gui_version=self.lanforge_gui_version))
meta_data_fd.write('$ LANforge command\n')
meta_data_fd.write("command {command}\n".format(command=command))
# split command at test-tag , at rest of string once at the actual test-tag value
test_tag = command.split('test_tag',maxsplit=1)[-1].split(maxsplit=1)[0]
test_tag = test_tag.replace("'","")
meta_data.write('$ LANforge command\n')
meta_data.write("test_tag {test_tag}\n".format(test_tag=test_tag))
meta_data.write('$ LANforge Information\n')
meta_data.close()
meta_data_fd.write('$ LANforge test_tag\n')
meta_data_fd.write("test_tag {test_tag}\n".format(test_tag=test_tag))
meta_data_fd.write('$ LANforge Information\n')
meta_data_fd.close()
if self.test_result != "TIMEOUT":
stderr_log_size = os.path.getsize(stderr_log_txt)