bgpd: evpn nexthop can be changed by default

There can be cases where evpn traffic is not meshed across various
endpoints, but sent to a central pe. For this situation, remove the
nexthop unchanged default behaviour for bgp evpn. Also add route
reflector commands to bgp evpn node.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 9890a3f0719b57dc77661f3ff3b5b3755a4ce0e7..51a9684235e676810b09034bdacee3526b9fea54 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -16234,6 +16234,10 @@ void bgp_vty_init(void)
                        &no_neighbor_route_reflector_client_cmd);
        install_element(BGP_EVPN_NODE, &neighbor_route_reflector_client_cmd);
        install_element(BGP_EVPN_NODE, &no_neighbor_route_reflector_client_cmd);
+       install_element(BGP_EVPN_NODE, &neighbor_nexthop_self_cmd);
+       install_element(BGP_EVPN_NODE, &no_neighbor_nexthop_self_cmd);
+       install_element(BGP_EVPN_NODE, &neighbor_nexthop_self_force_cmd);
+       install_element(BGP_EVPN_NODE, &no_neighbor_nexthop_self_force_cmd);
 
        /* "neighbor route-server" commands.*/
        install_element(BGP_NODE, &neighbor_route_server_client_hidden_cmd);

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index cf6335d3734965de8002760f4f9a67d0ad4714ae..faee7dad4a166013460dec05028256f10505f867 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1227,10 +1227,6 @@ struct peer *peer_new(struct bgp *bgp)
                peer->addpath_type[afi][safi] = BGP_ADDPATH_NONE;
        }
 
-       /* set nexthop-unchanged for l2vpn evpn by default */
-       SET_FLAG(peer->af_flags[AFI_L2VPN][SAFI_EVPN],
-                PEER_FLAG_NEXTHOP_UNCHANGED);
-
        SET_FLAG(peer->sflags, PEER_STATUS_CAPABILITY_OPEN);
 
        /* Initialize per peer bgp GR FSM */