proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 21:01:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd, lib, vtysh, zebra: Convert to using CMD_VNI_RANGE

Browse Source 
For the vni range use a macro to keep track of it.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-10-18 20:44:52 -04:00
parent f3a930da15
commit 093e3f23f6
7 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bgpd/bgp_evpn_vty.c
View File

@ -3195,7 +3195,7 @@ DEFUN (no_bgp_evpn_advertise_type5,
*/ */
DEFUN(show_bgp_l2vpn_evpn_vni, DEFUN(show_bgp_l2vpn_evpn_vni,
show_bgp_l2vpn_evpn_vni_cmd, show_bgp_l2vpn_evpn_vni_cmd,
"show bgp l2vpn evpn vni [(1-16777215)] [json]", "show bgp l2vpn evpn vni [" CMD_VNI_RANGE "] [json]",
SHOW_STR SHOW_STR
BGP_STR BGP_STR
L2VPN_HELP_STR L2VPN_HELP_STR
@ -3623,7 +3623,7 @@ DEFUN(show_bgp_l2vpn_evpn_route_esi,
* Display per-VNI EVPN routing table. * Display per-VNI EVPN routing table.
*/ */
DEFUN(show_bgp_l2vpn_evpn_route_vni, show_bgp_l2vpn_evpn_route_vni_cmd, DEFUN(show_bgp_l2vpn_evpn_route_vni, show_bgp_l2vpn_evpn_route_vni_cmd,
"show bgp l2vpn evpn route vni (1-16777215) [<type <macip|multicast> | vtep A.B.C.D>] [json]", "show bgp l2vpn evpn route vni " CMD_VNI_RANGE " [<type <macip|multicast> | vtep A.B.C.D>] [json]",
SHOW_STR SHOW_STR
BGP_STR BGP_STR
L2VPN_HELP_STR L2VPN_HELP_STR
@ -3696,7 +3696,7 @@ DEFUN(show_bgp_l2vpn_evpn_route_vni, show_bgp_l2vpn_evpn_route_vni_cmd,
*/ */
DEFUN(show_bgp_l2vpn_evpn_route_vni_macip, DEFUN(show_bgp_l2vpn_evpn_route_vni_macip,
show_bgp_l2vpn_evpn_route_vni_macip_cmd, show_bgp_l2vpn_evpn_route_vni_macip_cmd,
"show bgp l2vpn evpn route vni (1-16777215) mac WORD [ip WORD] [json]", "show bgp l2vpn evpn route vni " CMD_VNI_RANGE " mac WORD [ip WORD] [json]",
SHOW_STR SHOW_STR
BGP_STR BGP_STR
L2VPN_HELP_STR L2VPN_HELP_STR
@ -3766,7 +3766,7 @@ DEFUN(show_bgp_l2vpn_evpn_route_vni_macip,
*/ */
DEFUN(show_bgp_l2vpn_evpn_route_vni_multicast, DEFUN(show_bgp_l2vpn_evpn_route_vni_multicast,
show_bgp_l2vpn_evpn_route_vni_multicast_cmd, show_bgp_l2vpn_evpn_route_vni_multicast_cmd,
"show bgp l2vpn evpn route vni (1-16777215) multicast A.B.C.D [json]", "show bgp l2vpn evpn route vni " CMD_VNI_RANGE " multicast A.B.C.D [json]",
SHOW_STR SHOW_STR
BGP_STR BGP_STR
L2VPN_HELP_STR L2VPN_HELP_STR
@ -4019,7 +4019,7 @@ DEFUN(test_withdraw_evpn_type4_route,
} }
ALIAS_HIDDEN(show_bgp_l2vpn_evpn_vni, show_bgp_evpn_vni_cmd, ALIAS_HIDDEN(show_bgp_l2vpn_evpn_vni, show_bgp_evpn_vni_cmd,
"show bgp evpn vni [(1-16777215)]", SHOW_STR BGP_STR EVPN_HELP_STR "show bgp evpn vni [" CMD_VNI_RANGE "]", SHOW_STR BGP_STR EVPN_HELP_STR
"Show VNI\n" "Show VNI\n"
"VNI number\n") "VNI number\n")
@ -4060,7 +4060,7 @@ ALIAS_HIDDEN(
ALIAS_HIDDEN( ALIAS_HIDDEN(
show_bgp_l2vpn_evpn_route_vni, show_bgp_evpn_route_vni_cmd, show_bgp_l2vpn_evpn_route_vni, show_bgp_evpn_route_vni_cmd,
"show bgp evpn route vni (1-16777215) [<type <macip|multicast> | vtep A.B.C.D>]", "show bgp evpn route vni " CMD_VNI_RANGE " [<type <macip|multicast> | vtep A.B.C.D>]",
SHOW_STR BGP_STR EVPN_HELP_STR SHOW_STR BGP_STR EVPN_HELP_STR
"EVPN route information\n" "EVPN route information\n"
"VXLAN Network Identifier\n" "VXLAN Network Identifier\n"
@ -4073,7 +4073,7 @@ ALIAS_HIDDEN(
ALIAS_HIDDEN(show_bgp_l2vpn_evpn_route_vni_macip, ALIAS_HIDDEN(show_bgp_l2vpn_evpn_route_vni_macip,
show_bgp_evpn_route_vni_macip_cmd, show_bgp_evpn_route_vni_macip_cmd,
"show bgp evpn route vni (1-16777215) mac WORD [ip WORD]", "show bgp evpn route vni " CMD_VNI_RANGE " mac WORD [ip WORD]",
SHOW_STR BGP_STR EVPN_HELP_STR SHOW_STR BGP_STR EVPN_HELP_STR
"EVPN route information\n" "EVPN route information\n"
"VXLAN Network Identifier\n" "VXLAN Network Identifier\n"
@ -4085,7 +4085,7 @@ ALIAS_HIDDEN(show_bgp_l2vpn_evpn_route_vni_macip,
ALIAS_HIDDEN(show_bgp_l2vpn_evpn_route_vni_multicast, ALIAS_HIDDEN(show_bgp_l2vpn_evpn_route_vni_multicast,
show_bgp_evpn_route_vni_multicast_cmd, show_bgp_evpn_route_vni_multicast_cmd,
"show bgp evpn route vni (1-16777215) multicast A.B.C.D", "show bgp evpn route vni " CMD_VNI_RANGE " multicast A.B.C.D",
SHOW_STR BGP_STR EVPN_HELP_STR SHOW_STR BGP_STR EVPN_HELP_STR
"EVPN route information\n" "EVPN route information\n"
"VXLAN Network Identifier\n" "VXLAN Network Identifier\n"
@ -4108,7 +4108,7 @@ ALIAS_HIDDEN(show_bgp_l2vpn_evpn_import_rt, show_bgp_evpn_import_rt_cmd,
DEFUN_NOSH (bgp_evpn_vni, DEFUN_NOSH (bgp_evpn_vni,
bgp_evpn_vni_cmd, bgp_evpn_vni_cmd,
"vni (1-16777215)", "vni " CMD_VNI_RANGE,
"VXLAN Network Identifier\n" "VXLAN Network Identifier\n"
"VNI number\n") "VNI number\n")
{ {
@ -4134,7 +4134,7 @@ DEFUN_NOSH (bgp_evpn_vni,
DEFUN (no_bgp_evpn_vni, DEFUN (no_bgp_evpn_vni,
no_bgp_evpn_vni_cmd, no_bgp_evpn_vni_cmd,
"no vni (1-16777215)", "no vni " CMD_VNI_RANGE,
NO_STR NO_STR
"VXLAN Network Identifier\n" "VXLAN Network Identifier\n"
"VNI number\n") "VNI number\n")

4
bgpd/bgp_routemap.c
View File

@ -3438,7 +3438,7 @@ DEFUN (no_match_evpn_route_type,
DEFUN (match_evpn_vni, DEFUN (match_evpn_vni,
match_evpn_vni_cmd, match_evpn_vni_cmd,
"match evpn vni (1-16777215)", "match evpn vni " CMD_VNI_RANGE,
MATCH_STR MATCH_STR
EVPN_HELP_STR EVPN_HELP_STR
"Match VNI\n" "Match VNI\n"
@ -3450,7 +3450,7 @@ DEFUN (match_evpn_vni,
DEFUN (no_match_evpn_vni, DEFUN (no_match_evpn_vni,
no_match_evpn_vni_cmd, no_match_evpn_vni_cmd,
"no match evpn vni (1-16777215)", "no match evpn vni " CMD_VNI_RANGE,
NO_STR NO_STR
MATCH_STR MATCH_STR
EVPN_HELP_STR EVPN_HELP_STR

4
bgpd/bgp_vty.c
View File

@ -824,7 +824,7 @@ DEFUN_HIDDEN (no_bgp_multiple_instance,
DEFUN_HIDDEN (bgp_local_mac, DEFUN_HIDDEN (bgp_local_mac,
bgp_local_mac_cmd, bgp_local_mac_cmd,
"bgp local-mac vni " BGP_CMD_VNI_RANGE " mac WORD seq (0-4294967295)", "bgp local-mac vni " CMD_VNI_RANGE " mac WORD seq (0-4294967295)",
BGP_STR BGP_STR
"Local MAC config\n" "Local MAC config\n"
"VxLAN Network Identifier\n" "VxLAN Network Identifier\n"
@ -866,7 +866,7 @@ DEFUN_HIDDEN (bgp_local_mac,
DEFUN_HIDDEN (no_bgp_local_mac, DEFUN_HIDDEN (no_bgp_local_mac,
no_bgp_local_mac_cmd, no_bgp_local_mac_cmd,
"no bgp local-mac vni " BGP_CMD_VNI_RANGE " mac WORD", "no bgp local-mac vni " CMD_VNI_RANGE " mac WORD",
NO_STR NO_STR
BGP_STR BGP_STR
"Local MAC config\n" "Local MAC config\n"

2
bgpd/bgp_vty.h
View File

@ -44,8 +44,6 @@ struct bgp;
"Address Family modifier\n" \ "Address Family modifier\n" \
"Address Family modifier\n" "Address Family modifier\n"
#define BGP_CMD_VNI_RANGE "(1-16777215)"
extern void bgp_vty_init(void); extern void bgp_vty_init(void);
extern const char *afi_safi_print(afi_t afi, safi_t safi); extern const char *afi_safi_print(afi_t afi, safi_t safi);
extern const char *afi_safi_json(afi_t afi, safi_t safi); extern const char *afi_safi_json(afi_t afi, safi_t safi);

1
lib/command.h
View File

@ -377,6 +377,7 @@ struct cmd_node {
#define WATCHFRR_STR "watchfrr information\n" #define WATCHFRR_STR "watchfrr information\n"
#define ZEBRA_STR "Zebra information\n" #define ZEBRA_STR "Zebra information\n"
#define CMD_VNI_RANGE "(1-16777215)"
#define CONF_BACKUP_EXT ".sav" #define CONF_BACKUP_EXT ".sav"
/* Command warnings. */ /* Command warnings. */

2
vtysh/vtysh.c
View File

@ -1458,7 +1458,7 @@ DEFUNSH_HIDDEN(VTYSH_BGPD, address_family_evpn2, address_family_evpn2_cmd,
} }
#endif #endif
DEFUNSH(VTYSH_BGPD, bgp_evpn_vni, bgp_evpn_vni_cmd, "vni (1-16777215)", DEFUNSH(VTYSH_BGPD, bgp_evpn_vni, bgp_evpn_vni_cmd, "vni " CMD_VNI_RANGE,
"VXLAN Network Identifier\n" "VXLAN Network Identifier\n"
"VNI number\n") "VNI number\n")
{ {

3
zebra/zebra_vty.c
View File

@ -68,9 +68,6 @@ static void vty_show_ip_route_summary(struct vty *vty,
static void vty_show_ip_route_summary_prefix(struct vty *vty, static void vty_show_ip_route_summary_prefix(struct vty *vty,
struct route_table *table); struct route_table *table);
/* VNI range as per RFC 7432 */
#define CMD_VNI_RANGE "(1-16777215)"
DEFUN (ip_multicast_mode, DEFUN (ip_multicast_mode,
ip_multicast_mode_cmd, ip_multicast_mode_cmd,
"ip multicast rpf-lookup-mode <urib-only|mrib-only|mrib-then-urib|lower-distance|longer-prefix>", "ip multicast rpf-lookup-mode <urib-only|mrib-only|mrib-then-urib|lower-distance|longer-prefix>",