From d98e01da6b1805e8e1d53f631ea6f4ea46d0d218 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 15 Nov 2020 10:35:39 +0100
Subject: tunnel: T3072: migrate to get_config_dict()

---
 interface-definitions/interfaces-tunnel.xml.in | 36 ++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index c3f178d59..bf588a075 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -112,36 +112,40 @@
             <properties>
               <help>Encapsulation of this tunnel interface</help>
               <completionHelp>
-                <list>gre gre-bridge ipip sit ipip6 ip6ip6 ip6gre</list>
+                <list>gre gre-bridge ip6gre ip6ip6 ipip ipip6 sit</list>
               </completionHelp>
+              <valueHelp>
+                <format>gre</format>
+                <description>Generic Routing Encapsulation</description>
+              </valueHelp>
               <valueHelp>
                 <format>gre-bridge</format>
                 <description>Generic Routing Encapsulation bridge interface</description>
               </valueHelp>
               <valueHelp>
-                <format>ipip</format>
-                <description>IP in IP encapsulation</description>
+                <format>ip6gre</format>
+                <description>GRE over IPv6 network</description>
               </valueHelp>
               <valueHelp>
-                <format>sit</format>
-                <description>Simple Internet Transition encapsulation</description>
+                <format>ip6ip6</format>
+                <description>IP6 in IP6 encapsulation</description>
               </valueHelp>
               <valueHelp>
-                <format>ipip6</format>
-                <description>IP in IP6 encapsulation</description>
+                <format>ipip</format>
+                <description>IP in IP encapsulation</description>
               </valueHelp>
               <valueHelp>
-                <format>ip6ip6</format>
-                <description>IP6 in IP6 encapsulation</description>
+                <format>ipip6</format>
+                <description>IP in IP6 encapsulation</description>
               </valueHelp>
               <valueHelp>
-                <format>ip6gre</format>
-                <description>GRE over IPv6 network</description>
+                <format>sit</format>
+                <description>Simple Internet Transition encapsulation</description>
               </valueHelp>
               <constraint>
-                <regex>(gre|gre-bridge|ipip|sit|ipip6|ip6ip6|ip6gre)</regex>
+                <regex>^(gre|gre-bridge|ip6gre|ip6ip6|ipip|ipip6|sit)$</regex>
               </constraint>
-              <constraintErrorMessage>Must be one of 'gre' 'gre-bridge' 'ipip' 'sit' 'ipip6' 'ip6ip6' 'ip6gre'</constraintErrorMessage>
+              <constraintErrorMessage>Invalid encapsulation mode, must be one of: gre gre-bridge ip6gre ip6ip6 ipip ipip6 sit</constraintErrorMessage>
             </properties>
           </leafNode>
           <leafNode name="multicast">
@@ -186,6 +190,7 @@
                       </constraint>
                       <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
                     </properties>
+                    <defaultValue>255</defaultValue>
                   </leafNode>
                   <leafNode name="tos">
                     <properties>
@@ -199,6 +204,7 @@
                       </constraint>
                       <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
                     </properties>
+                    <defaultValue>inherit</defaultValue>
                   </leafNode>
                   <leafNode name="key">
                     <properties>
@@ -232,6 +238,7 @@
                       </constraint>
                       <constraintErrorMessage>key must be between 0-255</constraintErrorMessage>
                     </properties>
+                    <defaultValue>4</defaultValue>
                   </leafNode>
                   <leafNode name="flowlabel">
                     <properties>
@@ -245,6 +252,7 @@
                       </constraint>
                       <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
                     </properties>
+                    <defaultValue>inherit</defaultValue>
                   </leafNode>
                   <leafNode name="hoplimit">
                     <properties>
@@ -258,6 +266,7 @@
                       </constraint>
                       <constraintErrorMessage>hoplimit must be between 0-255</constraintErrorMessage>
                     </properties>
+                    <defaultValue>64</defaultValue>
                   </leafNode>
                   <leafNode name="tclass">
                     <properties>
@@ -271,6 +280,7 @@
                       </constraint>
                       <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
                     </properties>
+                    <defaultValue>inherit</defaultValue>
                   </leafNode>
                 </children>
               </node>
-- 
cgit v1.2.3


From 246808bc33a2343827ab2b4d76ae449fcc549ac9 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 20 Nov 2020 12:22:44 +0100
Subject: tunnel: T3072: xml: harden regex validators

---
 interface-definitions/interfaces-tunnel.xml.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index bf588a075..b322374b3 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -39,7 +39,6 @@
                 <script>${vyos_completion_dir}/list_local.py</script>
               </completionHelp>
               <constraint>
-                <!-- does it need fixing/changing to be more restrictive ? -->
                 <validator name="ip-address"/>
               </constraint>
             </properties>
@@ -104,7 +103,7 @@
                 <script>${vyos_completion_dir}/list_interfaces.py</script>
               </completionHelp>
               <constraint>
-                <regex>(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+</regex>
+                <regex>^(en|eth|br|bond|gnv|vxlan|wg|tun)[0-9]+$</regex>
               </constraint>
             </properties>
           </leafNode>
@@ -145,7 +144,7 @@
               <constraint>
                 <regex>^(gre|gre-bridge|ip6gre|ip6ip6|ipip|ipip6|sit)$</regex>
               </constraint>
-              <constraintErrorMessage>Invalid encapsulation mode, must be one of: gre gre-bridge ip6gre ip6ip6 ipip ipip6 sit</constraintErrorMessage>
+              <constraintErrorMessage>Invalid encapsulation, must be one of: gre, gre-bridge, ipip, sit, ipip6, ip6ip6, ip6gre</constraintErrorMessage>
             </properties>
           </leafNode>
           <leafNode name="multicast">
@@ -163,7 +162,7 @@
                 <description>Disable Multicast (default)</description>
               </valueHelp>
               <constraint>
-                <regex>(enable|disable)</regex>
+                <regex>^(enable|disable)$</regex>
               </constraint>
               <constraintErrorMessage>Must be 'disable' or 'enable'</constraintErrorMessage>
             </properties>
-- 
cgit v1.2.3