[ignore] Fixed logical issues in the ndo_tenant_netflow_monitor module

Author: sajagana

plugins/module_utils/mso.py

@@ -2120,7 +2120,7 @@ def epg_object_reference_spec(aliases=None):
     return epg_reference_spec
 
 
-def ndo_template_object_spec_with_uuid(aliases=None, required_uuid_and_reference=True):
+def ndo_template_object_spec_with_uuid(aliases=None, required_uuid_or_reference=True):
     ndo_template_object_spec_with_uuid = dict(
         options=dict(
             uuid=dict(type="str"),
@@ -2148,7 +2148,7 @@ def ndo_template_object_spec_with_uuid(aliases=None, required_uuid_and_reference
         ],
     )
 
-    if not required_uuid_and_reference:
+    if not required_uuid_or_reference:
         ndo_template_object_spec_with_uuid.pop("required_one_of")
 
     if aliases:

plugins/modules/ndo_tenant_netflow_exporter.py

@@ -200,7 +200,6 @@ def main():
         ops.append(dict(op="remove", path=path))
 
     if mso.proposed:
-        mso.proposed = copy.deepcopy(mso.proposed)
         mso_template.update_config_with_template_and_references(mso.proposed)
 
     if not module.check_mode and ops:

plugins/modules/ndo_tenant_netflow_monitor.py

@@ -239,7 +239,7 @@ def main():
         name=dict(type="str"),
         uuid=dict(type="str"),
         description=dict(type="str"),
-        netflow_record=dict(type="dict", **ndo_template_object_spec_with_uuid(required_uuid_and_reference=False)),
+        netflow_record=dict(type="dict", **ndo_template_object_spec_with_uuid(required_uuid_or_reference=False)),
         netflow_exporters=dict(type="list", elements="dict", **ndo_template_object_spec_with_uuid()),
         state=dict(type="str", default="query", choices=["absent", "query", "present"]),
     )
@@ -298,8 +298,7 @@ def main():
         netflow_monitor_object = copy.deepcopy(match.details)
         netflow_monitor_object["exporterRefs"] = netflow_exporters_list_to_dict(netflow_monitor_object.get("exporterRefs"))
         updated_netflow_monitor_object = mso_template.update_config_with_template_and_references(netflow_monitor_object, reference_details, False)
-        mso.previous = copy.deepcopy(updated_netflow_monitor_object)
-        mso.existing = copy.deepcopy(updated_netflow_monitor_object)
+        mso.previous = mso.existing = copy.deepcopy(updated_netflow_monitor_object)
     elif match:  # Query all objects
         for obj in match:
             obj["exporterRefs"] = netflow_exporters_list_to_dict(obj.get("exporterRefs"))
@@ -347,6 +346,9 @@ def main():
             if not netflow_exporter_uuids:
                 mso_values.pop("exporterRefs", None)
 
+            if netflow_record is None and netflow_record_uuid is None:
+                mso_values.pop("recordRef", None)
+
             append_update_ops_data(ops, match.details, path, mso_values)
             mso.sanitize(mso_values, collate=True)
         else:
@@ -357,8 +359,6 @@ def main():
         ops.append(dict(op="remove", path=path))
 
     if mso.proposed:
-        mso.proposed = copy.deepcopy(mso.proposed)
-
         if (
             mso.proposed.get("exporterRefs")
             and isinstance(mso.proposed.get("exporterRefs"), list)

plugins/modules/ndo_tenant_netflow_record.py

@@ -234,7 +234,6 @@ def main():
         ops.append(dict(op="remove", path=path))
 
     if mso.proposed:
-        mso.proposed = copy.deepcopy(mso.proposed)
         mso_template.update_config_with_template_and_references(mso.proposed)
 
     if not module.check_mode and ops:

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

@@ -227,6 +227,15 @@
         state: present
       register: update_netflow_monitor_2_without_changing_exporter
 
+    - name: Update NetFlow Monitor without specifying description, NetFlow Record and NetFlow Exporter
+      cisco.mso.ndo_tenant_netflow_monitor:
+        <<: *mso_info
+        template: ansible_tenant_template
+        uuid: "{{ nm_add_netflow_monitor.current.uuid }}"
+        name: netflow_monitor_1_updated
+        state: present
+      register: update_netflow_monitor_without_description_record_exporter
+
     - name: Assertion check for update NetFlow Monitor
       ansible.builtin.assert:
         that:
@@ -324,6 +333,9 @@
           - update_netflow_monitor_2_without_changing_exporter.current.name == "netflow_monitor_2"
           - update_netflow_monitor_2_without_changing_exporter.current.recordRef == ""
           - update_netflow_monitor_2_without_changing_exporter.previous.description == ""
+          - update_netflow_monitor_without_description_record_exporter is not changed
+          - update_netflow_monitor_without_description_record_exporter.current == nm_update_netflow_monitor_again.current
+          - update_netflow_monitor_without_description_record_exporter.previous == nm_update_netflow_monitor_again.previous
 
     # QUERY
     - name: Query NetFlow Monitor using UUID