fixes for commit in candidate datastore

Signed-off-by: rohitthakur2590 <[email protected]>

Author: rohitthakur2590

plugins/module_utils/network/netconf/netconf.py

@@ -132,12 +132,3 @@ def sanitize_xml(data):
                 if key not in IGNORE_XML_ATTRIBUTE:
                     attribute.pop(key)
     return to_text(tostring(tree), errors="surrogate_then_replace").strip()
-
-def copy_config(module, source, target):
-    conn = get_connection(module)
-    try:
-        response = conn.copy_config(source=source, target=target)
-    except ConnectionError as e:
-        module.fail_json(msg=to_text(e, errors="surrogate_then_replace").strip())
-    return response
-

plugins/modules/netconf_config.py

@@ -493,6 +493,7 @@ def main():
     save = module.params["save"]
     filter = module.params["get_filter"]
     format = module.params["format"]
+    commit = module.params["commit"]
 
     try:
         filter_data, filter_type = validate_and_normalize_data(filter)
@@ -598,7 +599,7 @@ def main():
             conn.validate(target)
         if source:
             if not module.check_mode:
-                conn.copy_config(source, target)
+                conn.copy(source, target)
             result["changed"] = True
         elif delete:
             if not module.check_mode:
@@ -655,9 +656,7 @@ def main():
                 "error_option": module.params["error_option"],
                 "format": format,
             }
-
             conn.edit_config(**kwargs)
-
             if supports_commit and module.params["commit"]:
                 after = to_text(
                     conn.get_config(source="candidate", filter=filter_spec),
@@ -689,6 +688,18 @@ def main():
                         "before": sanitized_before,
                         "after": sanitized_after,
                     }
+        elif not config and commit:
+          if not module.check_mode:
+                confirm_timeout = confirm if confirm > 0 else None
+                commit_rpc = f"""
+                <commit xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+                  <confirmed/>
+                  <confirm-timeout>{confirm_timeout}</confirm-timeout>
+                </commit>
+                """
+                response = conn.dispatch(commit_rpc.strip())
+          else:
+              conn.discard_changes()
 
     except ConnectionError as e:
         module.fail_json(msg=to_text(e, errors="surrogate_then_replace").strip())