]> git.puffer.fish Git - mirror/frr.git/commitdiff
tools: fix frr-reload interface desc cmd 14897/head
authorChirag Shah <chirag@nvidia.com>
Wed, 29 Nov 2023 02:54:14 +0000 (18:54 -0800)
committerChirag Shah <chirag@nvidia.com>
Wed, 29 Nov 2023 03:04:22 +0000 (19:04 -0800)
Fix frr-reload script to only render 'no description'
rather than 'no description blah'

Ticket:#3628756
Testing Done:

Before:
2023-11-29 02:38:55,758  INFO: Failed to execute interface hostbond_1
no description hostbond_1_to_host exit
2023-11-29 02:38:55,758 ERROR: "interface hostbond_1 --  no description
hostbond_1_to_host -- exit" we failed to remove this command
2023-11-29 02:38:55,758 ERROR: % Unknown command:  no description
hostbond_1_to_host

Signed-off-by: Chirag Shah <chirag@nvidia.com>
tools/frr-reload.py

index 8fc3469f6ddfe4dc645972c4c4dbcc8ffdb5f260..b39b1836564491df17daf0b3fe378ab1ccf8e51c 100755 (executable)
@@ -1106,6 +1106,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: