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

Remove all config from interface if absent on eos_l2_interface (#35318)

Browse source 
If the module is set to absent, read all possible configurations and remove them.
i.e. not just do a 'no switchport', as leaving around other options make
the logic handling harder.
If the user wants to remove switchport, remove all config for the interface
and finally push a 'no switchport'.
Also, I needed to map all possible params from interface regardless if state
is absent or present, so I can later detect what I need to remove in case of absent.
This commit is contained in:
Ricardo Carrillo Cruz 2018-01-24 23:16:33 +01:00 committed by GitHub
parent 90cd87f950
commit d462a425f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/ansible/modules/network/eos/eos_l2_interface.py
View file

@ -139,6 +139,18 @@ def map_obj_to_commands(updates, module):
module.fail_json(msg='invalid interface {0}'.format(name))
if state == 'absent':
if obj_in_have['mode'] == 'access':
commands.append('no switchport access vlan {0}'.format(obj_in_have['access_vlan']))
if obj_in_have['mode'] == 'trunk':
commands.append('no switchport mode trunk')
if obj_in_have['native_vlan']:
commands.append('no switchport trunk native vlan {0}'.format(obj_in_have['native_vlan']))
if obj_in_have['trunk_allowed_vlans']:
commands.append('no switchport trunk allowed vlan {0}'.format(obj_in_have['trunk_allowed_vlans']))
if obj_in_have['state'] == 'present':
commands.append('no switchport')
else:
@ -207,14 +219,13 @@ def map_config_to_obj(module):
'state': state,
}
if state == 'present':
obj['access_vlan'] = parse_config_argument(configobj, item, 'switchport access vlan')
obj['native_vlan'] = parse_config_argument(configobj, item, 'switchport trunk native vlan')
obj['trunk_allowed_vlans'] = parse_config_argument(configobj, item, 'switchport trunk allowed vlan')
if obj['access_vlan']:
obj['mode'] = 'access'
else:
obj['mode'] = 'trunk'
obj['access_vlan'] = parse_config_argument(configobj, item, 'switchport access vlan')
obj['native_vlan'] = parse_config_argument(configobj, item, 'switchport trunk native vlan')
obj['trunk_allowed_vlans'] = parse_config_argument(configobj, item, 'switchport trunk allowed vlan')
if obj['access_vlan']:
obj['mode'] = 'access'
else:
obj['mode'] = 'trunk'
instances.append(obj)