diff options
| -rw-r--r-- | bgpd/bgp_bmp.c | 9 | ||||
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 2 | ||||
| -rw-r--r-- | bgpd/bgp_mplsvpn.h | 4 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 8 | ||||
| -rw-r--r-- | bgpd/bgp_vty.c | 28 | ||||
| -rw-r--r-- | bgpd/bgp_vty.h | 15 | ||||
| -rw-r--r-- | vtysh/vtysh.c | 53 |
7 files changed, 60 insertions, 59 deletions
diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c index e7b936233e..cf196f7390 100644 --- a/bgpd/bgp_bmp.c +++ b/bgpd/bgp_bmp.c @@ -2215,8 +2215,13 @@ DEFPY(bmp_monitor_cfg, NO_STR BMP_STR "Send BMP route monitoring messages\n" - "Address Family\nAddress Family\nAddress Family\n" - "Address Family\nAddress Family\nAddress Family\nAddress Family\n" + BGP_AF_STR + BGP_AF_STR + BGP_AF_STR + BGP_AF_STR + BGP_AF_STR + BGP_AF_STR + BGP_AF_STR "Send state before policy and filter processing\n" "Send state with policy and filters applied\n") { diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 52180b3e48..1a61c91dc6 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -2487,7 +2487,7 @@ DEFUN (show_ip_bgp_vpn_rd, IP_STR BGP_STR BGP_AFI_HELP_STR - "Address Family modifier\n" + BGP_AF_MODIFIER_STR "Display information for a route distinguisher\n" "VPN Route Distinguisher\n" "All VPN Route Distinguishers\n") diff --git a/bgpd/bgp_mplsvpn.h b/bgpd/bgp_mplsvpn.h index fcabb16435..715c40e197 100644 --- a/bgpd/bgp_mplsvpn.h +++ b/bgpd/bgp_mplsvpn.h @@ -32,9 +32,7 @@ || (label) == MPLS_LABEL_IPV6_EXPLICIT_NULL \ || (label) == MPLS_LABEL_IMPLICIT_NULL) -#define BGP_VPNVX_HELP_STR \ - "Address Family\n" \ - "Address Family\n" +#define BGP_VPNVX_HELP_STR BGP_AF_STR BGP_AF_STR #define V4_HEADER \ " Network Next Hop Metric LocPrf Weight Path\n" diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index b35cbeb21f..35581e7147 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -14189,9 +14189,9 @@ DEFUN (show_ip_bgp_neighbor_received_prefix_filter, IP_STR BGP_STR BGP_INSTANCE_HELP_STR - "Address Family\n" - "Address Family\n" - "Address Family modifier\n" + BGP_AF_STR + BGP_AF_STR + BGP_AF_MODIFIER_STR "Detailed information on TCP and BGP neighbor connections\n" "Neighbor to display information about\n" "Neighbor to display information about\n" @@ -14377,7 +14377,7 @@ DEFUN (show_bgp_afi_vpn_rd_route, SHOW_STR BGP_STR BGP_AFI_HELP_STR - "Address Family modifier\n" + BGP_AF_MODIFIER_STR "Display information for a route distinguisher\n" "Route Distinguisher\n" "All Route Distinguishers\n" diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 19901792ea..42d19d0315 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -9367,7 +9367,7 @@ DEFUN_NOSH (address_family_ipv4_safi, address_family_ipv4_safi_cmd, "address-family ipv4 [<unicast|multicast|vpn|labeled-unicast|flowspec>]", "Enter Address Family command mode\n" - "Address Family\n" + BGP_AF_STR BGP_SAFI_WITH_LABEL_HELP_STR) { @@ -9392,7 +9392,7 @@ DEFUN_NOSH (address_family_ipv6_safi, address_family_ipv6_safi_cmd, "address-family ipv6 [<unicast|multicast|vpn|labeled-unicast|flowspec>]", "Enter Address Family command mode\n" - "Address Family\n" + BGP_AF_STR BGP_SAFI_WITH_LABEL_HELP_STR) { if (argc == 3) { @@ -9417,8 +9417,8 @@ DEFUN_NOSH (address_family_vpnv4, address_family_vpnv4_cmd, "address-family vpnv4 [unicast]", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_VPNV4_NODE; return CMD_SUCCESS; @@ -9428,8 +9428,8 @@ DEFUN_NOSH (address_family_vpnv6, address_family_vpnv6_cmd, "address-family vpnv6 [unicast]", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_VPNV6_NODE; return CMD_SUCCESS; @@ -9440,8 +9440,8 @@ DEFUN_NOSH (address_family_evpn, address_family_evpn_cmd, "address-family l2vpn evpn", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { VTY_DECLVAR_CONTEXT(bgp, bgp); vty->node = BGP_EVPN_NODE; @@ -9692,9 +9692,9 @@ DEFUN (clear_ip_bgp_all, BGP_STR BGP_INSTANCE_HELP_STR BGP_AFI_HELP_STR - "Address Family\n" + BGP_AF_STR BGP_SAFI_WITH_LABEL_HELP_STR - "Address Family modifier\n" + BGP_AF_MODIFIER_STR "Clear all peers\n" "BGP IPv4 neighbor to clear\n" "BGP IPv6 neighbor to clear\n" @@ -9827,7 +9827,7 @@ DEFUN (clear_bgp_ipv6_safi_prefix, CLEAR_STR IP_STR BGP_STR - "Address Family\n" + BGP_AF_STR BGP_SAFI_HELP_STR "Clear bestpath and re-advertise\n" "IPv6 prefix\n") @@ -9851,7 +9851,7 @@ DEFUN (clear_bgp_instance_ipv6_safi_prefix, IP_STR BGP_STR BGP_INSTANCE_HELP_STR - "Address Family\n" + BGP_AF_STR BGP_SAFI_HELP_STR "Clear bestpath and re-advertise\n" "IPv6 prefix\n") @@ -14672,8 +14672,8 @@ DEFUN (show_ip_bgp_neighbors, IP_STR BGP_STR BGP_INSTANCE_HELP_STR - "Address Family\n" - "Address Family\n" + BGP_AF_STR + BGP_AF_STR "Detailed information on TCP and BGP neighbor connections\n" "Neighbor to display information about\n" "Neighbor to display information about\n" diff --git a/bgpd/bgp_vty.h b/bgpd/bgp_vty.h index 143d3c1ac5..a7cd8f778e 100644 --- a/bgpd/bgp_vty.h +++ b/bgpd/bgp_vty.h @@ -28,23 +28,20 @@ struct bgp; #define BGP_INSTANCE_HELP_STR "BGP view\nBGP VRF\nView/VRF name\n" #define BGP_INSTANCE_ALL_HELP_STR "BGP view\nBGP VRF\nAll Views/VRFs\n" +#define BGP_AF_STR "Address Family\n" +#define BGP_AF_MODIFIER_STR "Address Family modifier\n" #define BGP_AFI_CMD_STR "<ipv4|ipv6>" -#define BGP_AFI_HELP_STR "Address Family\nAddress Family\n" +#define BGP_AFI_HELP_STR BGP_AF_STR BGP_AF_STR #define BGP_SAFI_CMD_STR "<unicast|multicast|vpn>" #define BGP_SAFI_HELP_STR \ - "Address Family modifier\n" \ - "Address Family modifier\n" \ - "Address Family modifier\n" + BGP_AF_MODIFIER_STR BGP_AF_MODIFIER_STR BGP_AF_MODIFIER_STR #define BGP_AFI_SAFI_CMD_STR BGP_AFI_CMD_STR" "BGP_SAFI_CMD_STR #define BGP_AFI_SAFI_HELP_STR BGP_AFI_HELP_STR BGP_SAFI_HELP_STR #define BGP_SAFI_WITH_LABEL_CMD_STR "<unicast|multicast|vpn|labeled-unicast|flowspec>" #define BGP_SAFI_WITH_LABEL_HELP_STR \ - "Address Family modifier\n" \ - "Address Family modifier\n" \ - "Address Family modifier\n" \ - "Address Family modifier\n" \ - "Address Family modifier\n" + BGP_AF_MODIFIER_STR BGP_AF_MODIFIER_STR BGP_AF_MODIFIER_STR \ + BGP_AF_MODIFIER_STR BGP_AF_MODIFIER_STR #define SHOW_GR_HEADER \ "Codes: GR - Graceful Restart," \ diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 21bd2f4883..051b10c7d1 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -51,6 +51,7 @@ #include "frrstr.h" #include "json.h" #include "ferr.h" +#include "bgpd/bgp_vty.h" DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CMD, "Vtysh cmd copy"); @@ -1685,8 +1686,8 @@ DEFUNSH(VTYSH_BGPD, router_bgp, router_bgp_cmd, DEFUNSH(VTYSH_BGPD, address_family_vpnv4, address_family_vpnv4_cmd, "address-family vpnv4 [unicast]", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_VPNV4_NODE; return CMD_SUCCESS; @@ -1695,8 +1696,8 @@ DEFUNSH(VTYSH_BGPD, address_family_vpnv4, address_family_vpnv4_cmd, DEFUNSH(VTYSH_BGPD, address_family_vpnv6, address_family_vpnv6_cmd, "address-family vpnv6 [unicast]", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_VPNV6_NODE; return CMD_SUCCESS; @@ -1706,8 +1707,8 @@ DEFUNSH(VTYSH_BGPD, address_family_vpnv6, address_family_vpnv6_cmd, DEFUNSH(VTYSH_BGPD, address_family_ipv4, address_family_ipv4_cmd, "address-family ipv4 [unicast]", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family Modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_IPV4_NODE; return CMD_SUCCESS; @@ -1716,8 +1717,8 @@ DEFUNSH(VTYSH_BGPD, address_family_ipv4, address_family_ipv4_cmd, DEFUNSH(VTYSH_BGPD, address_family_flowspecv4, address_family_flowspecv4_cmd, "address-family ipv4 flowspec", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family Modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_FLOWSPECV4_NODE; return CMD_SUCCESS; @@ -1726,8 +1727,8 @@ DEFUNSH(VTYSH_BGPD, address_family_flowspecv4, address_family_flowspecv4_cmd, DEFUNSH(VTYSH_BGPD, address_family_flowspecv6, address_family_flowspecv6_cmd, "address-family ipv6 flowspec", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family Modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_FLOWSPECV6_NODE; return CMD_SUCCESS; @@ -1736,8 +1737,8 @@ DEFUNSH(VTYSH_BGPD, address_family_flowspecv6, address_family_flowspecv6_cmd, DEFUNSH(VTYSH_BGPD, address_family_ipv4_multicast, address_family_ipv4_multicast_cmd, "address-family ipv4 multicast", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_IPV4M_NODE; return CMD_SUCCESS; @@ -1746,8 +1747,8 @@ DEFUNSH(VTYSH_BGPD, address_family_ipv4_multicast, DEFUNSH(VTYSH_BGPD, address_family_ipv4_vpn, address_family_ipv4_vpn_cmd, "address-family ipv4 vpn", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_VPNV4_NODE; return CMD_SUCCESS; @@ -1757,8 +1758,8 @@ DEFUNSH(VTYSH_BGPD, address_family_ipv4_labeled_unicast, address_family_ipv4_labeled_unicast_cmd, "address-family ipv4 labeled-unicast", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_IPV4L_NODE; return CMD_SUCCESS; @@ -1767,8 +1768,8 @@ DEFUNSH(VTYSH_BGPD, address_family_ipv4_labeled_unicast, DEFUNSH(VTYSH_BGPD, address_family_ipv6, address_family_ipv6_cmd, "address-family ipv6 [unicast]", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_IPV6_NODE; return CMD_SUCCESS; @@ -1777,8 +1778,8 @@ DEFUNSH(VTYSH_BGPD, address_family_ipv6, address_family_ipv6_cmd, DEFUNSH(VTYSH_BGPD, address_family_ipv6_multicast, address_family_ipv6_multicast_cmd, "address-family ipv6 multicast", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_IPV6M_NODE; return CMD_SUCCESS; @@ -1787,8 +1788,8 @@ DEFUNSH(VTYSH_BGPD, address_family_ipv6_multicast, DEFUNSH(VTYSH_BGPD, address_family_ipv6_vpn, address_family_ipv6_vpn_cmd, "address-family ipv6 vpn", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_VPNV6_NODE; return CMD_SUCCESS; @@ -1798,8 +1799,8 @@ DEFUNSH(VTYSH_BGPD, address_family_ipv6_labeled_unicast, address_family_ipv6_labeled_unicast_cmd, "address-family ipv6 labeled-unicast", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_IPV6L_NODE; return CMD_SUCCESS; @@ -1863,8 +1864,8 @@ DEFUNSH(VTYSH_BGPD, DEFUNSH(VTYSH_BGPD, address_family_evpn, address_family_evpn_cmd, "address-family <l2vpn evpn>", "Enter Address Family command mode\n" - "Address Family\n" - "Address Family modifier\n") + BGP_AF_STR + BGP_AF_MODIFIER_STR) { vty->node = BGP_EVPN_NODE; return CMD_SUCCESS; |