fix nxos_vlan aggregate (#36710)

* fix nxos_vlan aggregate

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* Add test

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
This commit is contained in:
Trishna Guha 2018-02-26 12:29:49 +05:30 committed by GitHub
parent d6912cf40e
commit 44332bda78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 83 additions and 11 deletions

View file

@ -171,17 +171,19 @@ def search_obj_in_list(vlan_id, lst):
return o
def get_diff(w, have):
def get_diff(w, obj):
c = deepcopy(w)
del c['interfaces']
del c['name']
del c['associated_interfaces']
for o in have:
del o['interfaces']
del o['name']
if o['vlan_id'] == w['vlan_id']:
diff_dict = dict(set(c.items()) - set(o.items()))
return diff_dict
entries = ('interfaces', 'associated_interfaces', 'name', 'delay', 'vlan_range')
for key in entries:
if key in c:
del c[key]
o = deepcopy(obj)
del o['interfaces']
del o['name']
if o['vlan_id'] == w['vlan_id']:
diff_dict = dict(set(c.items()) - set(o.items()))
return diff_dict
def map_obj_to_commands(updates, module, os_platform):
@ -269,7 +271,7 @@ def map_obj_to_commands(updates, module, os_platform):
commands.append('no switchport access vlan {0}'.format(vlan_id))
else:
diff = get_diff(w, have)
diff = get_diff(w, obj_in_have)
if diff:
commands.append('vlan {0}'.format(vlan_id))
for key, value in diff.items():

View file

@ -0,0 +1,70 @@
---
- debug: msg="START connection={{ ansible_connection }}/agg.yaml"
- debug: msg="Using provider={{ connection.transport }}"
when: ansible_connection == "local"
- name: setup - remove vlan used in test
nxos_config: &rm
lines:
- no vlan 102
- no vlan 103
provider: "{{ connection }}"
ignore_errors: yes
- name: configure vlan with aggregate
nxos_vlan: &conf1
aggregate:
- { name: app02, vlan_id: 102 }
- { name: app03, vlan_id: 103 }
vlan_state: active
admin_state: up
provider: "{{ connection }}"
register: result
- assert:
that:
- 'result.changed == true'
- '"vlan 102" in result.commands'
- '"vlan 103" in result.commands'
- '"no shutdown" in result.commands'
- '"state active" in result.commands'
- name: conf1 - Idempotence
nxos_vlan: *conf1
register: result
- assert:
that:
- 'result.changed == false'
- name: change property of existing vlan - admin_state down
nxos_vlan: &conf2
aggregate:
- { name: app02, vlan_id: 102 }
- { name: app03, vlan_id: 103 }
vlan_state: active
admin_state: down
provider: "{{ connection }}"
register: result
- assert:
that:
- 'result.changed == true'
- '"vlan 102" in result.commands'
- '"vlan 103" in result.commands'
- '"shutdown" in result.commands'
- name: conf2 - Idempotence
nxos_vlan: *conf2
register: result
- assert:
that:
- 'result.changed == false'
- name: teardown
nxos_config: *rm
ignore_errors: yes
- debug: msg="END connection={{ ansible_connection }}/agg.yaml"