From 0887497e43fb8247c96d16cd0e42573e04a67cb7 Mon Sep 17 00:00:00 2001 From: Neetha John Date: Wed, 10 Jun 2020 15:53:45 -0700 Subject: [PATCH 1/2] Write marker to syslog after update Signed-off-by: Neetha John --- tests/common/plugins/loganalyzer/README.md | 2 +- tests/common/plugins/loganalyzer/loganalyzer.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/common/plugins/loganalyzer/README.md b/tests/common/plugins/loganalyzer/README.md index 4b6bfe7d9f4..2919fcdb4e7 100644 --- a/tests/common/plugins/loganalyzer/README.md +++ b/tests/common/plugins/loganalyzer/README.md @@ -85,7 +85,7 @@ loganalyzer.init() - can be called several times without calling "loganalyzer.an # Example 4 # Update previously configured marker # Now start marker will have new prefix - test_bgp - loganalyzer.update_marker_prefix("test_bgp") + marker = loganalyzer.update_marker_prefix("test_bgp") def get_platform_info(dut): """ diff --git a/tests/common/plugins/loganalyzer/loganalyzer.py b/tests/common/plugins/loganalyzer/loganalyzer.py index 54c77821e54..d8a74eb8eaf 100644 --- a/tests/common/plugins/loganalyzer/loganalyzer.py +++ b/tests/common/plugins/loganalyzer/loganalyzer.py @@ -89,6 +89,7 @@ def update_marker_prefix(self, marker_prefix): @summary: Update configured marker prefix """ self.marker_prefix = marker_prefix + return self._setup_marker() def load_common_config(self): """ @@ -137,6 +138,12 @@ def init(self): self.ansible_host.copy(src=ANSIBLE_LOGANALYZER_MODULE, dest=os.path.join(self.dut_run_dir, "loganalyzer.py")) + return self._setup_marker() + + def _setup_marker(self): + """ + Adds the marker to the syslog + """ start_marker = ".".join((self.marker_prefix, time.strftime("%Y-%m-%d-%H:%M:%S", time.gmtime()))) cmd = "python {run_dir}/loganalyzer.py --action init --run_id {start_marker}".format(run_dir=self.dut_run_dir, start_marker=start_marker) From 9c8c597e63f683c9900960d5004e84b52a0b791b Mon Sep 17 00:00:00 2001 From: Neetha John Date: Wed, 10 Jun 2020 17:07:04 -0700 Subject: [PATCH 2/2] Replace whitespaces if any in marker name with underscore Signed-off-by: Neetha John --- tests/common/plugins/loganalyzer/loganalyzer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/common/plugins/loganalyzer/loganalyzer.py b/tests/common/plugins/loganalyzer/loganalyzer.py index d8a74eb8eaf..e66d8a23401 100644 --- a/tests/common/plugins/loganalyzer/loganalyzer.py +++ b/tests/common/plugins/loganalyzer/loganalyzer.py @@ -29,7 +29,7 @@ def __init__(self, ansible_host, marker_prefix, dut_run_dir="/tmp"): self.ansible_host = ansible_host self.dut_run_dir = dut_run_dir self.extracted_syslog = os.path.join(self.dut_run_dir, "syslog") - self.marker_prefix = marker_prefix + self.marker_prefix = marker_prefix.replace(' ', '_') self.ansible_loganalyzer = ansible_loganalyzer(self.marker_prefix, False) self.match_regex = [] @@ -88,7 +88,7 @@ def update_marker_prefix(self, marker_prefix): """ @summary: Update configured marker prefix """ - self.marker_prefix = marker_prefix + self.marker_prefix = marker_prefix.replace(' ', '_') return self._setup_marker() def load_common_config(self):