lf_check.py , lf_qa.py : reading meta data for 5.4.3 test-tag

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-08-21 17:18:40 -06:00
parent 88b2b7b18a
commit b2fa1f59b2
2 changed files with 13 additions and 9 deletions

View File

@@ -292,8 +292,10 @@ class lf_check():
self.lanforge_gui_version_full = stdout.readlines() self.lanforge_gui_version_full = stdout.readlines()
# print('\n'.join(output)) # print('\n'.join(output))
self.lanforge_gui_version_full = [line.replace('\n', '') for line in self.lanforge_gui_version_full] 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_verion_full.split('Version:',maxsplit=1)[-1].split(maxsplit=1)[0] 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() self.lanforge_gui_version = self.lanforge_gui_version.strip()
print("lanforge_gui_version: {lanforge_gui_version}".format(lanforge_gui_version=self.lanforge_gui_version))
ssh.close() ssh.close()
time.sleep(1) time.sleep(1)
return self.lanforge_gui_version_full return self.lanforge_gui_version_full
@@ -1053,7 +1055,7 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
meta_data_fd.write('$ meta.txt file location\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("file {path}\n".format(path=meta_data_path))
meta_data_fd.write('$ LANforge GUI\n') 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('gui_version: {gui_version} \n'.format(gui_version=self.lanforge_gui_version))
meta_data_fd.write('$ LANforge command\n') meta_data_fd.write('$ LANforge command\n')
meta_data_fd.write("command {command}\n".format(command=command)) 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 # split command at test-tag , at rest of string once at the actual test-tag value

View File

@@ -120,6 +120,7 @@ class csv_sqlite_dash():
test_tag = "NA" test_tag = "NA"
use_meta_test_tag = False use_meta_test_tag = False
gui_version_5_4_3 = False gui_version_5_4_3 = False
print("read meta path {_kpi_path}".format(_kpi_path=_kpi_path))
try: try:
meta_data_path = _kpi_path + '/' + '/meta.txt' meta_data_path = _kpi_path + '/' + '/meta.txt'
meta_data_fd = open(meta_data_path, 'r') meta_data_fd = open(meta_data_path, 'r')
@@ -278,14 +279,15 @@ class csv_sqlite_dash():
print("graph_group_list: {}".format(graph_group_list)) print("graph_group_list: {}".format(graph_group_list))
# prior to 5.4.3 there was not test-tag # prior to 5.4.3 there was not test-tag
try: #try:
print("dataframe df3 {df3}".format(df3=df3))
test_tag_list = list(df3['test-tag']) test_tag_list = list(df3['test-tag'])
test_tag_list = list(set(test_tag_list)) test_tag_list = list(set(test_tag_list))
print("test_tag_list: {}".format(test_tag_list) ) print("test_tag_list: {}".format(test_tag_list) )
except: #except:
test_tag_list = ['NO_TAG_PRE_5.4.4'] #test_tag_list = ['NO_TAG_PRE_5.4.4']
print("exception when creating test_tag_list: {}".format(test_tag_list) ) #print("exception when creating test_tag_list: {}".format(test_tag_list) )
print("Check database, exception when creating test_tag_list: {}".format(test_tag_list) ) #print("Check database, exception when creating test_tag_list: {}".format(test_tag_list) )