Skip to content

[auto techsupport] | "show auto-techsupport" CLI output was changed in new 202205 image. #6466

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
liat-grozovik merged 2 commits into from
Oct 6, 2022
Merged

[auto techsupport] | "show auto-techsupport" CLI output was changed in new 202205 image. #6466

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c29869f
Removed AutoTechSupportCli202205 form auto techsupport test because t…
Oct 5, 2022
ce44b9a
Fixed regexp string in case of N/A in the output
Oct 5, 2022
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
12 changes: 3 additions & 9 deletions tests/common/multibranch/cli/auto_techsupport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ def __new__(cls, *args, **kwargs):
release = kwargs.get('release')
duthost = kwargs.get('duthost')
supported_cli_classes = {'default': AutoTechSupportCliDefault(duthost),
'202111': AutoTechSupportCli202111(duthost),
'202205': AutoTechSupportCli202205(duthost)}
'202111': AutoTechSupportCli202111(duthost)}

cli_class = supported_cli_classes.get(release, supported_cli_classes['default'])
cli_class_name = cli_class.__class__.__name__
Expand Down Expand Up @@ -43,7 +42,7 @@ def parse_show_auto_techsupport_global(self):
'max_techsupport_limit': '10', 'max_core_size': '5', 'since': '2 days ago'}
"""
with allure.step('Parsing "show auto-techsupport global" output'):
regexp = r'(enabled|disabled)\s+(\d+)\s+(\d+.\d+|\d+)\s+(\d+.\d+|\d+)\s+(\d+)\s+(\d+)\s+(.*)'
regexp = r'(enabled|disabled)\s+(\d+)\s+(\d+.\d+|\d+)\s+(\d+.\d+|\d+)\s+(\d+|N\/A)\s+(\d+|N\/A)\s+(.*)'
cmd_output = self.show_auto_techsupport_global()
state, rate_limit_interval, max_techsupport_limit, max_core_size, avail_mem, min_avail_mem, since = \
re.search(regexp, cmd_output).groups()
Expand Down Expand Up @@ -86,7 +85,7 @@ def parse_show_auto_techsupport_feature(self):
"""
with allure.step('Parsing "show auto-techsupport-feature" output'):
result_dict = {}
regexp = r'(.*)\s+(enabled|disabled)\s+(\d+)\s+(\d+\.\d|N/A)'
regexp = r'(.*)\s+(enabled|disabled)\s+(\d+)\s+(\d+\.\d|N\/A)'
cmd_output = self.show_auto_techsupport_feature()

name_index = 0
Expand Down Expand Up @@ -214,8 +213,3 @@ def parse_show_auto_techsupport_history(self):
result_dict[dump[dump_name_index].strip()] = {'triggered_by': dump[triggered_by_index],
'core_dump': dump[core_dump_index]}
return result_dict


class AutoTechSupportCli202205(AutoTechSupportCli202111):
def __int__(self, *args, **kwargs):
pass