mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fixing nxos_vrf_interface (#5034)
This commit is contained in:
parent
e7286ed43c
commit
9ff6070eb8
1 changed files with 24 additions and 0 deletions
|
@ -770,6 +770,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 get_cli_body_ssh_vrf_interface(command, response, module):
|
def get_cli_body_ssh_vrf_interface(command, response, module):
|
||||||
|
@ -797,6 +806,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
|
||||||
|
|
||||||
|
|
||||||
|
@ -964,6 +986,8 @@ def main():
|
||||||
changed = True
|
changed = True
|
||||||
changed_vrf = get_interface_info(interface, module)
|
changed_vrf = get_interface_info(interface, module)
|
||||||
end_state = dict(interface=interface, vrf=changed_vrf)
|
end_state = dict(interface=interface, vrf=changed_vrf)
|
||||||
|
if 'configure' in commands:
|
||||||
|
commands.pop(0)
|
||||||
|
|
||||||
results = {}
|
results = {}
|
||||||
results['proposed'] = proposed
|
results['proposed'] = proposed
|
||||||
|
|
Loading…
Reference in a new issue