From a0a88d2dea9710efd80b27b24b4f40b13c613768 Mon Sep 17 00:00:00 2001 From: Cheeze_It Date: Sun, 17 Jan 2021 16:32:45 -0700 Subject: bgp: T1875: Adding BGP listen range FRR feature In this commit we are adding the FRR BGP listen range feature. Specifically it is useful for being able to specify a range in which BGP peers can connect to the local router. --- data/templates/frr/bgp.frr.tmpl | 10 +++++++++ interface-definitions/protocols-bgp.xml.in | 34 ++++++++++++++++++++++++++++++ src/conf_mode/protocols_bgp.py | 10 +++++++-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl index 74a9b8c30..b3aa8fe02 100644 --- a/data/templates/frr/bgp.frr.tmpl +++ b/data/templates/frr/bgp.frr.tmpl @@ -203,6 +203,16 @@ router bgp {{ asn }} {% endfor %} {% endif %} ! +{% if listen is defined %} +{% if listen.limit is defined and listen.limit is not none %} + bgp listen limit {{ listen.limit }} +{% endif %} +{% for prefix, options in listen.range.items() %} +{% if options.peer_group is defined and options.peer_group is not none %} + bgp listen range {{ prefix }} peer-group {{ options.peer_group }} +{% endif %} +{% endfor %} +{% endif %} {% if parameters is defined %} {% if parameters.always_compare_med is defined %} bgp always-compare-med diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in index 61bc6ce86..96fd74db7 100644 --- a/interface-definitions/protocols-bgp.xml.in +++ b/interface-definitions/protocols-bgp.xml.in @@ -250,6 +250,40 @@ + + + Listen for and accept BGP dynamic neighbors from range + + + + + Maximum number of dynamic neighbors that can be created + + u32:1-5000 + BGP neighbor limit + + + + + + + + + IPv4/IPv6 prefix range + + <x.x.x.x/x> <h:h:h:h:h:h:h:h/h> + + + + + + + + #include + + + + BGP neighbor diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py index de0148b2f..f8e34285e 100755 --- a/src/conf_mode/protocols_bgp.py +++ b/src/conf_mode/protocols_bgp.py @@ -94,7 +94,7 @@ def verify(bgp): if tmp not in afi_config['prefix_list']: # bail out early continue - # get_config_dict() mangles all '-' characters to '_' this is legitim, thus all our + # get_config_dict() mangles all '-' characters to '_' this is legitimate, thus all our # compares will run on '_' as also '_' is a valid name for a prefix-list prefix_list = afi_config['prefix_list'][tmp].replace('-', '_') if afi == 'ipv4_unicast': @@ -112,7 +112,13 @@ def verify(bgp): route_map = afi_config['route_map'][tmp].replace('-', '_') if dict_search(f'policy.route_map.{route_map}', asn_config) == None: raise ConfigError(f'route-map "{route_map}" used for "{tmp}" does not exist!') - + + # Throw an error if a peer group is not configured for allow range + if 'listen' in asn_config: + if 'range' in asn_config['listen']: + for prefix in asn_config['listen']['range']: + if not 'peer_group' in asn_config['listen']['range'].get(prefix): + raise ConfigError(f'Listen range for prefix "{prefix}" has no peer group configured.') return None -- cgit v1.2.3