From fbc48492fc1753fffacd2c6d597d43abcd34465a Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 12 Nov 2020 16:13:48 -0500 Subject: [PATCH 1/2] ospfd: Fix excessive doc string for `no summary-address ..` command The `no summary-address ..` command had excessive doc string. Fix. Signed-off-by: Donald Sharp --- ospfd/ospf_vty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 28ee4db3a1..71dea80538 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -10155,8 +10155,8 @@ DEFUN (no_ospf_external_route_aggregation_no_adrvertise, "no summary-address A.B.C.D/M no-advertise", NO_STR "External summary address\n" - "Summary address prefix (a.b.c.d/m) \n" - "Adverise summary route to the AS \n.") + "Summary address prefix (a.b.c.d/m)\n" + "Advertise summary route to the AS \n") { VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); struct prefix_ipv4 p; From c8a400f374e3cfe6a94646be031f7fa64ba1fe4f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 12 Nov 2020 16:14:29 -0500 Subject: [PATCH 2/2] lib: Change zlog_debug to zlog_err for doc string issues Modify the code to change from zlog_debug to zlog_err. vtysh was not outputting the vtysh doc string issues after a change a couple of months back. By changing to error level we start seeing them on vtysh start up again. This will allow us to catch these issues in the CI runs again. Signed-off-by: Donald Sharp --- lib/command_parse.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/command_parse.y b/lib/command_parse.y index 5dc19d2c9b..ba5225b702 100644 --- a/lib/command_parse.y +++ b/lib/command_parse.y @@ -492,11 +492,11 @@ terminate_graph (CMD_YYLTYPE *locp, struct parser_ctx *ctx, graph_new_node (ctx->graph, (void *)element, NULL); if (ctx->docstr && strlen (ctx->docstr) > 1) { - zlog_debug ("Excessive docstring while parsing '%s'", ctx->el->string); - zlog_debug ("----------"); + zlog_err ("Excessive docstring while parsing '%s'", ctx->el->string); + zlog_err ("----------"); while (ctx->docstr && ctx->docstr[1] != '\0') - zlog_debug ("%s", strsep(&ctx->docstr, "\n")); - zlog_debug ("----------\n"); + zlog_err ("%s", strsep(&ctx->docstr, "\n")); + zlog_err ("----------\n"); } graph_add_edge (finalnode, end_token_node); @@ -509,7 +509,7 @@ doc_next (struct parser_ctx *ctx) const char *piece = ctx->docstr ? strsep (&ctx->docstr, "\n") : ""; if (*piece == 0x03) { - zlog_debug ("Ran out of docstring while parsing '%s'", ctx->el->string); + zlog_err ("Ran out of docstring while parsing '%s'", ctx->el->string); piece = ""; }