diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index cac2e996..498e6459 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -292,8 +292,10 @@ class lf_check(): self.lanforge_gui_version_full = stdout.readlines() # print('\n'.join(output)) 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_version.strip() + print("lanforge_gui_version: {lanforge_gui_version}".format(lanforge_gui_version=self.lanforge_gui_version)) ssh.close() time.sleep(1) 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("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('gui_version: {gui_version} \n'.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 diff --git a/py-scripts/tools/lf_qa.py b/py-scripts/tools/lf_qa.py index 75a61e8e..f98dd4e3 100755 --- a/py-scripts/tools/lf_qa.py +++ b/py-scripts/tools/lf_qa.py @@ -120,6 +120,7 @@ class csv_sqlite_dash(): test_tag = "NA" use_meta_test_tag = False gui_version_5_4_3 = False + print("read meta path {_kpi_path}".format(_kpi_path=_kpi_path)) try: meta_data_path = _kpi_path + '/' + '/meta.txt' meta_data_fd = open(meta_data_path, 'r') @@ -278,14 +279,15 @@ class csv_sqlite_dash(): print("graph_group_list: {}".format(graph_group_list)) # prior to 5.4.3 there was not test-tag - try: - test_tag_list = list(df3['test-tag']) - test_tag_list = list(set(test_tag_list)) - print("test_tag_list: {}".format(test_tag_list) ) - except: - test_tag_list = ['NO_TAG_PRE_5.4.4'] - print("exception when creating test_tag_list: {}".format(test_tag_list) ) - print("Check database, exception when creating test_tag_list: {}".format(test_tag_list) ) + #try: + print("dataframe df3 {df3}".format(df3=df3)) + test_tag_list = list(df3['test-tag']) + test_tag_list = list(set(test_tag_list)) + print("test_tag_list: {}".format(test_tag_list) ) + #except: + #test_tag_list = ['NO_TAG_PRE_5.4.4'] + #print("exception when creating test_tag_list: {}".format(test_tag_list) ) + #print("Check database, exception when creating test_tag_list: {}".format(test_tag_list) )