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,7 +9,18 @@
   nxos_feature:
     feature: lacp
 
-- name: setup
+- name: Setup1
+  nxos_config: &cleanup
+    lines:
+      - "no channel-group 10"
+    parents: "{{ item }}"
+  ignore_errors: yes
+  loop:
+    - "interface {{ test_int1 }}"
+    - "interface {{ test_int2 }}"
+
+- block:
+  - name: Setup2
     nxos_config:
       lines:
         - "channel-group 10"
@@ -50,15 +61,9 @@
       that:
         - "result.changed == false"
 
+  always:
   - name: teardown
-  nxos_config:
+    nxos_config: *cleanup
-    lines:
-      - "no channel-group 10"
-    parents: "{{ item }}"
-  ignore_errors: yes
-  loop:
-    - "interface {{ test_int1 }}"
-    - "interface {{ test_int2 }}"
 
   - name: disable feature lacp
     nxos_feature:

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
+- name: Setup
-  nxos_config:
+  nxos_config: &cleanup
     lines:
       - "no channel-group"
     parents: "{{ item }}"
@@ -19,6 +19,7 @@
     - "interface {{ test_int1 }}"
     - "interface {{ test_int2 }}"
 
+- block:
   - name: Merged
     nxos_lag_interfaces: &merged
       config:
@@ -53,17 +54,11 @@
       that:
         - "result.changed == false"
 
-- name: teardown
+  always:
-  nxos_config:
+  - name: Teardown
-    lines:
+    nxos_config: *cleanup
-      - "no channel-group"
-    parents: "{{ item }}"
-  ignore_errors: yes
-  loop:
-    - "interface {{ test_int1 }}"
-    - "interface {{ test_int2 }}"
 
-- 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"
@@ -55,22 +73,12 @@
   - assert:
       that:
         - "result.changed == false"
-
+  always:
   - name: teardown1
-  nxos_config:
+    nxos_config: *cleanup1
-    lines:
-      - "no channel-group 10"
-    parents: "{{ item }}"
-  ignore_errors: yes
-  loop:
-    - "interface {{ test_int1 }}"
-    - "interface {{ test_int2 }}"
 
   - name: teardown2
-  nxos_config:
+    nxos_config: *cleanup2
-    lines:
-      - "no channel-group 19"
-    parents: "interface {{ test_int3 }}"
 
   - name: disable feature lacp
     nxos_feature:

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"
@@ -55,17 +70,12 @@
       that:
         - "result.changed == false"
 
+  always:
   - name: teardown1
-  nxos_config:
+    nxos_config: *cleanup1
-    lines:
-      - "no channel-group 10"
-    parents: "interface {{ test_int1 }}"
 
   - name: teardown2
-  nxos_config:
+    nxos_config: *cleanup2
-    lines:
-      - "no channel-group 11"
-    parents: "interface {{ test_int2 }}"
 
   - name: disable feature lacp
     nxos_feature: