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

Fixing nxos_acl (#5006)

Browse source 
* Fixing nxos_acl

* Fixing nxos_acl
This commit is contained in:
Gabriele 2016-09-30 16:23:34 -04:00 committed by Matt Clay
parent 272b20000f
commit 7f861fb9ce
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/modules/network/nxos/nxos_acl.py
View file

@ -946,6 +946,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
@ -1125,6 +1138,15 @@ def execute_config_command(commands, module):
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)
except AttributeError:
try:
commands.insert(0, 'configure')
module.cli.add_commands(commands, output='config')
module.cli.run_commands()
except ShellError:
clie = get_exception()
module.fail_json(msg='Error sending CLI commands',
error=str(clie), commands=commands)
def main(): def main():
@ -1286,6 +1308,8 @@ def main():
execute_config_command(cmds, module) execute_config_command(cmds, module)
changed = True changed = True
new_existing_core, end_state, seqs = get_acl(module, name, seq) new_existing_core, end_state, seqs = get_acl(module, name, seq)
if 'configure' in cmds:
cmds.pop(0)
results['proposed'] = proposed results['proposed'] = proposed
results['existing'] = existing_core results['existing'] = existing_core