From eebfa66c2bc1ac57b2599e6f432026a05abaad43 Mon Sep 17 00:00:00 2001 From: Ganesh Nalawade Date: Fri, 20 Apr 2018 21:50:13 +0530 Subject: [PATCH] Fix ios and iosxr terminal prompt regex (#39063) Fixes #38732 Make matching leading newline for cli prompt optional as there are cases when returned repsonse for ios/iosx remote host doesn't have newline before cli prompt. --- lib/ansible/plugins/terminal/ios.py | 2 +- lib/ansible/plugins/terminal/iosxr.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/plugins/terminal/ios.py b/lib/ansible/plugins/terminal/ios.py index af9e3bf29ad..61927bda906 100644 --- a/lib/ansible/plugins/terminal/ios.py +++ b/lib/ansible/plugins/terminal/ios.py @@ -30,7 +30,7 @@ from ansible.plugins.terminal import TerminalBase class TerminalModule(TerminalBase): terminal_stdout_re = [ - re.compile(br"[\r\n][\w\+\-\.:\/\[\]]+(?:\([^\)]+\)){0,3}(?:[>#]) ?$") + re.compile(br"[\r\n]?[\w\+\-\.:\/\[\]]+(?:\([^\)]+\)){0,3}(?:[>#]) ?$") ] terminal_stderr_re = [ diff --git a/lib/ansible/plugins/terminal/iosxr.py b/lib/ansible/plugins/terminal/iosxr.py index 100b3d5863a..6a9657d0ab5 100644 --- a/lib/ansible/plugins/terminal/iosxr.py +++ b/lib/ansible/plugins/terminal/iosxr.py @@ -29,7 +29,7 @@ from ansible.errors import AnsibleConnectionFailure class TerminalModule(TerminalBase): terminal_stdout_re = [ - re.compile(br"[\r\n][\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"), + re.compile(br"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"), re.compile(br']]>]]>[\r\n]?') ]