Merge pull request #14900 from FRRouting/mergify/bp/stable/9.0/pr-14897

tools: fix frr-reload interface desc cmd (backport #14897)

1 files changed, 11 insertions, 0 deletions

diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index 42496ac5f6..09e8c9fbef 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -1088,6 +1088,17 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del):
             lines_to_del.remove((ctx_keys, line))
             lines_to_del.insert(index, (ctx_keys, "description"))
 
+        # interface x ; description blah
+        # no form of description does not accept any argument,
+        # strip arg before rendering
+        if (
+            ctx_keys[0].startswith("interface ")
+            and line
+            and line.startswith("description ")
+        ):
+            lines_to_del.remove((ctx_keys, line))
+            lines_to_del.insert(index, (ctx_keys, "description"))
+
         # If there is a change in the segment routing block ranges, do it
         # in-place, to avoid requesting spurious label chunks which might fail
         if line and "segment-routing global-block" in line: