wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes issue with prompt detection in network_cli (#21574)

Browse source 
The network_cli plugin would return immediately if an error was
detected.  This patch will force the connection plugin to still try to
detect the current prompt even if an error is found.
This commit is contained in:
Peter Sprygada 2017-02-17 09:13:26 -05:00 committed by John R Barker
parent d3d1aa2dca
commit 4cbbed0b37
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/plugins/action/ios.py
View file

@ -68,6 +68,13 @@ class ActionModule(_ActionModule):
rc, out, err = connection.exec_command('open_shell()')
if not rc == 0:
return {'failed': True, 'msg': 'unable to open shell', 'rc': rc}
else:
# make sure we are in the right cli context which should be
# enable mode and not config module
rc, out, err = connection.exec_command('prompt()')
if str(out).strip().endswith(')#'):
display.vvv('wrong context, sending exit to device', self._play_context.remote_addr)
connection.exec_command('exit')
task_vars['ansible_socket'] = socket_path
@ -75,15 +82,7 @@ class ActionModule(_ActionModule):
self._play_context.become = False
self._play_context.become_method = None
results = super(ActionModule, self).run(tmp, task_vars)
# need to make sure to leave config mode if the module didn't clean up
rc, out, err = connection.exec_command('prompt()')
if str(out).strip().endswith(')#'):
connection.exec_command('exit')
return results
return super(ActionModule, self).run(tmp, task_vars)
def _get_socket_path(self, play_context):
ssh = connection_loader.get('ssh', class_only=True)
@ -117,5 +116,3 @@ class ActionModule(_ActionModule):
return strategy(*args, **kwargs)
except AnsibleFallbackNotFound:
pass

10
lib/ansible/plugins/connection/network_cli.py
View file

@ -193,16 +193,22 @@ class Connection(_Connection):
def _find_prompt(self, response):
"""Searches the buffered response for a matching command prompt"""
errored_response = None
for regex in self._terminal.terminal_errors_re:
if regex.search(response):
raise AnsibleConnectionFailure(response)
errored_response = response
break
for regex in self._terminal.terminal_prompts_re:
match = regex.search(response)
if match:
self._matched_pattern = regex.pattern
self._matched_prompt = match.group()
return True
if not errored_response:
return True
if errored_response:
raise AnsibleConnectionFailure(errored_response)
def alarm_handler(self, signum, frame):
"""Alarm handler raised in case of command timeout """