From ab6ef466c128ba48f85b13ba8d4be1476e844726 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 8 Mar 2021 19:38:11 +0100
Subject: bgp: T3391: migrate old IPv4 only maximum-paths config to new syntax

---
 data/templates/frr/bgp.frr.tmpl | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'data')

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 %}
@@ -285,25 +285,6 @@ router bgp {{ asn }}
 {%     endif %}
  exit-address-family
 {%   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 %}
-- 
cgit v1.2.3