[bugfix] Fix query results for bulk query to display correct static_paths and fix replace operation for bulk present without force replace

Author: akinross

plugins/modules/mso_schema_site_anp_epg_staticport.py

@@ -528,10 +528,16 @@ def main():
             if len(found_static_ports) == len(static_ports):
                 mso.existing = found_static_ports
             else:
-                not_found_static_ports = [
-                    "Provided Static Port Path '{0}' not found".format(full_paths[index])
+                configured_static_ports = [
+                    get_full_static_path(
+                        static_port.get("type"), static_port.get("pod"), static_port.get("leaf"), static_port.get("fex"), static_port.get("path")
+                    )
                     for index, static_port in enumerate(static_ports)
-                    if full_paths[index] not in found_full_paths
+                ]
+                not_found_static_ports = [
+                    "Provided Static Port Path '{0}' not found".format(static_port)
+                    for static_port in configured_static_ports
+                    if static_port not in found_full_paths
                 ]
                 mso.fail_json(msg=not_found_static_ports)
         elif not mso.existing and full_path:
@@ -603,7 +609,7 @@ def main():
                     ops.append(dict(op="add", path=static_port_path, value=payload))
                     mso.proposed.append(payload)
                 else:
-                    index = found_full_paths.index(full_path)
+                    index = full_paths.index(full_path)
                     mso.proposed[index] = payload
                     ops.append(dict(op="replace", path="{0}/{1}".format(static_ports_path, index), value=payload))
         else:

tests/integration/targets/mso_schema_site_anp_epg_staticport/tasks/main.yml

@@ -1276,6 +1276,41 @@
       - nm_force_replace_new_static_ports.current.9.path == "topology/pod-1/paths-101/pathep-[eth2/9]"
       - nm_force_replace_new_static_ports.current.9.portEncapVlan == 1209
 
+- name: Replace VLAN of existing static port with bulk
+  cisco.mso.mso_schema_site_anp_epg_staticport: &replace_vlan_static_ports
+    <<: *static_ports_append
+    static_ports:
+    - leaf: 101
+      pod: pod-1
+      path: eth2/9
+      type: port
+      vlan: 1309
+  register: nm_replace_vlan_static_ports
+
+- name: Replace VLAN of existing static port with bulk again
+  cisco.mso.mso_schema_site_anp_epg_staticport:
+    <<: *replace_vlan_static_ports
+    static_ports:
+    - leaf: 101
+      pod: pod-1
+      path: eth2/9
+      type: port
+      vlan: 1309
+  register: nm_replace_vlan_static_ports_again
+
+- name: Verify replacing VLAN of existing static port with bulk
+  ansible.builtin.assert:
+    that:
+      - nm_replace_vlan_static_ports is changed
+      - nm_replace_vlan_static_ports.previous.9.path == "topology/pod-1/paths-101/pathep-[eth2/9]"
+      - nm_replace_vlan_static_ports.previous.9.portEncapVlan == 1209
+      - nm_replace_vlan_static_ports.current.9.path == "topology/pod-1/paths-101/pathep-[eth2/9]"
+      - nm_replace_vlan_static_ports.current.9.portEncapVlan == 1309
+      - nm_replace_vlan_static_ports_again is not changed
+      - nm_replace_vlan_static_ports_again.previous.9.path == "topology/pod-1/paths-101/pathep-[eth2/9]"
+      - nm_replace_vlan_static_ports_again.previous.9.portEncapVlan == 1309
+      - nm_replace_vlan_static_ports_again.current.9.path == "topology/pod-1/paths-101/pathep-[eth2/9]"
+
 # QUERY TESTS FOR BULK
 
 - name: Query static ports
@@ -1298,6 +1333,11 @@
   cisco.mso.mso_schema_site_anp_epg_staticport:
     <<: *static_ports_append
     static_ports:
+    - leaf: 101
+      pod: pod-1
+      path: eth2/0
+      type: port
+      vlan: 1200
     - leaf: 101
       pod: pod-1 
       path: eth1/40
@@ -1324,10 +1364,10 @@
       - nm_query_static_ports.current.3.path == "topology/pod-1/paths-101/pathep-[eth2/3]"
       - nm_query_static_ports.current.3.portEncapVlan == 1203
       - nm_query_static_ports.current.9.path == "topology/pod-1/paths-101/pathep-[eth2/9]"
-      - nm_query_static_ports.current.9.portEncapVlan == 1209
+      - nm_query_static_ports.current.9.portEncapVlan == 1309
       - err_query_static_ports is failed
-      - err_query_static_ports.msg.0 == "Provided Static Port Path 'topology/pod-1/paths-101/pathep-[eth2/0]' not found"
-      - err_query_static_ports.msg.1 == "Provided Static Port Path 'topology/pod-1/paths-101/pathep-[eth2/1]' not found"
+      - err_query_static_ports.msg.0 == "Provided Static Port Path 'topology/pod-1/paths-101/pathep-[eth1/40]' not found"
+      - err_query_static_ports.msg.1 == "Provided Static Port Path 'topology/pod-1/paths-201/pathep-[eth1/41]' not found"
 
 # FORCE REMOVE ALL CONTRACTS