From 87e70f81d8b98f13ece0ab0b496f60bdff2af14b Mon Sep 17 00:00:00 2001 From: Chirag Shah Date: Mon, 3 Feb 2025 12:00:41 -0800 Subject: [PATCH] bgpd: fix route-distinguisher in vrf leak json cmd For auto configured value RD value comes as NULL, switching back to original change will ensure to cover for both auto and user configured RD value in JSON. tor-11# show bgp vrf blue ipv4 unicast route-leak json { "vrf":"blue", "afiSafi":"ipv4Unicast", "importFromVrfs":[ "purple" ], "importRts":"10.10.3.11:6", "exportToVrfs":[ "purple" ], "routeDistinguisher":"(null)", <<<<< "exportRts":"10.10.3.11:10" } Signed-off-by: Chirag Shah (cherry picked from commit 892704d07f5286464728720648ad392b485a9966) --- bgpd/bgp_vty.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 8f6203f34c..ee99ecfe10 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -16110,9 +16110,9 @@ static int bgp_show_route_leak_vty(struct vty *vty, const char *name, json_object_new_string(vname)); json_object_object_add(json, "exportToVrfs", json_export_vrfs); - json_object_string_addf( - json, "routeDistinguisher", "%s", - bgp->vpn_policy[afi].tovpn_rd_pretty); + json_object_string_addf(json, "routeDistinguisher", + BGP_RD_AS_FORMAT(bgp->asnotation), + &bgp->vpn_policy[afi].tovpn_rd); dir = BGP_VPN_POLICY_DIR_TOVPN; if (bgp->vpn_policy[afi].rtlist[dir]) { ecom_str = ecommunity_ecom2str( -- 2.39.5