bgpd: fix rd printing in show commands for evpn rts

PR 5118 introduce additional (prepend) keywords
like 'ip' to Route Distinguisher output which
breaks existing evpn route show commands parsing.

Restore to original behavior.

Testing Done:

vtysh -c 'show bgp l2vpn evpn route'

Before fix:
Route Distinguisher: ip 27.0.0.15:44

Post fix:
Route Distinguisher: 27.0.0.15:44

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 55f85eeb83496ec2ece43c4797c6d4759695e3f7..7dbeb8029accf9548fb030f4f8e301cd4b539625 100644 (file)
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -298,7 +298,7 @@ static void bgp_evpn_show_route_rd_header(struct vty *vty,
                if (json)
                        json_object_string_add(json, "rd", rd_str);
                else
-                       vty_out(vty, "as2 %s\n", rd_str);
+                       vty_out(vty, "%s\n", rd_str);
                break;
 
        case RD_TYPE_AS4:
@@ -307,7 +307,7 @@ static void bgp_evpn_show_route_rd_header(struct vty *vty,
                if (json)
                        json_object_string_add(json, "rd", rd_str);
                else
-                       vty_out(vty, "as4 %s\n", rd_str);
+                       vty_out(vty, "%s\n", rd_str);
                break;
 
        case RD_TYPE_IP:
@@ -317,7 +317,7 @@ static void bgp_evpn_show_route_rd_header(struct vty *vty,
                if (json)
                        json_object_string_add(json, "rd", rd_str);
                else
-                       vty_out(vty, "ip %s\n", rd_str);
+                       vty_out(vty, "%s\n", rd_str);
                break;
 
        default:
@@ -326,7 +326,7 @@ static void bgp_evpn_show_route_rd_header(struct vty *vty,
                        json_object_string_add(json, "rd", rd_str);
                } else {
                        snprintf(rd_str, len, "Unknown RD type");
-                       vty_out(vty, "ip %s\n", rd_str);
+                       vty_out(vty, "%s\n", rd_str);
                }
                break;
        }