From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 22 Sep 2018 16:10:02 +0000 (-0400)
Subject: lib: Allow useful display of default vrf name
X-Git-Tag: frr-7.1-dev~339^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F3071%2Fhead;p=mirror%2Ffrr.git

lib: Allow useful display of default vrf name

When entering a interface name and you fat-finger it
actually display some useful information about the vrf
we are in.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/lib/if.c b/lib/if.c
index 6b551a9fa1..67e2d366cd 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -656,7 +656,8 @@ DEFUN_NOSH (interface,
 	int idx_ifname = 1;
 	int idx_vrf = 3;
 	const char *ifname = argv[idx_ifname]->arg;
-	const char *vrfname = (argc > 2) ? argv[idx_vrf]->arg : NULL;
+	const char *vrfname =
+		(argc > 2) ? argv[idx_vrf]->arg : VRF_DEFAULT_NAME;
 
 	struct interface *ifp;
 	vrf_id_t vrf_id = VRF_DEFAULT;
@@ -681,7 +682,8 @@ DEFUN_NOSH (interface,
 #endif /* SUNOS_5 */
 
 	if (!ifp) {
-		vty_out(vty, "%% interface %s not in %s\n", ifname, vrfname);
+		vty_out(vty, "%% interface %s not in %s vrf\n", ifname,
+			vrfname);
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 	VTY_PUSH_CONTEXT(INTERFACE_NODE, ifp);