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

Change default output of NXAPI to text to match CLI (#40607)

Browse source 
* Default output format for nxapi now 'text'

* Apply json output to both types of input

* Add missing ConnectionError import to cliconf plugins
This commit is contained in:
Nathaniel Case 2018-05-23 10:09:50 -04:00 • committed by GitHub
parent 4cc4d63289
commit d028a0257a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/plugins/httpapi/nxos.py
View file

@ -35,22 +35,24 @@ class HttpApi:
responses = list()
for item in to_list(data):
cmd_output = message_kwargs.get('output', 'json')
cmd_output = message_kwargs.get('output', 'text')
if isinstance(item, dict):
command = item['command']
if command.endswith('| json'):
command = command.rsplit('|', 1)[0]
cmd_output = 'json'
elif 'output' in item:
if 'output' in item:
cmd_output = item['output']
else:
command = item
# Emulate '| json' from CLI
if command.endswith('| json'):
command = command.rsplit('|', 1)[0]
cmd_output = 'json'
if output and output != cmd_output:
responses.extend(self._run_queue(queue, output))
queue = list()
output = cmd_output or 'json'
output = cmd_output
queue.append(command)
if queue: