From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 13 Jan 2017 21:45:12 +0000 (-0500)
Subject: bgpd: Fixup optional safi parameters
X-Git-Tag: frr-3.0-branchpoint~84^2~5
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=38bd4f6909956b4c2515cebbfb4ad88e723e98ce;p=matthieu%2Ffrr.git

bgpd: Fixup optional safi parameters

The afi/safi specification should allow you to skip
the safi if it is defaulting to unicast.

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

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 08a4db79fa..92a1c86712 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -7846,7 +7846,7 @@ bgp_show_route (struct vty *vty, const char *view_name, const char *ip_str,
 /* BGP route print out function. */
 DEFUN (show_ip_bgp_ipv4,
        show_ip_bgp_ipv4_cmd,
-       "show [ip] bgp [<view|vrf> WORD] [<ipv4|ipv6>] [<unicast|multicast|vpn|encap>] [<cidr-only|dampening <flap-statistics|dampened-paths|parameters>|route-map WORD|prefix-list WORD|filter-list WORD|community [<AA:NN|local-AS|no-advertise|no-export> [exact-match]]|community-list <(1-500)|WORD> [exact-match]|A.B.C.D/M longer-prefixes|X:X::X:X/M longer-prefixes>] [json]",
+       "show [ip] bgp [<view|vrf> WORD] [<ipv4|ipv6> [<unicast|multicast|vpn|encap>]] [<cidr-only|dampening <flap-statistics|dampened-paths|parameters>|route-map WORD|prefix-list WORD|filter-list WORD|community [<AA:NN|local-AS|no-advertise|no-export> [exact-match]]|community-list <(1-500)|WORD> [exact-match]|A.B.C.D/M longer-prefixes|X:X::X:X/M longer-prefixes>] [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -7977,7 +7977,7 @@ DEFUN (show_ip_bgp_ipv4,
 
 DEFUN (show_ip_bgp_route,
        show_ip_bgp_route_cmd,
-       "show [ip] bgp [<view|vrf> WORD] [<ipv4|ipv6>] [<unicast|multicast|vpn|encap>]"
+       "show [ip] bgp [<view|vrf> WORD] [<ipv4|ipv6> [<unicast|multicast|vpn|encap>]]"
        "<A.B.C.D|A.B.C.D/M|X:X::X:X|X:X::X:X/M> [<bestpath|multipath>] [json]",
        SHOW_STR
        IP_STR