Skip to content

[warm-reboot] Fix trying to access match group when regex match failed #1095

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 1 commit into from
Sep 10, 2019
Merged

[warm-reboot] Fix trying to access match group when regex match failed #1095

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions ansible/roles/test/files/ptftests/sad_path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,14 +354,15 @@ def verify_dut_lag_state(self, pre_check=True):
stdout, stderr, return_code = self.cmd(['ssh', '-oStrictHostKeyChecking=no', self.dut_ssh, 'show interfaces portchannel'])
if return_code == 0:
for line in stdout.split('\n'):
if any(po_name in line for po_name in po_list):
is_match = pat.match(line)
if is_match and self.verify_dut_lag_member_state(is_match, pre_check=pre_check):
self.log.append('Lag state is down as expected on the DUT for %s' % is_match.group(1))
self.log.append('Pattern check: %s' % line)
else:
self.fails['dut'].add('%s: Lag state is not down on the DUT for %s' % (self.msg_prefix[pre_check], is_match.group(1)))
self.fails['dut'].add('%s: Obtained: %s' % (self.msg_prefix[pre_check], line))
for po_name in po_list:
if po_name in line:
is_match = pat.match(line)
if is_match and self.verify_dut_lag_member_state(is_match, pre_check=pre_check):
self.log.append('Lag state is down as expected on the DUT for %s' % po_name)
self.log.append('Pattern check: %s' % line)
else:
self.fails['dut'].add('%s: Lag state is not down on the DUT for %s' % (self.msg_prefix[pre_check], po_name))
self.fails['dut'].add('%s: Obtained: %s' % (self.msg_prefix[pre_check], line))
else:
self.fails['dut'].add('%s: Retreiving LAG info from DUT side failed' % self.msg_prefix[pre_check])
self.fails['dut'].add('%s: Return code: %d' % (self.msg_prefix[pre_check], return_code))
Expand Down