internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nxos_vrf issues (#37092)

Browse Source 
* fix nxos_vrf issues

* fix doc
This commit is contained in:
saichint
2018-03-13 04:38:37 -07:00
committed by Trishna Guha
parent ba5e562c76
commit dc61f4c6b1
2 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/ansible/modules/network/nxos/nxos_vrf.py
View File

@@ -74,7 +74,7 @@ options:
interfaces:
description:
- List of interfaces to check the VRF has been
configured correctly.
configured correctly or keyword 'default'.
version_added: 2.5
associated_interfaces:
description:
@@ -98,7 +98,7 @@ options:
choices: ['present','absent']
description:
description:
- Description of the VRF.
- Description of the VRF or keyword 'default'.
required: false
default: null
delay:
@@ -257,7 +257,7 @@ def map_obj_to_commands(updates, module):
commands.append('vrf context {0}'.format(name))
for item in args:
candidate = w.get(item)
if candidate:
if candidate and candidate != 'default':
cmd = item + ' ' + str(candidate)
commands.append(cmd)
if admin_state == 'up':
@@ -266,7 +266,7 @@ def map_obj_to_commands(updates, module):
commands.append('shutdown')
commands.append('exit')
if interfaces:
if interfaces and interfaces[0] != 'default':
for i in interfaces:
commands.append('interface {0}'.format(i))
commands.append('no switchport')
@@ -280,7 +280,11 @@ def map_obj_to_commands(updates, module):
for item in args:
candidate = w.get(item)
if candidate and candidate != obj_in_have.get(item):
if candidate == 'default':
if obj_in_have.get(item):
cmd = 'no ' + item + ' ' + obj_in_have.get(item)
commands.append(cmd)
elif candidate and candidate != obj_in_have.get(item):
cmd = item + ' ' + str(candidate)
commands.append(cmd)
if admin_state and admin_state != obj_in_have.get('admin_state'):
@@ -293,7 +297,7 @@ def map_obj_to_commands(updates, module):
commands.insert(0, 'vrf context {0}'.format(name))
commands.append('exit')
if interfaces:
if interfaces and interfaces[0] != 'default':
if not obj_in_have['interfaces']:
for i in interfaces:
commands.append('vrf context {0}'.format(name))
@@ -318,6 +322,14 @@ def map_obj_to_commands(updates, module):
commands.append('interface {0}'.format(i))
commands.append('no switchport')
commands.append('no vrf member {0}'.format(name))
elif interfaces and interfaces[0] == 'default':
if obj_in_have['interfaces']:
for i in obj_in_have['interfaces']:
commands.append('vrf context {0}'.format(name))
commands.append('exit')
commands.append('interface {0}'.format(i))
commands.append('no switchport')
commands.append('no vrf member {0}'.format(name))
if purge:
existing = get_existing_vrfs(module)