cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix nxos_banner module for unstructured output (#36411)

Browse source 
* Fix nxos_banner module for unstructured output

* Refactor and bug fixes

* Fix pep8 error
This commit is contained in:
Mike Wiebe 2018-02-20 23:21:41 -05:00 committed by Trishna Guha
parent 2bffcfa63b
commit ef7d574920
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/ansible/modules/network/nxos/nxos_banner.py
View file

@ -94,6 +94,23 @@ from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_arg
import re
def execute_show_command(module, command):
format = 'json'
cmds = [{
'command': command,
'output': format,
}]
output = run_commands(module, cmds, False)
if len(output) == 0 or len(output[0]) == 0:
# If we get here the platform does not
# support structured output. Resend as
# text.
cmds[0]['output'] = 'text'
output = run_commands(module, cmds, False)
return output
def map_obj_to_commands(want, have, module):
commands = list()
state = module.params['state']
@ -111,7 +128,8 @@ def map_obj_to_commands(want, have, module):
def map_config_to_obj(module):
output = run_commands(module, ['show banner %s' % module.params['banner']], False)[0]
command = 'show banner %s' % module.params['banner']
output = execute_show_command(module, command)[0]
if "Invalid command" in output:
module.fail_json(msg="banner: exec may not be supported on this platform. Possible values are : exec | motd")
@ -128,6 +146,8 @@ def map_config_to_obj(module):
output = output[0]
else:
output = ''
else:
output = output.rstrip()
obj = {'banner': module.params['banner'], 'state': 'absent'}
if output: