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

Fixing nxos_hsrp (#5009)

Browse source 
* Fixing nxos_hsrp

* Adding space after =
This commit is contained in:
Gabriele 2016-10-01 20:34:21 -04:00 committed by Matt Clay
parent 21ae84a04e
commit b6c07bc9e9
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_hsrp.py
View file

@ -798,11 +798,21 @@ def load_config(module, candidate):
def execute_config_command(commands, module): def execute_config_command(commands, module):
try: try:
body = module.configure(commands) output = module.configure(commands)
except ShellError, clie: except ShellError:
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 body 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 get_cli_body_ssh(command, response, module): def get_cli_body_ssh(command, response, module):
@ -837,6 +847,19 @@ def execute_show(cmds, module, command_type=None):
clie = get_exception() clie = get_exception()
module.fail_json(msg='Error sending {0}'.format(command), module.fail_json(msg='Error sending {0}'.format(command),
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
@ -1174,6 +1197,8 @@ def main():
validate_config(body, vip, module) validate_config(body, vip, module)
changed = True changed = True
end_state = get_hsrp_group(group, interface, module) end_state = get_hsrp_group(group, interface, module)
if 'configure' in commands:
commands.pop(0)
results = {} results = {}
results['proposed'] = proposed results['proposed'] = proposed