From 2e7a9052f4d72bbb0739955c757decebdab073a2 Mon Sep 17 00:00:00 2001 From: Chirag Shah Date: Tue, 28 Nov 2023 18:54:14 -0800 Subject: [PATCH] tools: fix frr-reload interface desc cmd 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 (cherry picked from commit 00b96f70df4bfa40b0676b180b01df49d7546e33) --- tools/frr-reload.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/frr-reload.py b/tools/frr-reload.py index 3a478f63cc..ce2a9eff2e 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -1110,6 +1110,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: