lf_check.py : LANforge server version in the output

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-09-22 06:20:31 -06:00
parent 974d04d1b1
commit 1dde46c7bd

View File

@@ -143,8 +143,8 @@ class lf_check():
# LANforge information
self.lanforge_system_node_version = ""
self.lanforge_kernel_version = ""
self.lanforge_gui_version_full = ""
self.lanforge_gui_version = ""
self.lanforge_server_version_full = ""
self.lanforge_server_version = ""
# meta.txt
self.meta_data_path = ""
@@ -279,21 +279,21 @@ class lf_check():
time.sleep(1)
return self.lanforge_kernel_version
def get_lanforge_gui_version(self):
def get_lanforge_server_version(self):
ssh = paramiko.SSHClient() # creating shh client object we use this object to connect to router
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) # automatically adds the missing host key
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')
self.lanforge_gui_version_full = stdout.readlines()
self.lanforge_gui_version_full = [line.replace('\n', '') for line in self.lanforge_gui_version_full]
print("lanforge_gui_version_full: {lanforge_gui_version_full}".format(lanforge_gui_version_full=self.lanforge_gui_version_full))
self.lanforge_gui_version = self.lanforge_gui_version_full[0].split('Version:',maxsplit=1)[-1].split(maxsplit=1)[0]
self.lanforge_gui_version = self.lanforge_gui_version.strip()
print("lanforge_gui_version: {lanforge_gui_version}".format(lanforge_gui_version=self.lanforge_gui_version))
self.lanforge_server_version_full = stdout.readlines()
self.lanforge_server_version_full = [line.replace('\n', '') for line in self.lanforge_server_version_full]
print("lanforge_server_version_full: {lanforge_server_version_full}".format(lanforge_server_version_full=self.lanforge_server_version_full))
self.lanforge_server_version = self.lanforge_server_version_full[0].split('Version:',maxsplit=1)[-1].split(maxsplit=1)[0]
self.lanforge_server_version = self.lanforge_server_version.strip()
print("lanforge_server_version: {lanforge_server_version}".format(lanforge_server_version=self.lanforge_server_version))
ssh.close()
time.sleep(1)
return self.lanforge_gui_version_full
return self.lanforge_server_version_full
def get_radio_status(self):
radio_status = self.json_get("/radiostatus/all")
@@ -932,8 +932,8 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
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} \n'.format(gui_version=self.lanforge_gui_version))
meta_data_fd.write('$ LANforge SERVER\n')
meta_data_fd.write('server_version: {server_version} \n'.format(server_version=self.lanforge_server_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
@@ -945,7 +945,7 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
meta_data_fd.write('$ LANforge Information\n')
meta_data_fd.write("lanforge_system_node {lanforge_system_node}\n".format(lanforge_system_node=self.lanforge_system_node_version[0]))
meta_data_fd.write("lanforge_kernel_version {lanforge_kernel_version}\n".format(lanforge_kernel_version=self.lanforge_kernel_version[0]))
meta_data_fd.write("lanforge_gui_version_full {lanforge_gui_version_full}\n".format(lanforge_gui_version_full=self.lanforge_gui_version_full[0]))
meta_data_fd.write("lanforge_server_version_full {lanforge_server_version_full}\n".format(lanforge_server_version_full=self.lanforge_server_version_full[0]))
meta_data_fd.close()
if self.test_result != "TIMEOUT":
@@ -1113,7 +1113,7 @@ note if all json data (rig,dut,tests) in same json file pass same json in for a
lanforge_system_node_version = 'NO_LF_NODE_VER'
scripts_git_sha = 'NO_GIT_SHA'
lanforge_kernel_version = 'NO_KERNEL_VER'
lanforge_gui_version_full = 'NO_LF_GUI_VER'
lanforge_server_version_full = 'NO_LF_SERVER_VER'
# select test suite
test_suite = args.suite
@@ -1194,10 +1194,10 @@ note if all json data (rig,dut,tests) in same json file pass same json in for a
exit(1)
try:
lanforge_gui_version_full = check.get_lanforge_gui_version()
print("lanforge_gui_version_full {lanforge_gui_version_full}".format(lanforge_gui_version_full=lanforge_gui_version_full))
lanforge_server_version_full = check.get_lanforge_server_version()
print("lanforge_server_version_full {lanforge_server_version_full}".format(lanforge_server_version_full=lanforge_server_version_full))
except:
print("lanforge_gui_version exception, tests aborted check lanforge ip")
print("lanforge_server_version exception, tests aborted check lanforge ip")
exit(1)
try:
@@ -1239,7 +1239,7 @@ note if all json data (rig,dut,tests) in same json file pass same json in for a
lf_test_setup = pd.DataFrame()
lf_test_setup['LANforge'] = lanforge_system_node_version
lf_test_setup['kernel version'] = lanforge_kernel_version
lf_test_setup['GUI version'] = lanforge_gui_version_full
lf_test_setup['Server version'] = lanforge_server_version_full
lf_test_setup['scripts git sha'] = scripts_git_sha
# Successfully gathered LANforge information Run Tests