Merge branch 'current' of https://github.com/vyos/vyos-1x into current

7 files changed, 25 insertions, 6 deletions

diff --git a/interface-definitions/include/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface-arp-cache-timeout.xml.i
index 81d35f593..e65321158 100644
--- a/interface-definitions/include/interface-arp-cache-timeout.xml.i
+++ b/interface-definitions/include/interface-arp-cache-timeout.xml.i
@@ -10,4 +10,5 @@
     </constraint>
     <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage>
   </properties>
+  <defaultValue>30</defaultValue>
 </leafNode>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index ddd52979b..7d658f6a0 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -78,6 +78,7 @@
               </constraint>
               <constraintErrorMessage>hash-policy must be layer2 layer2+3 or layer3+4</constraintErrorMessage>
             </properties>
+            <defaultValue>layer2</defaultValue>
           </leafNode>
           <node name="ip">
             <children>
@@ -137,6 +138,7 @@
               </constraint>
               <constraintErrorMessage>mode must be 802.3ad, active-backup, broadcast, round-robin, transmit-load-balance, adaptive-load-balance, or xor</constraintErrorMessage>
             </properties>
+            <defaultValue>802.3ad</defaultValue>
           </leafNode>
           <node name="member">
             <properties>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 6b610e623..92356d696 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -32,6 +32,7 @@
                 <validator name="numeric" argument="--range 0-0 --range 10-1000000"/>
               </constraint>
             </properties>
+            <defaultValue>300</defaultValue>
           </leafNode>
           #include <include/interface-description.xml.i>
           #include <include/dhcp-options.xml.i>
@@ -51,6 +52,7 @@
               </constraint>
               <constraintErrorMessage>Forwarding delay must be between 0 and 200 seconds</constraintErrorMessage>
             </properties>
+            <defaultValue>14</defaultValue>
           </leafNode>
           <leafNode name="hello-time">
             <properties>
@@ -64,6 +66,7 @@
               </constraint>
               <constraintErrorMessage>Bridge Hello interval must be between 1 and 10 seconds</constraintErrorMessage>
             </properties>
+            <defaultValue>2</defaultValue>
           </leafNode>
           <node name="igmp">
             <properties>
@@ -107,6 +110,7 @@
               </constraint>
               <constraintErrorMessage>Bridge max aging value must be between 1 and 40 seconds</constraintErrorMessage>
             </properties>
+            <defaultValue>20</defaultValue>
           </leafNode>
           <node name="member">
             <properties>
@@ -133,6 +137,7 @@
                       </constraint>
                       <constraintErrorMessage>Path cost value must be between 1 and 65535</constraintErrorMessage>
                     </properties>
+                    <defaultValue>100</defaultValue>
                   </leafNode>
                   <leafNode name="priority">
                     <properties>
@@ -146,6 +151,7 @@
                       </constraint>
                       <constraintErrorMessage>Port priority value must be between 0 and 63</constraintErrorMessage>
                     </properties>
+                    <defaultValue>32</defaultValue>
                   </leafNode>
                 </children>
               </tagNode>
@@ -163,6 +169,7 @@
               </constraint>
               <constraintErrorMessage>Bridge priority must be between 0 and 65535 (multiples of 4096)</constraintErrorMessage>
             </properties>
+            <defaultValue>32768</defaultValue>
           </leafNode>
           <leafNode name="stp">
             <properties>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 1e32a15f8..e8f3f09f1 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -56,6 +56,7 @@
               </constraint>
               <constraintErrorMessage>duplex must be auto, half or full</constraintErrorMessage>
             </properties>
+            <defaultValue>auto</defaultValue>
           </leafNode>
           #include <include/interface-hw-id.xml.i>
           <node name="ip">
@@ -265,6 +266,7 @@
               </constraint>
               <constraintErrorMessage>Speed must be auto, 10, 100, 1000, 2500, 5000, 10000, 25000, 40000, 50000 or 100000</constraintErrorMessage>
             </properties>
+            <defaultValue>auto</defaultValue>
           </leafNode>
           #include <include/vif-s.xml.i>
           #include <include/vif.xml.i>
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index 30dd9b604..3a878ad76 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -29,6 +29,7 @@
                 <validator name="numeric" argument="--range 1-65535"/>
               </constraint>
             </properties>
+            <defaultValue>5000</defaultValue>
           </leafNode>
           #include <include/interface-disable.xml.i>
           <leafNode name="encapsulation">
@@ -50,6 +51,7 @@
               </constraint>
               <constraintErrorMessage>Encapsulation must be UDP or IP</constraintErrorMessage>
             </properties>
+            <defaultValue>udp</defaultValue>
           </leafNode>
           <node name="ipv6">
             <children>
@@ -138,6 +140,7 @@
                 <validator name="numeric" argument="--range 1-65535"/>
               </constraint>
             </properties>
+            <defaultValue>5000</defaultValue>
           </leafNode>
           <leafNode name="tunnel-id">
             <properties>
diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in
index d5f9ca661..0ef45e2c2 100644
--- a/interface-definitions/interfaces-pseudo-ethernet.xml.in
+++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in
@@ -70,6 +70,7 @@
               </constraint>
               <constraintErrorMessage>mode must be private, vepa, bridge or passthru</constraintErrorMessage>
             </properties>
+            <defaultValue>private</defaultValue>
           </leafNode>
           #include <include/vif-s.xml.i>
           #include <include/vif.xml.i>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 06c7734f5..6f0ec9e71 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -320,7 +320,7 @@
                     <properties>
                       <help>VHT link adaptation capabilities</help>
                       <completionHelp>
-			<list>unsolicited both</list>
+                        <list>unsolicited both</list>
                       </completionHelp>
                       <valueHelp>
                         <format>unsolicited</format>
@@ -451,6 +451,7 @@
           <leafNode name="disable-broadcast-ssid">
             <properties>
               <help>Disable broadcast of SSID from access-point</help>
+              <valueless/>
             </properties>
           </leafNode>
           #include <include/interface-disable-link-detect.xml.i>
@@ -551,9 +552,10 @@
                 <description>802.11ac - 1300 Mbits/sec</description>
               </valueHelp>
               <constraint>
-                <regex>(a|b|g|n|ac)</regex>
+                <regex>^(a|b|g|n|ac)$</regex>
               </constraint>
             </properties>
+            <defaultValue>g</defaultValue>
           </leafNode>
           <leafNode name="physical-device">
             <properties>
@@ -637,7 +639,7 @@
                         <description>Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]</description>
                       </valueHelp>
                       <constraint>
-                        <regex>(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)</regex>
+                        <regex>^(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)$</regex>
                       </constraint>
                       <constraintErrorMessage>Invalid cipher selection</constraintErrorMessage>
                       <multi/>
@@ -670,7 +672,7 @@
                         <description>Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]</description>
                       </valueHelp>
                       <constraint>
-                        <regex>(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)</regex>
+                        <regex>^(GCMP-256|GCMP|CCMP-256|CCMP|TKIP)$</regex>
                       </constraint>
                       <constraintErrorMessage>Invalid group cipher selection</constraintErrorMessage>
                       <multi/>
@@ -695,7 +697,7 @@
                         <description>Allow both WPA and WPA2</description>
                       </valueHelp>
                       <constraint>
-                        <regex>(wpa|wpa2|both)</regex>
+                        <regex>^(wpa|wpa2|both)$</regex>
                       </constraint>
                       <constraintErrorMessage>Unknown WPA mode</constraintErrorMessage>
                     </properties>
@@ -762,10 +764,11 @@
                 <description>Passively monitor all packets on the frequency/channel</description>
               </valueHelp>
               <constraint>
-                <regex>(access-point|station|monitor)</regex>
+                <regex>^(access-point|station|monitor)$</regex>
               </constraint>
               <constraintErrorMessage>Type must be access-point, station or monitor</constraintErrorMessage>
             </properties>
+            <defaultValue>monitor</defaultValue>
           </leafNode>
           #include <include/vif.xml.i>
           #include <include/vif-s.xml.i>