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 <sharpd@nvidia.com>
(cherry picked from commit 31200a2963e02642323c592990469861d0cdbc9d)

diff --git a/isisd/isis_cli.c b/isisd/isis_cli.c
index b421c4704bd02751f13c94456cb339f1b3cdbdf2..7d676c7cafb33cd6526e99092fc202dac236c10e 100644 (file)
--- 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");
 }