ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Remove provider requirement from nxos_vrf (#24118)

Browse source 
Fixes #23920
This commit is contained in:
Nathaniel Case 2017-05-01 09:32:53 -04:00 • committed by GitHub
parent e9dfbdf7a2
commit dce2d5eea9
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/modules/network/nxos/nxos_vrf.py
View file

@ -125,16 +125,15 @@ from ansible.module_utils.nxos import get_config, load_config, run_commands
from ansible.module_utils.nxos import nxos_argument_spec, check_args from ansible.module_utils.nxos import nxos_argument_spec, check_args
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
def execute_show_command(command, module, command_type='cli_show'):
transport = module.params['provider']['transport'] def execute_show_command(command, module):
if transport in ['cli', None]: transport = module.params['transport']
if transport == 'cli':
if 'show run' not in command: if 'show run' not in command:
command += ' | json' command += ' | json'
cmds = [command]
body = run_commands(module, cmds) cmds = [command]
else: body = run_commands(module, cmds)
cmds = [command]
body = run_commands(module, cmds)
return body return body
@ -174,12 +173,11 @@ def get_commands_to_config_vrf(delta, vrf):
def get_vrf_description(vrf, module): def get_vrf_description(vrf, module):
command_type = 'cli_show_ascii'
command = (r'show run section vrf | begin ^vrf\scontext\s{0} | end ^vrf.*'.format(vrf)) command = (r'show run section vrf | begin ^vrf\scontext\s{0} | end ^vrf.*'.format(vrf))
description = '' description = ''
descr_regex = r".*description\s(?P<descr>[\S+\s]+).*" descr_regex = r".*description\s(?P<descr>[\S+\s]+).*"
body = execute_show_command(command, module, command_type) body = execute_show_command(command, module)
try: try:
body = body[0] body = body[0]
@ -221,7 +219,7 @@ def get_vrf(vrf, module):
parsed_vrf = apply_key_map(vrf_key, vrf_table) parsed_vrf = apply_key_map(vrf_key, vrf_table)
command = 'show run all | section vrf.context.{0}'.format(vrf) command = 'show run all | section vrf.context.{0}'.format(vrf)
body = execute_show_command(command, module, 'cli_show_ascii') body = execute_show_command(command, module)
extra_params = ['vni', 'rd', 'description'] extra_params = ['vni', 'rd', 'description']
for param in extra_params: for param in extra_params:
parsed_vrf[param] = get_value(param, body[0], module) parsed_vrf[param] = get_value(param, body[0], module)