proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 18:04:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Disable new EVPN CLI

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-07-14 08:08:52 -04:00
parent aadc090505
commit 8c19712819
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bgpd/bgp_evpn_vty.c
View File

@ -55,6 +55,7 @@ struct evpn_config_write
struct vty *vty; struct vty *vty;
}; };
#if defined (HAVE_CUMULUS)
static void static void
display_import_rt (struct vty *vty, struct irt_node *irt) display_import_rt (struct vty *vty, struct irt_node *irt)
{ {
@ -339,6 +340,7 @@ show_vni_entry (struct hash_backet *backet, struct vty *vty)
} }
vty_out (vty, "%s", VTY_NEWLINE); vty_out (vty, "%s", VTY_NEWLINE);
} }
#endif /* HAVE_CUMULUS */
static int static int
bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd, bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
@ -1020,6 +1022,7 @@ DEFUN(no_evpnrt5_network,
argv[idx_ethtag]->arg); argv[idx_ethtag]->arg);
} }
#if defined(HAVE_CUMULUS)
static void static void
evpn_rt_delete_auto (struct bgp *bgp, struct bgpevpn *vpn, struct list *rtl) evpn_rt_delete_auto (struct bgp *bgp, struct bgpevpn *vpn, struct list *rtl)
{ {
@ -1742,6 +1745,7 @@ evpn_unset_advertise_all_vni (struct bgp *bgp)
bgp_zebra_advertise_all_vni (bgp, bgp->advertise_all_vni); bgp_zebra_advertise_all_vni (bgp, bgp->advertise_all_vni);
bgp_evpn_cleanup_on_disable (bgp); bgp_evpn_cleanup_on_disable (bgp);
} }
#endif /* HAVE_CUMULUS */
static void static void
write_vni_config (struct vty *vty, struct bgpevpn *vpn, int *write) write_vni_config (struct vty *vty, struct bgpevpn *vpn, int *write)
@ -1794,6 +1798,7 @@ write_vni_config_for_entry (struct hash_backet *backet,
write_vni_config (cfg->vty, vpn, &cfg->write); write_vni_config (cfg->vty, vpn, &cfg->write);
} }
#if defined (HAVE_CUMULUS)
DEFUN (bgp_evpn_advertise_all_vni, DEFUN (bgp_evpn_advertise_all_vni,
bgp_evpn_advertise_all_vni_cmd, bgp_evpn_advertise_all_vni_cmd,
"advertise-all-vni", "advertise-all-vni",
@ -2597,7 +2602,7 @@ DEFUN (no_bgp_evpn_vni_rt_without_val,
evpn_unconfigure_export_rt (bgp, vpn, NULL); evpn_unconfigure_export_rt (bgp, vpn, NULL);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
#endif
/* /*
* Output EVPN configuration information. * Output EVPN configuration information.
*/ */
@ -2640,6 +2645,7 @@ void bgp_ethernetvpn_init(void)
install_element(VIEW_NODE, &show_ip_bgp_l2vpn_evpn_all_overlay_cmd); install_element(VIEW_NODE, &show_ip_bgp_l2vpn_evpn_all_overlay_cmd);
install_element(BGP_EVPN_NODE, &no_evpnrt5_network_cmd); install_element(BGP_EVPN_NODE, &no_evpnrt5_network_cmd);
install_element(BGP_EVPN_NODE, &evpnrt5_network_cmd); install_element(BGP_EVPN_NODE, &evpnrt5_network_cmd);
#if defined(HAVE_CUMULUS)
install_element (BGP_EVPN_NODE, &bgp_evpn_advertise_all_vni_cmd); install_element (BGP_EVPN_NODE, &bgp_evpn_advertise_all_vni_cmd);
install_element (BGP_EVPN_NODE, &no_bgp_evpn_advertise_all_vni_cmd); install_element (BGP_EVPN_NODE, &no_bgp_evpn_advertise_all_vni_cmd);
@ -2665,4 +2671,5 @@ void bgp_ethernetvpn_init(void)
install_element (BGP_EVPN_VNI_NODE, &bgp_evpn_vni_rt_cmd); install_element (BGP_EVPN_VNI_NODE, &bgp_evpn_vni_rt_cmd);
install_element (BGP_EVPN_VNI_NODE, &no_bgp_evpn_vni_rt_cmd); install_element (BGP_EVPN_VNI_NODE, &no_bgp_evpn_vni_rt_cmd);
install_element (BGP_EVPN_VNI_NODE, &no_bgp_evpn_vni_rt_without_val_cmd); install_element (BGP_EVPN_VNI_NODE, &no_bgp_evpn_vni_rt_without_val_cmd);
#endif
} }

4
bgpd/bgp_route.c
View File

@ -7209,7 +7209,9 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
{ {
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
char buf1[BUFSIZ]; char buf1[BUFSIZ];
#if defined(HAVE_CUMULUS)
char buf2[EVPN_ROUTE_STRLEN]; char buf2[EVPN_ROUTE_STRLEN];
#endif
struct attr *attr; struct attr *attr;
int sockunion_vty_out (struct vty *, union sockunion *); int sockunion_vty_out (struct vty *, union sockunion *);
time_t tbuf; time_t tbuf;
@ -8293,7 +8295,9 @@ route_vty_out_detail_header (struct vty *vty, struct bgp *bgp,
struct listnode *node, *nnode; struct listnode *node, *nnode;
char buf1[INET6_ADDRSTRLEN]; char buf1[INET6_ADDRSTRLEN];
char buf2[INET6_ADDRSTRLEN]; char buf2[INET6_ADDRSTRLEN];
#if defined(HAVE_CUMULUS)
char buf3[EVPN_ROUTE_STRLEN]; char buf3[EVPN_ROUTE_STRLEN];
#endif
int count = 0; int count = 0;
int best = 0; int best = 0;
int suppress = 0; int suppress = 0;