pimd: make show ip mroute output consistent

We had 3 different string output formats in various places.
Make them all the same.

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
(cherry picked from commit 530b12cf6e88170d4f6d4f10a8bd95de0284866e)

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index f6072b1771bbbe58bdac5b7a4c54b292525a19e5..f67a67703d1be49735b5dc4159ba5935470039be 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -6275,7 +6275,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
 
                if (!uj && !found_oif) {
                        vty_out(vty,
-                               "%-15s %-15s %-15s %-6s %-16s %-16s %-3d  %8s\n",
+                               "%-15s %-15s %-8s %-6s %-16s %-16s %-3d  %8s\n",
                                src_str, grp_str, state_str, "none", in_ifname,
                                "none", 0, "--:--:--");
                }
@@ -6382,10 +6382,9 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
                                                       json_ifp_out);
                        } else {
                                vty_out(vty,
-                                       "%-15s %-15s %-6s %-16s %-16s %-3d  %8s %s\n",
-                                       src_str, grp_str, proto, in_ifname,
-                                       out_ifname, ttl, oif_uptime,
-                                       pim->vrf->name);
+                                       "%-15s %-15s %-8s %-6s %-16s %-16s %-3d  %8s\n",
+                                       src_str, grp_str, "-", proto, in_ifname,
+                                       out_ifname, ttl, oif_uptime);
                                if (first && !fill) {
                                        src_str[0] = '\0';
                                        grp_str[0] = '\0';
@@ -6397,9 +6396,9 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
 
                if (!uj && !found_oif) {
                        vty_out(vty,
-                               "%-15s %-15s %-6s %-16s %-16s %-3d  %8s %s\n",
-                               src_str, grp_str, proto, in_ifname, "none", 0,
-                               "--:--:--", pim->vrf->name);
+                               "%-15s %-15s %-8s %-6s %-16s %-16s %-3d  %8s\n",
+                               src_str, grp_str, "-", proto, in_ifname, "none",
+                               0, "--:--:--");
                }
        }