fix nxos CI failures (#60752)

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

test/integration/targets/nxos_interfaces/meta/main.yml

@@ -1 +1,2 @@
-dependencies: []
+dependencies:
+  - prepare_nxos_tests

test/integration/targets/nxos_lag_interfaces/tests/cli/deleted.yaml

@@ -1,6 +1,6 @@
 ---
 - debug:
-    msg: "Start nxos_lag_interfaces merged integration tests connection={{ ansible_connection }}"
+    msg: "Start nxos_lag_interfaces deleted integration tests connection={{ ansible_connection }}"
 
 - set_fact: test_int1="{{ nxos_int1 }}"
 - set_fact: test_int2="{{ nxos_int2 }}"
@@ -9,49 +9,8 @@
   nxos_feature:
     feature: lacp
 
-- name: setup
-  nxos_config:
-    lines:
-      - "channel-group 10"
-    parents: "{{ item }}"
-  loop:
-    - "interface {{ test_int1 }}"
-    - "interface {{ test_int2 }}"
-
-- name: Gather LAG interfaces facts
-  nxos_facts: &facts
-    gather_subset:
-      - '!all'
-      - '!min'
-    gather_network_resources: lag_interfaces
-
-- name: deleted
-  nxos_lag_interfaces: &deleted
-    state: deleted
-  register: result
-
-- assert:
-    that:
-      - "ansible_facts.network_resources.lag_interfaces|symmetric_difference(result.before)|length == 0"
-
-- name: Gather LAG interfaces post facts
-  nxos_facts: *facts
-
-- assert:
-    that:
-      - "result.after|length == 0"
-      - "result.changed == true"
-
-- name: Idempotence - deleted
-  nxos_lag_interfaces: *deleted
-  register: result
-
-- assert:
-    that:
-      - "result.changed == false"
-
-- name: teardown
-  nxos_config:
+- name: Setup1
+  nxos_config: &cleanup
     lines:
       - "no channel-group 10"
     parents: "{{ item }}"
@@ -60,7 +19,53 @@
     - "interface {{ test_int1 }}"
     - "interface {{ test_int2 }}"
 
-- name: disable feature lacp
+- block:
+  - name: Setup2
+    nxos_config:
+      lines:
+        - "channel-group 10"
+      parents: "{{ item }}"
+    loop:
+      - "interface {{ test_int1 }}"
+      - "interface {{ test_int2 }}"
+
+  - name: Gather LAG interfaces facts
+    nxos_facts: &facts
+      gather_subset:
+        - '!all'
+        - '!min'
+      gather_network_resources: lag_interfaces
+
+  - name: deleted
+    nxos_lag_interfaces: &deleted
+      state: deleted
+    register: result
+
+  - assert:
+      that:
+        - "ansible_facts.network_resources.lag_interfaces|symmetric_difference(result.before)|length == 0"
+
+  - name: Gather LAG interfaces post facts
+    nxos_facts: *facts
+
+  - assert:
+      that:
+        - "result.after|length == 0"
+        - "result.changed == true"
+
+  - name: Idempotence - deleted
+    nxos_lag_interfaces: *deleted
+    register: result
+
+  - assert:
+      that:
+        - "result.changed == false"
+
+  always:
+  - name: teardown
+    nxos_config: *cleanup
+
+  - name: disable feature lacp
     nxos_feature:
       feature: lacp
       state: disabled

test/integration/targets/nxos_lag_interfaces/tests/cli/merged.yaml

@@ -5,12 +5,12 @@
 - set_fact: test_int1="{{ nxos_int1 }}"
 - set_fact: test_int2="{{ nxos_int2 }}"
 
-- name: enable feature lacp
+- name: Enable feature lacp
   nxos_feature:
     feature: lacp
 
-- name: setup
-  nxos_config:
+- name: Setup
+  nxos_config: &cleanup
     lines:
       - "no channel-group"
     parents: "{{ item }}"
@@ -19,7 +19,8 @@
     - "interface {{ test_int1 }}"
     - "interface {{ test_int2 }}"
 
-- name: Merged
+- block:
+  - name: Merged
     nxos_lag_interfaces: &merged
       config:
         - name: port-channel10
@@ -29,41 +30,35 @@
       state: merged
     register: result
 
-- assert:
+  - assert:
       that:
         - "result.before|length == 0"
         - "result.changed == true"
 
-- name: Gather LAG interfaces facts
+  - name: Gather LAG interfaces facts
     nxos_facts:
       gather_subset:
         - '!all'
         - '!min'
       gather_network_resources: lag_interfaces
 
-- assert:
+  - assert:
       that:
         - "ansible_facts.network_resources.lag_interfaces|symmetric_difference(result.after)|length == 0"
 
-- name: Idempotence - Merged
+  - name: Idempotence - Merged
     nxos_lag_interfaces: *merged
     register: result
 
-- assert:
+  - assert:
       that:
         - "result.changed == false"
 
-- name: teardown
-  nxos_config:
-    lines:
-      - "no channel-group"
-    parents: "{{ item }}"
-  ignore_errors: yes
-  loop:
-    - "interface {{ test_int1 }}"
-    - "interface {{ test_int2 }}"
+  always:
+  - name: Teardown
+    nxos_config: *cleanup
 
-- name: disable feature lacp
+  - name: Disable feature lacp
     nxos_feature:
       feature: lacp
       state: disabled

test/integration/targets/nxos_lag_interfaces/tests/cli/overridden.yaml

@@ -1,6 +1,6 @@
 ---
 - debug:
-    msg: "Start nxos_lag_interfaces merged integration tests connection={{ ansible_connection }}"
+    msg: "Start nxos_lag_interfaces overridden integration tests connection={{ ansible_connection }}"
 
 - set_fact: test_int1="{{ nxos_int1 }}"
 - set_fact: test_int2="{{ nxos_int2 }}"
@@ -10,7 +10,25 @@
   nxos_feature:
     feature: lacp
 
-- name: setup
+- name: setup1
+  nxos_config: &cleanup1
+    lines:
+      - "no channel-group 10"
+    parents: "{{ item }}"
+  ignore_errors: yes
+  loop:
+    - "interface {{ test_int1 }}"
+    - "interface {{ test_int2 }}"
+
+- name: setup2
+  nxos_config: &cleanup2
+    lines:
+      - "no channel-group 19"
+    parents: "interface {{ test_int3 }}"
+  ignore_errors: yes
+
+- block:
+  - name: setup3
     nxos_config:
       lines:
         - "channel-group 10"
@@ -20,14 +38,14 @@
       - "interface {{ test_int1 }}"
       - "interface {{ test_int2 }}"
 
-- name: Gather LAG interfaces facts
+  - name: Gather LAG interfaces facts
     nxos_facts: &facts
       gather_subset:
         - '!all'
         - '!min'
       gather_network_resources: lag_interfaces
 
-- name: Overridden
+  - name: Overridden
     nxos_lag_interfaces: &overridden
       config:
         - name: port-channel19
@@ -36,43 +54,33 @@
       state: overridden
     register: result
 
-- assert:
+  - assert:
       that:
         - "ansible_facts.network_resources.lag_interfaces|symmetric_difference(result.before)|length == 0"
         - "result.changed == true"
 
-- name: Gather LAG interfaces post facts
+  - name: Gather LAG interfaces post facts
     nxos_facts: *facts
 
-- assert:
+  - assert:
       that:
         - "ansible_facts.network_resources.lag_interfaces|symmetric_difference(result.after)|length == 0"
 
-- name: Idempotence - Overridden
+  - name: Idempotence - Overridden
     nxos_lag_interfaces: *overridden
     register: result
 
-- assert:
+  - assert:
       that:
         - "result.changed == false"
+  always:
+  - name: teardown1
+    nxos_config: *cleanup1
 
-- name: teardown1
-  nxos_config:
-    lines:
-      - "no channel-group 10"
-    parents: "{{ item }}"
-  ignore_errors: yes
-  loop:
-    - "interface {{ test_int1 }}"
-    - "interface {{ test_int2 }}"
+  - name: teardown2
+    nxos_config: *cleanup2
 
-- name: teardown2
-  nxos_config:
-    lines:
-      - "no channel-group 19"
-    parents: "interface {{ test_int3 }}"
-
-- name: disable feature lacp
+  - name: disable feature lacp
     nxos_feature:
       feature: lacp
       state: disabled

test/integration/targets/nxos_lag_interfaces/tests/cli/replaced.yaml

@@ -1,6 +1,6 @@
 ---
 - debug:
-    msg: "Start nxos_lag_interfaces merged integration tests connection={{ ansible_connection }}"
+    msg: "Start nxos_lag_interfaces replaced integration tests connection={{ ansible_connection }}"
 
 - set_fact: test_int1="{{ nxos_int1 }}"
 - set_fact: test_int2="{{ nxos_int2 }}"
@@ -9,7 +9,22 @@
   nxos_feature:
     feature: lacp
 
-- name: setup
+- name: setup1
+  nxos_config: &cleanup1
+    lines:
+      - "no channel-group 10"
+    parents: "interface {{ test_int1 }}"
+  ignore_errors: yes
+
+- name: setup2
+  nxos_config: &cleanup2
+    lines:
+      - "no channel-group 11"
+    parents: "interface {{ test_int2 }}"
+  ignore_errors: yes
+
+- block:
+  - name: setup3
     nxos_config:
       lines:
         - "channel-group 10"
@@ -19,14 +34,14 @@
       - "interface {{ test_int1 }}"
       - "interface {{ test_int2 }}"
 
-- name: Gather LAG interfaces facts
+  - name: Gather LAG interfaces facts
     nxos_facts: &facts
       gather_subset:
         - '!all'
         - '!min'
       gather_network_resources: lag_interfaces
 
-- name: Replaced
+  - name: Replaced
     nxos_lag_interfaces: &replaced
       config:
         - name: port-channel11
@@ -36,38 +51,33 @@
       state: replaced
     register: result
 
-- assert:
+  - assert:
       that:
         - "ansible_facts.network_resources.lag_interfaces|symmetric_difference(result.before)|length == 0"
 
-- name: Gather LAG interfaces post facts
+  - name: Gather LAG interfaces post facts
     nxos_facts: *facts
 
-- assert:
+  - assert:
       that:
         - "ansible_facts.network_resources.lag_interfaces|symmetric_difference(result.after)|length == 0"
 
-- name: Idempotence - Replaced
+  - name: Idempotence - Replaced
     nxos_lag_interfaces: *replaced
     register: result
 
-- assert:
+  - assert:
       that:
         - "result.changed == false"
 
-- name: teardown1
-  nxos_config:
-    lines:
-      - "no channel-group 10"
-    parents: "interface {{ test_int1 }}"
+  always:
+  - name: teardown1
+    nxos_config: *cleanup1
 
-- name: teardown2
-  nxos_config:
-    lines:
-      - "no channel-group 11"
-    parents: "interface {{ test_int2 }}"
+  - name: teardown2
+    nxos_config: *cleanup2
 
-- name: disable feature lacp
+  - name: disable feature lacp
     nxos_feature:
       feature: lacp
       state: disabled