From 2b05ac9e341369ee051f3797bf5b8ecce0c22af7 Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Mon, 7 Aug 2023 16:59:35 +0000
Subject: T5446: BGP: change <bgp paramater bestpath med> from node to
 leafNode, in order to avoid empty value and problems when removing such
 parameters

---
 data/templates/frr/bgpd.frr.j2                     |  2 +-
 .../include/bgp/protocol-common-config.xml.i       | 33 +++++++++++-----------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/data/templates/frr/bgpd.frr.j2 b/data/templates/frr/bgpd.frr.j2
index ddfba2306..4535758da 100644
--- a/data/templates/frr/bgpd.frr.j2
+++ b/data/templates/frr/bgpd.frr.j2
@@ -481,7 +481,7 @@ router bgp {{ system_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
  bgp bestpath compare-routerid
 {% endif %}
 {% if parameters.bestpath.med is vyos_defined %}
- bgp bestpath med {{ 'confed' if parameters.bestpath.med.confed is vyos_defined }} {{ 'missing-as-worst' if parameters.bestpath.med.missing_as_worst is vyos_defined }}
+ bgp bestpath med {{ parameters.bestpath.med | join(' ') | replace('_', '-') }}
 {% endif %}
 {% if parameters.bestpath.peer_type is vyos_defined %}
  bgp bestpath peer-type {{ 'multipath-relax' if parameters.bestpath.peer_type.multipath_relax is vyos_defined }}
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 12024ed8b..504385b53 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1123,25 +1123,26 @@
             <valueless/>
           </properties>
         </leafNode>
-        <node name="med">
+        <leafNode name="med">
           <properties>
             <help>MED attribute comparison parameters</help>
+            <completionHelp>
+              <list>confed missing-as-worst</list>
+            </completionHelp>
+            <valueHelp>
+              <format>confed</format>
+              <description>Compare MEDs among confederation paths</description>
+            </valueHelp>
+            <valueHelp>
+              <format>missing-as-worst</format>
+              <description>Treat missing route as a MED as the least preferred one</description>
+            </valueHelp>
+            <constraint>
+              <regex>(confed|missing-as-worst)</regex>
+            </constraint>
+            <multi/>
           </properties>
-          <children>
-            <leafNode name="confed">
-              <properties>
-                <help>Compare MEDs among confederation paths</help>
-                <valueless/>
-              </properties>
-            </leafNode>
-            <leafNode name="missing-as-worst">
-              <properties>
-                <help>Treat missing route as a MED as the least preferred one</help>
-                <valueless/>
-              </properties>
-            </leafNode>
-          </children>
-        </node>
+        </leafNode>
         <node name="peer-type">
           <properties>
             <help>Peer type</help>
-- 
cgit v1.2.3