summaryrefslogtreecommitdiff
path: root/data/templates/frr
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-08 19:38:11 +0100
committerChristian Poessinger <christian@poessinger.com>2021-03-08 19:38:11 +0100
commitab6ef466c128ba48f85b13ba8d4be1476e844726 (patch)
treef55c9e16ae09d7f4088906d1b6c876493ac690c1 /data/templates/frr
parent87bbe75152e3e0625776587c1fd4cd7104319fe1 (diff)
downloadvyos-1x-ab6ef466c128ba48f85b13ba8d4be1476e844726.tar.gz
vyos-1x-ab6ef466c128ba48f85b13ba8d4be1476e844726.zip
bgp: T3391: migrate old IPv4 only maximum-paths config to new syntax
Diffstat (limited to 'data/templates/frr')
-rw-r--r--data/templates/frr/bgp.frr.tmpl27
1 files changed, 4 insertions, 23 deletions
diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index b7abbff5c..3101de7ea 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -208,11 +208,11 @@ router bgp {{ asn }}
aggregate-address {{ ip }}{{ ' as-set' if afi_config.aggregate_address[ip].as_set is defined }}{{ ' summary-only' if afi_config.aggregate_address[ip].summary_only is defined }}
{% endfor %}
{% endif %}
-{% if afi_config.maximum_paths is defined and afi_config.maximum_paths is not none %}
- maximum-paths {{ afi_config.maximum_paths }}
+{% if afi_config.maximum_paths is defined and afi_config.maximum_paths.ebgp is defined and afi_config.maximum_paths.ebgp is not none %}
+ maximum-paths {{ afi_config.maximum_paths.ebgp }}
{% endif %}
-{% if afi_config.maximum_paths_ibgp is defined and afi_config.maximum_paths_ibgp is not none %}
- maximum-paths ibgp {{ afi_config.maximum_paths_ibgp }}
+{% if afi_config.maximum_paths is defined and afi_config.maximum_paths.ibgp is defined and afi_config.maximum_paths.ibgp is not none %}
+ maximum-paths ibgp {{ afi_config.maximum_paths.ibgp }}
{% endif %}
{% if afi_config.redistribute is defined and afi_config.redistribute is not none %}
{% for protocol in afi_config.redistribute %}
@@ -287,25 +287,6 @@ router bgp {{ asn }}
{% endfor %}
{% endif %}
!
-{# set protocols bgp xxxx maximum-paths ibgp x, Generated by default for afi_4 #}
-{# We don't have this parameter in afi_6. But this is supported in FRR #}
-{% if maximum_paths is defined and maximum_paths is not none %}
-{% if maximum_paths.ebgp is defined and maximum_paths.ebgp is not none %}
- !
- address-family ipv4 unicast
- maximum-paths {{ maximum_paths.ebgp }}
- exit-address-family
- !
-{% endif %}
-{% if maximum_paths.ibgp is defined and maximum_paths.ibgp is not none %}
- !
- address-family ipv4 unicast
- maximum-paths ibgp {{ maximum_paths.ibgp }}
- exit-address-family
- !
-{% endif %}
-{% endif %}
- !
{% if peer_group is defined and peer_group is not none %}
{% for peer, config in peer_group.items() %}
{{ bgp_neighbor(peer, config, true) }}