ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-23 19:01:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Adding stderr regex catch for iosxr commit failures. Adding error handling after executing commit command. (#26462)

Browse source
This commit is contained in:
James Mighion 2017-07-05 20:49:24 -07:00 • committed by Ganesh Nalawade
parent 895e6c5d06
commit e785cc53db
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/module_utils/iosxr.py
View file

@ -137,6 +137,9 @@ def load_config(module, commands, warnings, commit=False, replace=False, comment
else: else:
cmd = 'abort' cmd = 'abort'
diff = None diff = None
exec_command(module, cmd) rc, out, err = exec_command(module, cmd)
if rc != 0:
exec_command(module, 'abort')
module.fail_json(msg=err, commands=commands, rc=rc)
return to_text(diff, errors='surrogate_or_strict') return to_text(diff, errors='surrogate_or_strict')

1
lib/ansible/plugins/terminal/iosxr.py
View file

@ -42,6 +42,7 @@ class TerminalModule(TerminalBase):
re.compile(br"connection timed out", re.I), re.compile(br"connection timed out", re.I),
re.compile(br"[^\r\n]+ not found", re.I), re.compile(br"[^\r\n]+ not found", re.I),
re.compile(br"'[^']' +returned error code: ?\d+"), re.compile(br"'[^']' +returned error code: ?\d+"),
re.compile(br"Failed to commit", re.I)
] ]
def on_open_shell(self): def on_open_shell(self):