From 60eb6e4c02e0daf9d45b7470e823ac7aa691b50f Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sun, 21 Mar 2021 13:12:41 -0400 Subject: [PATCH] isisd: Fix extra space after `router isis FOO` Fix places where we are outputing an extra space. This was because it was prepping for vrf but we may not have a vrf. Fixes: #8300 Signed-off-by: Donald Sharp (cherry picked from commit 31200a2963e02642323c592990469861d0cdbc9d) --- isisd/isis_cli.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/isisd/isis_cli.c b/isisd/isis_cli.c index b421c4704b..7d676c7caf 100644 --- a/isisd/isis_cli.c +++ b/isisd/isis_cli.c @@ -136,10 +136,10 @@ void cli_show_router_isis(struct vty *vty, struct lyd_node *dnode, vrf = yang_dnode_get_string(dnode, "./vrf"); vty_out(vty, "!\n"); - vty_out(vty, "router isis %s ", + vty_out(vty, "router isis %s", yang_dnode_get_string(dnode, "./area-tag")); if (!strmatch(vrf, VRF_DEFAULT_NAME)) - vty_out(vty, "vrf %s", yang_dnode_get_string(dnode, "./vrf")); + vty_out(vty, " vrf %s", yang_dnode_get_string(dnode, "./vrf")); vty_out(vty, "\n"); } @@ -395,7 +395,7 @@ void cli_show_ip_isis_ipv4(struct vty *vty, struct lyd_node *dnode, vty_out(vty, " ip router isis %s ", yang_dnode_get_string(dnode, "../area-tag")); if (!strmatch(vrf, VRF_DEFAULT_NAME)) - vty_out(vty, "vrf %s", vrf); + vty_out(vty, " vrf %s", vrf); vty_out(vty, "\n"); } @@ -408,10 +408,10 @@ void cli_show_ip_isis_ipv6(struct vty *vty, struct lyd_node *dnode, if (!yang_dnode_get_bool(dnode, NULL)) vty_out(vty, " no"); - vty_out(vty, " ipv6 router isis %s ", + vty_out(vty, " ipv6 router isis %s", yang_dnode_get_string(dnode, "../area-tag")); if (!strmatch(vrf, VRF_DEFAULT_NAME)) - vty_out(vty, "vrf %s", vrf); + vty_out(vty, " vrf %s", vrf); vty_out(vty, "\n"); } -- 2.39.5