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

Fixing nxos_smu (#5021)

Browse source
This commit is contained in:
Gabriele 2016-09-30 16:20:37 -04:00 committed by Matt Clay
parent cda65cad18
commit ebb39a0151
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/ansible/modules/network/nxos/nxos_smu.py
View file

@ -764,6 +764,19 @@ def execute_show(cmds, module, command_type=None):
clie = get_exception() clie = get_exception()
module.fail_json(msg='Error sending {0}'.format(cmds), module.fail_json(msg='Error sending {0}'.format(cmds),
error=str(clie)) error=str(clie))
except AttributeError:
try:
if command_type:
command_type = command_type_map.get(command_type)
module.cli.add_commands(cmds, output=command_type)
response = module.cli.run_commands()
else:
module.cli.add_commands(cmds, raw=True)
response = module.cli.run_commands()
except ShellError:
clie = get_exception()
module.fail_json(msg='Error sending {0}'.format(cmds),
error=str(clie))
return response return response
@ -788,12 +801,21 @@ def remote_file_exists(module, dst, file_system='bootflash:'):
def execute_config_command(commands, module): def execute_config_command(commands, module):
try: try:
response = module.configure(commands) output = module.configure(commands)
except ShellError: except ShellError:
clie = get_exception() clie = get_exception()
module.fail_json(msg='Error sending CLI commands', module.fail_json(msg='Error sending CLI commands',
error=str(clie), commands=commands) error=str(clie), commands=commands)
return response except AttributeError:
try:
commands.insert(0, 'configure')
module.cli.add_commands(commands, output='config')
output = module.cli.run_commands()
except ShellError:
clie = get_exception()
module.fail_json(msg='Error sending CLI commands',
error=str(clie), commands=commands)
return output
def apply_patch(module, commands): def apply_patch(module, commands):
@ -852,11 +874,14 @@ def main():
if not module.check_mode and commands: if not module.check_mode and commands:
try: try:
apply_patch(module, commands) apply_patch(module, commands)
changed=True changed = True
except ShellError: except ShellError:
e = get_exception() e = get_exception()
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
if 'configure' in commands:
commands.pop(0)
module.exit_json(changed=changed, module.exit_json(changed=changed,
pkg=pkg, pkg=pkg,
file_system=file_system, file_system=file_system,