From 1721646ebec27a22993e214715f874860a4d1e24 Mon Sep 17 00:00:00 2001
From: Don Slice <dslice@cumulusnetworks.com>
Date: Thu, 4 Feb 2016 05:59:12 -0800
Subject: [PATCH] zebra: show_interface_name_vrf fix

Ticket: CM-9110
Reviewed By:
Testing Done: Manual testing, see ticket

Aliased "show interface name swpxx" to "show interface name swpxx vrf all" to find the interface regarless of which vrf it resides in.
---
 zebra/interface.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/zebra/interface.c b/zebra/interface.c
index be85ec4ac2..d7499a0cb4 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1249,11 +1249,14 @@ DEFUN (show_interface_vrf_all, show_interface_vrf_all_cmd,
 }
 
 /* Show specified interface to vty. */
-DEFUN (show_interface_name, show_interface_name_cmd,
-       "show interface IFNAME",
+
+DEFUN (show_interface_name_vrf,
+       show_interface_name_vrf_cmd,
+       "show interface IFNAME " VRF_CMD_STR,
        SHOW_STR
        "Interface status and configuration\n"
-       "Inteface name\n")
+       "Interface name\n"
+       VRF_CMD_HELP_STR)
 {
   struct interface *ifp;
   vrf_id_t vrf_id = VRF_DEFAULT;
@@ -1283,20 +1286,12 @@ DEFUN (show_interface_name, show_interface_name_cmd,
   return CMD_SUCCESS;
 }
 
-ALIAS (show_interface_name,
-       show_interface_name_vrf_cmd,
-       "show interface IFNAME " VRF_CMD_STR,
-       SHOW_STR
-       "Interface status and configuration\n"
-       "Inteface name\n"
-       VRF_CMD_HELP_STR)
-
 /* Show specified interface to vty. */
 DEFUN (show_interface_name_vrf_all, show_interface_name_vrf_all_cmd,
        "show interface IFNAME " VRF_ALL_CMD_STR,
        SHOW_STR
        "Interface status and configuration\n"
-       "Inteface name\n"
+       "Interface name\n"
        VRF_ALL_CMD_HELP_STR)
 {
   struct interface *ifp;
@@ -1333,6 +1328,12 @@ DEFUN (show_interface_name_vrf_all, show_interface_name_vrf_all_cmd,
   return CMD_SUCCESS;
 }
 
+ALIAS (show_interface_name_vrf_all, show_interface_name_cmd,
+       "show interface IFNAME",
+       SHOW_STR
+       "Interface status and configuration\n"
+       "Interface name\n")
+
 static void
 if_show_description (struct vty *vty, vrf_id_t vrf_id)
 {
-- 
2.39.5