From 2e145cd1f272a43a370276bb3834765f5c40cf5c Mon Sep 17 00:00:00 2001 From: Trishna Guha Date: Thu, 8 Mar 2018 18:22:43 +0530 Subject: [PATCH] fix nxos_switchport/l2_interface trunk_vlans state absent (#37180) (#37181) Signed-off-by: Trishna Guha (cherry picked from commit 02999b77a4f3f1ab1cc528d4f713b21dd0592b82) --- lib/ansible/modules/network/nxos/_nxos_switchport.py | 2 +- lib/ansible/modules/network/nxos/nxos_l2_interface.py | 2 +- .../targets/nxos_l2_interface/tests/common/sanity.yaml | 2 +- .../targets/nxos_switchport/tests/common/sanity.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ansible/modules/network/nxos/_nxos_switchport.py b/lib/ansible/modules/network/nxos/_nxos_switchport.py index 3a726b49644..7b6a2aae399 100644 --- a/lib/ansible/modules/network/nxos/_nxos_switchport.py +++ b/lib/ansible/modules/network/nxos/_nxos_switchport.py @@ -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) diff --git a/lib/ansible/modules/network/nxos/nxos_l2_interface.py b/lib/ansible/modules/network/nxos/nxos_l2_interface.py index ae92d1309aa..72e3ab26fdd 100644 --- a/lib/ansible/modules/network/nxos/nxos_l2_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_l2_interface.py @@ -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) diff --git a/test/integration/targets/nxos_l2_interface/tests/common/sanity.yaml b/test/integration/targets/nxos_l2_interface/tests/common/sanity.yaml index cd6fc07e7f9..1558ebac7c5 100644 --- a/test/integration/targets/nxos_l2_interface/tests/common/sanity.yaml +++ b/test/integration/targets/nxos_l2_interface/tests/common/sanity.yaml @@ -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 diff --git a/test/integration/targets/nxos_switchport/tests/common/sanity.yaml b/test/integration/targets/nxos_switchport/tests/common/sanity.yaml index db35d3ff3d6..20e6e3033bf 100644 --- a/test/integration/targets/nxos_switchport/tests/common/sanity.yaml +++ b/test/integration/targets/nxos_switchport/tests/common/sanity.yaml @@ -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