From 7f4a51cf6b5c7803040f84fa92b27ea322fa4b83 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 30 Apr 2020 17:01:10 +0300 Subject: [PATCH] bgpd: Make sure network/aggregate-address commands lay down under labeled safi unicast and labeled-unicast share the same table, but configuration should be visible for both independently. Without this fix it confuses a bit because when you enter `network 10.0.0.0/24` under labeled-unicast it's written in unicast family block. Signed-off-by: Donatas Abraitis --- bgpd/bgp_route.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index f4df038201..aa0e4934db 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -12786,6 +12786,12 @@ void bgp_route_init(void) install_element(BGP_IPV4M_NODE, &no_aggregate_address_mask_cmd); /* IPv4 labeled-unicast configuration. */ + install_element(BGP_IPV4L_NODE, &bgp_network_cmd); + install_element(BGP_IPV4L_NODE, &aggregate_address_cmd); + install_element(BGP_IPV4L_NODE, &aggregate_address_mask_cmd); + install_element(BGP_IPV4L_NODE, &no_aggregate_address_cmd); + install_element(BGP_IPV4L_NODE, &no_aggregate_address_mask_cmd); + install_element(VIEW_NODE, &show_ip_bgp_instance_all_cmd); install_element(VIEW_NODE, &show_ip_bgp_cmd); install_element(VIEW_NODE, &show_ip_bgp_json_cmd); @@ -12829,6 +12835,11 @@ void bgp_route_init(void) install_element(BGP_IPV6M_NODE, &ipv6_bgp_network_cmd); + /* IPv6 labeled unicast address family. */ + install_element(BGP_IPV6L_NODE, &ipv6_bgp_network_cmd); + install_element(BGP_IPV6L_NODE, &ipv6_aggregate_address_cmd); + install_element(BGP_IPV6L_NODE, &no_ipv6_aggregate_address_cmd); + install_element(BGP_NODE, &bgp_distance_cmd); install_element(BGP_NODE, &no_bgp_distance_cmd); install_element(BGP_NODE, &bgp_distance_source_cmd); -- 2.39.5