From 527fd6dee52de356a6ef44b4291cf47a2dfef0c8 Mon Sep 17 00:00:00 2001 From: Chirag Shah Date: Mon, 4 Nov 2019 11:15:02 -0800 Subject: [PATCH] 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 --- bgpd/bgp_evpn_vty.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index 55f85eeb83..7dbeb8029a 100644 --- 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; } -- 2.39.5