Intermediate changes for better visibility of diff

Author: sivakasi-cisco

tests/integration/targets/module_integration/tasks/fabric_setup.yaml

@@ -1,17 +1,15 @@
----
-- name: DEBUG start fabric setup
+- name: Start fabric device onboarding message
   ansible.builtin.debug:
-    msg: "Begin spine/leaf add for fabric {{ fabric_name }}"
+    msg: "Start adding spine and leaf devices to fabric {{ fabric_name }}"
 
-- name: PURGE existing inventory (spine/leaf)
+- name: PreTest Cleanup - Remove all spine and leaf devices from fabric
   cisco.dcnm.dcnm_inventory:
-    fabric: "{{ fabric_name }}"
+    fabric: cisco-live-virtual
     state: deleted
-  register: purge_result
 
-- name: Add spine & leaf devices with checks
+- name: Add spine and leaf devices to fabric
   block:
-    - name: MERGE add spine & leaf devices
+    - name: Test Case Setup - Add Spine and Leaf devices to fabric
       cisco.dcnm.dcnm_inventory: &spine_leaf_merged
         fabric: "{{ fabric_name }}"
         state: merged
@@ -61,38 +59,34 @@
       vars:
         ansible_command_timeout: 1000
         ansible_connect_timeout: 1000
-      register: merge_result
+      register: result
 
-    - name: ASSERT merge_result
+    - name: ASSERT - Initial add changed
       ansible.builtin.assert:
         that:
-          - merge_result.changed
+          - 'result.changed == true'
 
-    - name: MERGE idempotence
+    - name: Add spine and leaf devices to fabric - idempotence check
       cisco.dcnm.dcnm_inventory: *spine_leaf_merged
       vars:
         ansible_command_timeout: 1000
         ansible_connect_timeout: 1000
-      register: merge_idem
+      register: result
 
-    - name: ASSERT idempotence
+    - name: ASSERT - Idempotence unchanged
       ansible.builtin.assert:
         that:
-          - merge_idem.changed == false
+          - 'result.changed == false'
 
-    - name: QUERY inventory
+    - name: Query Spine Leaf Fabric
       cisco.dcnm.dcnm_inventory:
         fabric: "{{ fabric_name }}"
         state: query
-      register: query_result
-
-    - name: ASSERT query inventory count
-      ansible.builtin.assert:
-        that:
-          - query_result.response is defined
-          - query_result.response | length >= 1
+      register: result
 
+    - name: End play when query succeeds
+      ansible.builtin.meta: end_play
   always:
-    - name: DEBUG end fabric setup
+    - name: Finish fabric device onboarding message
       ansible.builtin.debug:
-        msg: "Finished spine/leaf add for fabric {{ fabric_name }}"
+        msg: "Finished adding spine and leaf devices to fabric {{ fabric_name }}"

tests/integration/targets/module_integration/tasks/main.yaml

@@ -1,5 +1,5 @@
 ---
 - name: Include tasks
   ansible.builtin.include_tasks:
-    ansible.builtin.file: dcnm.yaml
+    file: dcnm.yaml
   tags: ['dcnm']

tests/integration/targets/module_integration/tests/spine_leaf_basic.yaml

@@ -1,29 +1,33 @@
----
-- name: DEBUG start spine_leaf_basic
+- name: Start dcnm_fabric spine_leaf_basic test
   ansible.builtin.debug:
-    msg: "Starting dcnm_fabric spine_leaf_basic test (role_path={{ role_path }})"
+    msg: "Starting dcnm_fabric spine_leaf_basic test"
 
-- name: CLEANUP interfaces
+- name: Display role path
+  ansible.builtin.debug:
+    msg: "Role Path {{ role_path }}"
+
+- name: Cleanup - Reset or Default Ethernet Interfaces
   cisco.dcnm.dcnm_interface:
     fabric: "{{ fabric_name }}"
     state: deleted
     config:
       - name: "Ethernet1/3"
       - name: "Ethernet1/4"
 
-- name: CLEANUP networks
+- name: Cleanup - Delete Networks
   cisco.dcnm.dcnm_network:
     fabric: "{{ fabric_name }}"
     state: deleted
 
-- name: CLEANUP vrfs
+- name: Cleanup - Delete Tenant VRF
   cisco.dcnm.dcnm_vrf:
     fabric: "{{ fabric_name }}"
     state: deleted
 
-- block:
-    - name: MERGE access ethernet interfaces
-      cisco.dcnm.dcnm_interface: &interfaces_cfg
+- name: Execute spine_leaf_basic workflow
+  block:
+    - name: Configure access ethernet interfaces
+      cisco.dcnm.dcnm_interface: &config_interfaces
         fabric: "{{ fabric_name }}"
         state: merged
         config:
@@ -36,12 +40,14 @@
             profile:
               admin_state: true
               mode: access
-              speed: Auto
+              speed: 'Auto'
               bpdu_guard: true
               port_type_fast: true
               mtu: default
               access_vlan: 55
-            description: "Access interface for vlan55"
+              cmds:
+                - no shutdown
+              description: "Access interface for vlan55"
           - name: "Ethernet1/4"
             type: eth
             switch:
@@ -51,27 +57,35 @@
             profile:
               admin_state: true
               mode: access
-              speed: Auto
+              speed: 'Auto'
               bpdu_guard: true
               port_type_fast: true
               mtu: default
               access_vlan: 65
