ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-16 01:45:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix eos_l2_interface idempotency (#56531)

Browse source 
* Attempt to handle just mode trunk properly

* Add test for trunk-only config and clean up tests

* Add missing eapi tests and remove references to provider as we do not test local
This commit is contained in:
Nathaniel Case 2019-05-17 13:06:27 -04:00 • committed by GitHub
parent 18f22de67e
commit 63e33f7e71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 149 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -119,9 +119,8 @@ def search_obj_in_list(name, lst):
return None
def map_obj_to_commands(updates, module):
def map_obj_to_commands(want, have, module):
commands = list()
want, have = updates
for w in want:
name = w['name']
@ -170,11 +169,10 @@ def map_obj_to_commands(updates, module):
if mode != obj_in_have['mode']:
if obj_in_have['mode'] == 'access':
commands.append('no switchport access vlan {0}'.format(obj_in_have['access_vlan']))
commands.append('switchport mode trunk')
if native_vlan:
commands.append('switchport mode trunk')
commands.append('switchport trunk native vlan {0}'.format(native_vlan))
if trunk_allowed_vlans:
commands.append('switchport mode trunk')
commands.append('switchport trunk allowed vlan {0}'.format(trunk_allowed_vlans))
else:
if obj_in_have['native_vlan']:
@ -189,7 +187,6 @@ def map_obj_to_commands(updates, module):
if access_vlan != obj_in_have['access_vlan']:
commands.append('switchport access vlan {0}'.format(access_vlan))
else:
commands.append('switchport mode {0}'.format(mode))
if native_vlan != obj_in_have['native_vlan'] and native_vlan:
commands.append('switchport trunk native vlan {0}'.format(native_vlan))
if trunk_allowed_vlans != obj_in_have['trunk_allowed_vlans'] and trunk_allowed_vlans:
@ -307,7 +304,7 @@ def main():
want = map_params_to_obj(module)
have = map_config_to_obj(module, warnings)
commands = map_obj_to_commands((want, have), module)
commands = map_obj_to_commands(want, have, module)
result['commands'] = commands
if commands: