From cccda3a0768680d1920e408afd44d96855a64e61 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 22 Aug 2021 09:52:04 +0200
Subject: xml: remove superfluous "interface" prefix from interface includes

(cherry picked from commit 0a8a0188033d6b27c521f082fdddae9873dd5d3d)
---
 interface-definitions/interfaces-bonding.xml.in | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'interface-definitions/interfaces-bonding.xml.in')

diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 6c5e2abcc..c63453588 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -49,13 +49,13 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           #include <include/interface/dhcp-options.xml.i>
           #include <include/interface/dhcpv6-options.xml.i>
-          #include <include/interface/interface-disable-link-detect.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
-          #include <include/interface/interface-mirror.xml.i>
+          #include <include/interface/disable-link-detect.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/vrf.xml.i>
+          #include <include/interface/mirror.xml.i>
           <leafNode name="hash-policy">
             <properties>
               <help>Bonding transmit hash policy</help>
@@ -89,9 +89,9 @@
             </properties>
             <defaultValue>layer2</defaultValue>
           </leafNode>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
-          #include <include/interface/interface-mac.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
+          #include <include/interface/mac.xml.i>
           <leafNode name="min-links">
             <properties>
               <help>Minimum number of member interfaces required up before enabling bond</help>
@@ -182,7 +182,7 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/mtu-68-16000.xml.i>
           <leafNode name="primary">
             <properties>
               <help>Primary device interface</help>
-- 
cgit v1.2.3


From a9e8e45dff3c37b8cfbbc52629329d78488e114d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 7 Nov 2021 16:44:53 +0100
Subject: bonding: T1614: add constraint on member interface names to be used

(cherry picked from commit a4cf71912d52de4398273405b5682d8da5e1dbe3)
---
 interface-definitions/interfaces-bonding.xml.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'interface-definitions/interfaces-bonding.xml.in')

diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index c63453588..5a4f08bef 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -177,6 +177,13 @@
                   <completionHelp>
                     <script>${vyos_completion_dir}/list_interfaces.py --bondable</script>
                   </completionHelp>
+                  <valueHelp>
+                    <format>txt</format>
+                    <description>Interface name</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="interface-name"/>
+                  </constraint>
                   <multi/>
                 </properties>
               </leafNode>
@@ -189,6 +196,13 @@
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py --bondable</script>
               </completionHelp>
+              <valueHelp>
+                <format>txt</format>
+                <description>Interface name</description>
+              </valueHelp>
+              <constraint>
+                <validator name="interface-name"/>
+              </constraint>
             </properties>
           </leafNode>
           #include <include/interface/vif-s.xml.i>
-- 
cgit v1.2.3