From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 7 Aug 2019 19:02:43 +0000 (-0400)
Subject: zebra: Allow v4 or v6 addresses to be optional after `vrf X` in show ip nht
X-Git-Tag: base_7.2~63^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=94a01fb26e4b8be71517b07d7920b594ef79b0a6;p=mirror%2Ffrr.git

zebra: Allow v4 or v6 addresses to be optional after `vrf X` in show ip nht

The `show ip nht vrf EVA ...` command was not allowing you to only
specify the vrf anymore.  Fix this:

robot# show ip nht vrf EVA
  <cr>
  A.B.C.D   IPv4 Address
  X:X::X:X  IPv6 Address
robot# show ip nht vrf EVA 4.5.6.7
robot# show ip nht vrf EVA
robot#

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

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 99431e7e6d..5c0dc27380 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1028,7 +1028,7 @@ DEFPY (show_route_all_table_vrf,
 
 DEFPY (show_ip_nht,
        show_ip_nht_cmd,
-       "show <ip$ipv4|ipv6$ipv6> <nht|import-check>$type [<A.B.C.D|X:X::X:X>$addr|vrf NAME$vrf_name <A.B.C.D|X:X::X:X>$addr|vrf all$vrf_all]",
+       "show <ip$ipv4|ipv6$ipv6> <nht|import-check>$type [<A.B.C.D|X:X::X:X>$addr|vrf NAME$vrf_name [<A.B.C.D|X:X::X:X>$addr]|vrf all$vrf_all]",
        SHOW_STR
        IP_STR
        IP6_STR