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

Fix eos integration test failure (#33407)

Browse source 
Fixes #33406
Fixes #33405

*  Fix typo in network_cli for sendonly
*  Send `abort` to remote device in case configuration fails
*  Fix indentation issue in eos_static_route integration test

*  Revert network_cli change
This commit is contained in:
Ganesh Nalawade 2017-11-30 20:47:05 +05:30 • committed by GitHub
parent d7ca068c3f
commit 35acae7ea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,7 +114,7 @@ class Connection(ConnectionBase):
try:
cmd = json.loads(to_text(cmd, errors='surrogate_or_strict'))
kwargs = {'command': to_bytes(cmd['command'], errors='surrogate_or_strict')}
for key in ('prompt', 'answer', 'send_only'):
for key in ('prompt', 'answer', 'sendonly'):
if cmd.get(key) is not None:
kwargs[key] = to_bytes(cmd[key], errors='surrogate_or_strict')
return self.send(**kwargs)
@ -270,7 +270,6 @@ class Connection(ConnectionBase):
recv.seek(offset)
window = self._strip(recv.read())
if prompts and not handled:
handled = self._handle_prompt(window, prompts, answer)
@ -279,14 +278,14 @@ class Connection(ConnectionBase):
resp = self._strip(self._last_response)
return self._sanitize(resp, command)
def send(self, command, prompt=None, answer=None, send_only=False):
def send(self, command, prompt=None, answer=None, sendonly=False):
'''
Sends the command to the device in the opened shell
'''
try:
self._history.append(command)
self._ssh_shell.sendall(b'%s\r' % command)
if send_only:
if sendonly:
return
response = self.receive(command, prompt, answer)
return to_text(response, errors='surrogate_or_strict')