From b84060bbedb72a7c3bd8cd6b79a5aebf9e34bc95 Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Wed, 2 Jan 2019 16:08:42 +0100 Subject: [PATCH] bgpd: use the wording vrf instead of table in bgp, even if the main vrf implementation relies on tables, the fact is some vrf implementation rely on network namespaces, and then the table used is the default table from the network namespace. Use the wording vrf instead of table. Signed-off-by: Philippe Guibert --- bgpd/bgp_route.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 2c361bef4d..658a1e3f1f 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -8974,12 +8974,14 @@ void route_vty_out_detail_header(struct vty *vty, struct bgp *bgp, vty_out(vty, "Paths: (%d available", count); if (best) { vty_out(vty, ", best #%d", best); - if (safi == SAFI_UNICAST) - vty_out(vty, ", table %s", - (bgp->inst_type - == BGP_INSTANCE_TYPE_DEFAULT) - ? VRF_DEFAULT_NAME - : bgp->name); + if (safi == SAFI_UNICAST) { + if (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) + vty_out(vty, ", table %s", + VRF_DEFAULT_NAME); + else + vty_out(vty, ", vrf %s", + bgp->name); + } } else vty_out(vty, ", no best path");