-            description: "Access interface for vlan65"
-      register: interfaces_result
-    - name: ASSERT interfaces merged
+              cmds:
+                - no shutdown
+              description: "Access interface for vlan65"
+      register: result
+
+    - name: ASSERT - Interfaces created
       ansible.builtin.assert:
         that:
-          - 'interfaces_result.changed'
-    - name: INTERFACES idempotence
-      cisco.dcnm.dcnm_interface: *interfaces_cfg
-      register: interfaces_idem
-    - name: ASSERT interfaces idempotence
+          - 'result.changed == true'
+          - 'result.response[0].RETURN_CODE == 200'
+          - 'result.response[1].RETURN_CODE == 200'
+
+    - name: Configure access ethernet interfaces - Idempotence
+      cisco.dcnm.dcnm_interface: *config_interfaces
+      register: result
+
+    - name: ASSERT - Interface idempotence
       ansible.builtin.assert:
         that:
-          - 'interfaces_idem.changed == false'
+          - 'result.changed == false'
+          - 'result.response | length == 0'
 
-    - name: MERGE tenant VRF green_red
-      cisco.dcnm.dcnm_vrf: &vrf_cfg
+    - name: Add Tenant VRF
+      cisco.dcnm.dcnm_vrf: &add_vrf
         fabric: "{{ fabric_name }}"
         state: merged
         config:
@@ -82,30 +96,28 @@
               - ip_address: "{{ leaf1 }}"
               - ip_address: "{{ leaf3 }}"
             deploy: true
-      register: vrf_result
-    - name: QUERY vrf until DEPLOYED
-      cisco.dcnm.dcnm_vrf:
-        fabric: "{{ fabric_name }}"
-        state: query
-      register: vrf_query
-      until:
-        - "vrf_query.response[0].parent.vrfStatus is search('DEPLOYED')"
-      retries: 30
-      delay: 2
-    - name: ASSERT vrf merged
+      register: result
+
+    - name: ASSERT - VRF created
       ansible.builtin.assert:
         that:
-          - 'vrf_result.changed'
-    - name: VRF idempotence
-      cisco.dcnm.dcnm_vrf: *vrf_cfg
-      register: vrf_idem
-    - name: ASSERT vrf idempotence
+          - 'result.changed == true'
+          - 'result.response[0].RETURN_CODE == 200'
+          - 'result.response[1].RETURN_CODE == 200'
+          - 'result.response[2].RETURN_CODE == 200'
+
+    - name: Add Tenant VRF - Idempotence
+      cisco.dcnm.dcnm_vrf: *add_vrf
+      register: result
+
+    - name: ASSERT - VRF idempotence
       ansible.builtin.assert:
         that:
-          - 'vrf_idem.changed == false'
+          - 'result.changed == false'
+          - 'result.response | length == 0'
 
-    - name: MERGE networks l2vni_4000 & l2vni_7000
-      cisco.dcnm.dcnm_network: &net_cfg
+    - name: Add Networks
+      cisco.dcnm.dcnm_network: &add_networks
         fabric: "{{ fabric_name }}"
         state: merged
         config:
@@ -116,42 +128,48 @@
             gw_ip_subnet: '192.168.1.1/24'
             attach:
               - ip_address: "{{ leaf1 }}"
-                ports:
-                  - Ethernet1/3
+                ports: [Ethernet1/3]
+                deploy: true
               - ip_address: "{{ leaf3 }}"
-                ports:
-                  - Ethernet1/3
-            deploy: true
+                ports: [Ethernet1/3]
+                deploy: true
           - net_name: l2vni_7000
             vrf_name: green_red
             net_id: 7000
             vlan_id: 65
             gw_ip_subnet: '192.168.2.1/24'
             attach:
               - ip_address: "{{ leaf1 }}"
-                ports:
-                  - Ethernet1/4
+                ports: []
+                deploy: true
               - ip_address: "{{ leaf3 }}"
-                ports:
-                  - Ethernet1/4
-            deploy: true
-      register: net_result
-    - name: ASSERT networks merged
+                ports: []
+                deploy: true
+      register: result
+
+    - name: ASSERT - Networks created
       ansible.builtin.assert:
         that:
-          - 'net_result.changed'
-    - name: WAIT before networks idempotence
+          - 'result.changed == true'
+          - 'result.response[0].RETURN_CODE == 200'
+          - 'result.response[1].RETURN_CODE == 200'
+          - 'result.response[2].RETURN_CODE == 200'
+          - 'result.response[3].RETURN_CODE == 200'
+
+    - name: Sleep before checking network idempotence
       ansible.builtin.wait_for:
         timeout: 30
-    - name: NETWORKS idempotence
-      cisco.dcnm.dcnm_network: *net_cfg
-      register: net_idem
-    - name: ASSERT networks idempotence
+
+    - name: Add Networks - Idempotence
+      cisco.dcnm.dcnm_network: *add_networks
+      register: result
+
+    - name: ASSERT - Network idempotence
       ansible.builtin.assert:
         that:
-          - 'net_idem.changed == false'
-
+          - 'result.changed == false'
+          - 'result.response | length == 0'
   always:
-    - name: DEBUG end spine_leaf_basic
+    - name: End dcnm_fabric spine_leaf_basic test
       ansible.builtin.debug:
         msg: "End dcnm_fabric spine_leaf_basic test"