Skip to content

[loganalyzer] Address whitespace issue and write marker to syslog after update #1754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neethajohn merged 2 commits into from
Jun 11, 2020
Merged

[loganalyzer] Address whitespace issue and write marker to syslog after update #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0887497
Write marker to syslog after update
neethajohn Jun 10, 2020
9c8c597
Replace whitespaces if any in marker name with underscore
neethajohn Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/common/plugins/loganalyzer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
11 changes: 9 additions & 2 deletions tests/common/plugins/loganalyzer/loganalyzer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down Expand Up @@ -88,7 +88,8 @@ 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):
"""
Expand Down Expand Up @@ -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)

Expand Down