From d9ed2cce8c1ca765f63fe74970f6b1179b5dfc13 Mon Sep 17 00:00:00 2001 From: Chris Van Heuveln Date: Fri, 8 Mar 2019 14:51:56 -0500 Subject: [PATCH] nxos_igmp_snooping: more group-timeout fixes * Fixed another problem where `group-timeout` was processed before `ip igmp snooping` was enabled * `sanity` playbook: * N6K: `show ip igmp snooping | json` succeeds on the device but doesn't return any data in body; added a skip to the sanity playbook to keep it out of CI * Added a setup task to do initial cleanup on the device --- .../network/nxos/nxos_igmp_snooping.py | 6 ++++- .../tests/common/sanity.yaml | 25 +++++++++++-------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py b/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py index 2662f796549df4..736b8b8f4ea145 100644 --- a/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py +++ b/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py @@ -181,11 +181,12 @@ def config_igmp_snooping(delta, existing, default=False): commands = [] command = None + gt_command = None for key, value in delta.items(): if value: if default and key == 'group_timeout': if existing.get(key): - command = 'no ' + CMDS.get(key).format(existing.get(key)) + gt_command = 'no ' + CMDS.get(key).format(existing.get(key)) elif value == 'default' and key == 'group_timeout': if existing.get(key): command = 'no ' + CMDS.get(key).format(existing.get(key)) @@ -198,6 +199,9 @@ def config_igmp_snooping(delta, existing, default=False): commands.append(command) command = None + if gt_command: + # ensure that group-timeout command is configured last + commands.append(gt_command) return commands diff --git a/test/integration/targets/nxos_igmp_snooping/tests/common/sanity.yaml b/test/integration/targets/nxos_igmp_snooping/tests/common/sanity.yaml index f5b9dfbe361a86..32385ae8afccb7 100644 --- a/test/integration/targets/nxos_igmp_snooping/tests/common/sanity.yaml +++ b/test/integration/targets/nxos_igmp_snooping/tests/common/sanity.yaml @@ -3,18 +3,23 @@ - debug: msg="Using provider={{ connection.transport }}" when: ansible_connection == "local" -- set_fact: gt_run="false" -- set_fact: gt_run="true" - when: not (platform is match("N5K")) and not (platform is match("N35")) +- meta: end_host + # show ip igmp snooping | json does not work on some platforms + when: platform is search('N6K') -- set_fact: group_timeout="never" - when: not (platform is match("N5K")) and not (platform is match("N35")) +- set_fact: gt_run="false" +- block: + - set_fact: gt_run="true" + - set_fact: group_timeout="never" + - set_fact: def_group_timeout="default" + when: platform is not search('N35|N5K|N6K') -- set_fact: def_group_timeout="default" - when: not (platform is match("N5K")) and not (platform is match("N35")) +- name: Setup + nxos_igmp_snooping: &default + provider: "{{ connection }}" + state: default - block: - - name: Configure igmp snooping with non-default values nxos_igmp_snooping: &non-default snooping: false @@ -90,9 +95,7 @@ when: gt_run or (imagetag and (imagetag is version_compare('D1', 'ne'))) - name: Configure igmp snooping with default values - nxos_igmp_snooping: &default - provider: "{{ connection }}" - state: default + nxos_igmp_snooping: *default register: result - assert: *true