Fix VyOS cli prompt issues (#56389)

Signed-off-by: NilashishC <nilashishchakraborty8@gmail.com>
(cherry picked from commit 30ccc8e1bd)

Add changelog for vyos prompt fix
pull/56847/head
Nilashish Chakraborty 6 years ago committed by Toshio Kuratomi
parent 85b21c2c9b
commit aa616b436c

@ -0,0 +1,2 @@
bugfixes:
- Fix vyos cli prompt inspection (https://github.com/ansible/ansible/pull/55589)

@ -83,10 +83,10 @@ class ActionModule(_ActionModule):
conn = Connection(socket_path)
out = conn.get_prompt()
while to_text(out, errors='surrogate_then_replace').strip().endswith(')#'):
if to_text(out, errors='surrogate_then_replace').strip().endswith('#'):
display.vvvv('wrong context, sending exit to device', self._play_context.remote_addr)
conn.send_command('abort')
out = conn.get_prompt()
conn.send_command('exit discard')
result = super(ActionModule, self).run(task_vars=task_vars)
return result

@ -98,6 +98,8 @@ class Cliconf(CliconfBase):
self.discard_changes()
else:
self.send_command('exit')
if to_text(self._connection.get_prompt(), errors='surrogate_or_strict').strip().endswith('#'):
self.discard_changes()
if diff_config:
resp['diff'] = diff_config

Loading…
Cancel
Save