From ef8efbd468ad6490db12ec219e0940b204fcce76 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 22 May 2021 17:55:38 +0200
Subject: bgp: T3565: support multiple AS numbers for confederation peers

The BGP confederation peers node was not a multi node as supported by VyOS 1.2
and 1.3.
---
 data/templates/frr/bgpd.frr.tmpl                               | 2 +-
 interface-definitions/include/bgp/protocol-common-config.xml.i | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/templates/frr/bgpd.frr.tmpl b/data/templates/frr/bgpd.frr.tmpl
index 5edd3f97d..99d80e776 100644
--- a/data/templates/frr/bgpd.frr.tmpl
+++ b/data/templates/frr/bgpd.frr.tmpl
@@ -420,7 +420,7 @@ router bgp {{ local_as }} {{ 'vrf ' ~ vrf if vrf is defined and vrf is not none
  bgp confederation identifier {{ parameters.confederation.identifier }}
 {%     endif %}
 {%     if parameters.confederation.peers is defined and parameters.confederation.peers is not none %}
- bgp confederation peers {{ parameters.confederation.peers }}
+ bgp confederation peers {{ parameters.confederation.peers | join(' ') }}
 {%     endif %}
 {%   endif %}
 {%   if parameters.dampening is defined and parameters.dampening is defined and parameters.dampening.half_life is defined and parameters.dampening.half_life is not none %}
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index e6b81ceb1..78a4fb763 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1180,6 +1180,7 @@
             <constraint>
               <validator name="numeric" argument="--range 1-4294967294"/>
             </constraint>
+            <multi/>
           </properties>
         </leafNode>
       </children>
-- 
cgit v1.2.3