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

fix nxos_switchport/l2_interface trunk_vlans state absent (#37180)

Browse source 
Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
This commit is contained in:
Trishna Guha 2018-03-08 18:10:04 +05:30 committed by GitHub
parent d45ceb3a4f
commit 02999b77a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/network/nxos/_nxos_switchport.py
View file

@ -271,7 +271,7 @@ def remove_switchport_config_commands(interface, existing, proposed, module):
elif mode == 'trunk':
tv_check = existing.get('trunk_vlans_list') == proposed.get('trunk_vlans_list')
if not tv_check:
if tv_check:
existing_vlans = existing.get('trunk_vlans_list')
proposed_vlans = proposed.get('trunk_vlans_list')
vlans_to_remove = set(proposed_vlans).intersection(existing_vlans)

2
lib/ansible/modules/network/nxos/nxos_l2_interface.py
View file

@ -254,7 +254,7 @@ def remove_switchport_config_commands(name, existing, proposed, module):
elif mode == 'trunk':
tv_check = existing.get('trunk_vlans_list') == proposed.get('trunk_vlans_list')
if not tv_check:
if tv_check:
existing_vlans = existing.get('trunk_vlans_list')
proposed_vlans = proposed.get('trunk_vlans_list')
vlans_to_remove = set(proposed_vlans).intersection(existing_vlans)

2
test/integration/targets/nxos_l2_interface/tests/common/sanity.yaml
View file

@ -95,7 +95,7 @@
nxos_l2_interface: &no_tag
name: "{{ intname }}"
mode: trunk
trunk_vlans: 30-4094
trunk_vlans: 2-50
state: absent
provider: "{{ connection }}"
register: result

2
test/integration/targets/nxos_switchport/tests/common/sanity.yaml
View file

@ -92,7 +92,7 @@
nxos_switchport: &no_tag
interface: "{{ intname }}"
mode: trunk
trunk_vlans: 30-4094
trunk_vlans: 2-50
state: absent
provider: "{{ connection }}"
register: result