From 83eb6fec33f8949eb91b0b84bd712f19313f7069 Mon Sep 17 00:00:00 2001
From: Lewis Gaul <lewis.gaul@gmail.com>
Date: Tue, 25 Mar 2025 04:21:21 -0700
Subject: [PATCH 1/7] Add support for commit replace

---
 netmiko/cisco/cisco_xr.py | 93 ++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 36 deletions(-)

diff --git a/netmiko/cisco/cisco_xr.py b/netmiko/cisco/cisco_xr.py
index fae8d2556..e96432318 100644
--- a/netmiko/cisco/cisco_xr.py
+++ b/netmiko/cisco/cisco_xr.py
@@ -56,10 +56,13 @@ def commit(
         self,
         confirm: bool = False,
         confirm_delay: Optional[int] = None,
-        comment: str = "",
-        label: str = "",
+        comment: Optional[str] = None,
+        label: Optional[str] = None,
         read_timeout: float = 120.0,
         delay_factor: Optional[float] = None,
+        replace: bool = False,
+        best_effort: bool = False,
+        force: bool = False,
     ) -> str:
         """
         Commit the candidate configuration.
@@ -105,55 +108,73 @@ def commit(
         if comment and confirm:
             raise ValueError("Invalid arguments supplied to XR commit")
 
-        label = str(label)
         error_marker = "Failed to"
         alt_error_marker = "One or more commits have occurred from other"
 
         # Select proper command string based on arguments provided
+        commit_kws = ["commit"]
+        if replace:
+            commit_kws.append("replace")
+        if best_effort:
+            commit_kws.append("best-effort")
+        if force:
+            commit_kws.append("force")
+        if confirm:
+            commit_kws.extend(["confirmed", str(confirm_delay)])
         if label:
-            if comment:
-                command_string = f"commit label {label} comment {comment}"
-            elif confirm:
-                command_string = "commit label {} confirmed {}".format(
-                    label, str(confirm_delay)
-                )
-            else:
-                command_string = f"commit label {label}"
-        elif confirm:
-            command_string = f"commit confirmed {str(confirm_delay)}"
-        elif comment:
-            command_string = f"commit comment {comment}"
-        else:
-            command_string = "commit"
+            commit_kws.extend(["label", label])
+        if comment:
+            commit_kws.extend(["comment", comment])
 
         # Enter config mode (if necessary)
         output = self.config_mode()
 
-        # IOS-XR might do this:
-        # This could be a few minutes if your config is large. Confirm? [y/n][confirm]
-        # Or this:
-        # Do you wish to proceed with this commit anyway? [no]
-        large_config = "onfirm"
-        other_changes = "Do you wish to proceed"
-        pattern = rf"(?:#|{large_config}|{other_changes})"
-        new_data = self._send_command_str(
-            command_string,
-            expect_string=pattern,
-            strip_prompt=False,
-            strip_command=False,
-            read_timeout=read_timeout,
-        )
-        if "onfirm" in new_data:
+        # breakpoint()
+        if replace:
+            new_data = self._send_command_str(
+                " ".join(commit_kws),
+                expect_string=r"This commit will replace or remove the entire running configuration",
+                strip_prompt=False,
+                strip_command=False,
+                read_timeout=read_timeout,
+            )
             output += new_data
+            if "This commit will replace or remove the entire running configuration" in new_data:
+                new_data = self._send_command_str(
+                    "yes",
+                    expect_string=r"#",
+                    strip_prompt=False,
+                    strip_command=False,
+                    read_timeout=read_timeout,
+                )
+                output += new_data
+        else:
+            # IOS-XR might do this:
+            # This could be a few minutes if your config is large. Confirm? [y/n][confirm]
+            # Or this:
+            # Do you wish to proceed with this commit anyway? [no]
+            large_config = "onfirm"
+            other_changes = "Do you wish to proceed"
+            pattern = rf"(?:#|{large_config}|{other_changes})"
             new_data = self._send_command_str(
-                "y",
-                expect_string=r"#",
+                " ".join(commit_kws),
+                expect_string=pattern,
                 strip_prompt=False,
                 strip_command=False,
                 read_timeout=read_timeout,
-                cmd_verify=False,
             )
-        output += new_data
+            output += new_data
+            if "onfirm" in new_data:
+                new_data = self._send_command_str(
+                    "y",
+                    expect_string=r"#",
+                    strip_prompt=False,
+                    strip_command=False,
+                    read_timeout=read_timeout,
+                    cmd_verify=False,
+                )
+                output += new_data
+
         if error_marker in output:
             raise ValueError(f"Commit failed with the following errors:\n\n{output}")
         if alt_error_marker in output:

From 02da9be3f3c7fa79b714116a614d02284d02348d Mon Sep 17 00:00:00 2001
From: Lewis Gaul <lewis.gaul@gmail.com>
Date: Tue, 25 Mar 2025 05:47:04 -0700
Subject: [PATCH 2/7] Update docstring

---
 netmiko/cisco/cisco_xr.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/netmiko/cisco/cisco_xr.py b/netmiko/cisco/cisco_xr.py
index e96432318..8875809d3 100644
--- a/netmiko/cisco/cisco_xr.py
+++ b/netmiko/cisco/cisco_xr.py
@@ -75,17 +75,15 @@ def commit(
             command_string = commit label <label>
         comment:
             command_string = commit comment <comment>
+        replace:
+            command_string = commit replace
+        best_effort:
+            command_string = commit best-effort
+        force:
+            command_string = commit force
 
         delay_factor: Deprecated in Netmiko 4.x. Will be eliminated in Netmiko 5.
 
-        supported combinations
-        label and confirm:
-            command_string = commit label <label> confirmed <confirm_delay>
-        label and comment:
-            command_string = commit label <label> comment <comment>
-
-        All other combinations will result in an exception.
-
         failed commit message:
         % Failed to commit one or more configuration items during a pseudo-atomic operation. All
         changes made have been reverted. Please issue 'show configuration failed [inheritance]'

From c859551d5f59bb7c2ea0ecdaa43cec1655241eeb Mon Sep 17 00:00:00 2001
From: Lewis Gaul <lewis.gaul@gmail.com>
Date: Tue, 25 Mar 2025 05:52:08 -0700
Subject: [PATCH 3/7] Remove debug breakpoint

---
 netmiko/cisco/cisco_xr.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/netmiko/cisco/cisco_xr.py b/netmiko/cisco/cisco_xr.py
index 8875809d3..95dcc8424 100644
--- a/netmiko/cisco/cisco_xr.py
+++ b/netmiko/cisco/cisco_xr.py
@@ -127,7 +127,6 @@ def commit(
         # Enter config mode (if necessary)
         output = self.config_mode()
 
-        # breakpoint()
         if replace:
             new_data = self._send_command_str(
                 " ".join(commit_kws),

From 63226bffd9af7aea81e431392bd49333c11b62b9 Mon Sep 17 00:00:00 2001
From: Lewis Gaul <lewis.gaul@gmail.com>
Date: Wed, 2 Apr 2025 17:12:48 +0100
Subject: [PATCH 4/7] Remove support for 'best-effort' and 'force'

---
 netmiko/cisco/cisco_xr.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/netmiko/cisco/cisco_xr.py b/netmiko/cisco/cisco_xr.py
index 95dcc8424..9b815e801 100644
--- a/netmiko/cisco/cisco_xr.py
+++ b/netmiko/cisco/cisco_xr.py
@@ -61,8 +61,6 @@ def commit(
         read_timeout: float = 120.0,
         delay_factor: Optional[float] = None,
         replace: bool = False,
-        best_effort: bool = False,
-        force: bool = False,
     ) -> str:
         """
         Commit the candidate configuration.
@@ -77,10 +75,6 @@ def commit(
             command_string = commit comment <comment>
         replace:
             command_string = commit replace
-        best_effort:
-            command_string = commit best-effort
-        force:
-            command_string = commit force
 
         delay_factor: Deprecated in Netmiko 4.x. Will be eliminated in Netmiko 5.
 
@@ -113,10 +107,6 @@ def commit(
         commit_kws = ["commit"]
         if replace:
             commit_kws.append("replace")
-        if best_effort:
-            commit_kws.append("best-effort")
-        if force:
-            commit_kws.append("force")
         if confirm:
             commit_kws.extend(["confirmed", str(confirm_delay)])
         if label:

From 8c1f18b51cbeb6fb31ab91e7a964e69127ca9d17 Mon Sep 17 00:00:00 2001
From: Lewis Gaul <lewis.gaul@gmail.com>
Date: Wed, 23 Apr 2025 10:21:22 -0700
Subject: [PATCH 5/7] Move commit replace prompt into variable

---
 netmiko/cisco/cisco_xr.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/netmiko/cisco/cisco_xr.py b/netmiko/cisco/cisco_xr.py
index 95dcc8424..e22e381ed 100644
--- a/netmiko/cisco/cisco_xr.py
+++ b/netmiko/cisco/cisco_xr.py
@@ -128,15 +128,16 @@ def commit(
         output = self.config_mode()
 
         if replace:
+            replace_msg = "This commit will replace or remove the entire running configuration"
             new_data = self._send_command_str(
                 " ".join(commit_kws),
-                expect_string=r"This commit will replace or remove the entire running configuration",
+                expect_string=replace_msg,
                 strip_prompt=False,
                 strip_command=False,
                 read_timeout=read_timeout,
             )
             output += new_data
-            if "This commit will replace or remove the entire running configuration" in new_data:
+            if replace_msg in new_data:
                 new_data = self._send_command_str(
                     "yes",
                     expect_string=r"#",

From 652546ab3076fefd01e31dbbea945eda8507f698 Mon Sep 17 00:00:00 2001
From: Lewis Gaul <lewis.gaul@gmail.com>
Date: Wed, 23 Apr 2025 11:14:15 -0700
Subject: [PATCH 6/7] Run black

---
 netmiko/cisco/cisco_xr.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/netmiko/cisco/cisco_xr.py b/netmiko/cisco/cisco_xr.py
index d3bbc5719..fa384b70a 100644
--- a/netmiko/cisco/cisco_xr.py
+++ b/netmiko/cisco/cisco_xr.py
@@ -118,7 +118,9 @@ def commit(
         output = self.config_mode()
 
         if replace:
-            replace_msg = "This commit will replace or remove the entire running configuration"
+            replace_msg = (
+                "This commit will replace or remove the entire running configuration"
+            )
             new_data = self._send_command_str(
                 " ".join(commit_kws),
                 expect_string=replace_msg,

From 341b4ea3402ae27fb561602055a3d3a52a529563 Mon Sep 17 00:00:00 2001
From: Lewis Gaul <lewis.gaul@gmail.com>
Date: Sun, 27 Apr 2025 13:26:54 +0100
Subject: [PATCH 7/7] Pass 'confirmed' after 'label'

---
 netmiko/cisco/cisco_xr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netmiko/cisco/cisco_xr.py b/netmiko/cisco/cisco_xr.py
index fa384b70a..78efeafe8 100644
--- a/netmiko/cisco/cisco_xr.py
+++ b/netmiko/cisco/cisco_xr.py
@@ -107,10 +107,10 @@ def commit(
         commit_kws = ["commit"]
         if replace:
             commit_kws.append("replace")
-        if confirm:
-            commit_kws.extend(["confirmed", str(confirm_delay)])
         if label:
             commit_kws.extend(["label", label])
+        if confirm:
+            commit_kws.extend(["confirmed", str(confirm_delay)])
         if comment:
             commit_kws.extend(["comment", comment])