fix nxos_vlan mode idempotence bug (#55144)

* fix nxos_vlan mode idempotence bug

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

* Fix CI failure

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
This commit is contained in:
Trishna Guha
2019-05-08 11:19:15 +05:30
committed by GitHub
parent 7a957ba64a
commit 57e0567310
4 changed files with 26 additions and 11 deletions

View File

@@ -16,13 +16,20 @@
when: platform is search('N5K|N7K')
- name: "Enable feature vn segment"
nxos_config:
nxos_config:
commands:
- feature vn-segment-vlan-based
match: none
provider: "{{ connection }}"
when: platform is search('N9K')
- name: vlan teardown
nxos_vlan: &vlan_teardown
vlan_range: "2-200"
provider: "{{ connection }}"
state: absent
ignore_errors: yes
- name: Ensure a range of VLANs are present on the switch
nxos_vlan: &conf_vlan
vlan_range: "2-10,20,50,55-60,100-150"
@@ -219,15 +226,12 @@
nxos_vlan: *remint
ignore_errors: yes
- name: remove vlans
nxos_vlan:
vlan_range: "2-10,20,50,55-60,100-150"
provider: "{{ connection }}"
state: absent
- name: vlan teardown final
nxos_vlan: *vlan_teardown
ignore_errors: yes
- name: "Disable feature vn segement"
nxos_feature:
nxos_feature:
feature: vn-segment-vlan-based
provider: "{{ connection }}"
state: disabled

View File

@@ -42,11 +42,16 @@ class TestNxosVlanModule(TestNxosModule):
self.mock_get_config = patch('ansible.modules.network.nxos.nxos_vlan.get_config')
self.get_config = self.mock_get_config.start()
self.mock_get_capabilities = patch('ansible.modules.network.nxos.nxos_vlan.get_capabilities')
self.get_capabilities = self.mock_get_capabilities.start()
self.get_capabilities.return_value = {'device_info': {'network_os_platform': 'N9K-9000v'}, 'network_api': 'cliconf'}
def tearDown(self):
super(TestNxosVlanModule, self).tearDown()
self.mock_run_commands.stop()
self.mock_load_config.stop()
self.mock_get_config.stop()
self.mock_get_capabilities.stop()
def load_fixtures(self, commands=None, device=''):
def load_from_file(*args, **kwargs):