Merge branch 'current' into current

74 files changed, 352 insertions, 199 deletions

diff --git a/interface-definitions/bcast-relay.xml.in b/interface-definitions/bcast-relay.xml.in
index aeaa5ab37..e2993f3f3 100644
--- a/interface-definitions/bcast-relay.xml.in
+++ b/interface-definitions/bcast-relay.xml.in
@@ -34,11 +34,7 @@
                   </constraint>
                 </properties>
               </leafNode>
-              <leafNode name="description">
-                <properties>
-                  <help>Description</help>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               #include <include/generic-interface-multi.xml.i>
               #include <include/port-number.xml.i>
             </children>
diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in
index 6947ed500..9b6d2369d 100644
--- a/interface-definitions/container.xml.in
+++ b/interface-definitions/container.xml.in
@@ -117,7 +117,7 @@
             <properties>
               <help>Container host name</help>
               <constraint>
-                #include <include/constraint/host-name.xml.in>
+                #include <include/constraint/host-name.xml.i>
               </constraint>
               <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage>
             </properties>
@@ -191,15 +191,20 @@
             <children>
               <leafNode name="address">
                 <properties>
-                  <!-- PODMAN currently does not support more then one IPv4 or IPv6 address assignments to a container -->
                   <help>Assign static IP address to container</help>
                   <valueHelp>
                     <format>ipv4</format>
                     <description>IPv4 address</description>
                   </valueHelp>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>IPv6 address</description>
+                  </valueHelp>
                   <constraint>
                     <validator name="ipv4-address"/>
+                    <validator name="ipv6-address"/>
                   </constraint>
+                  <multi/>
                 </properties>
               </leafNode>
             </children>
@@ -343,11 +348,7 @@
           <constraintErrorMessage>Network name cannot be longer than 11 characters</constraintErrorMessage>
         </properties>
         <children>
-          <leafNode name="description">
-            <properties>
-              <help>Network description</help>
-            </properties>
-          </leafNode>
+          #include <include/generic-description.xml.i>
           <leafNode name="prefix">
             <properties>
               <help>Prefix which allocated to that network</help>
@@ -366,6 +367,7 @@
               <multi/>
             </properties>
           </leafNode>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
       <tagNode name="registry">
diff --git a/interface-definitions/dhcp-relay.xml.in b/interface-definitions/dhcp-relay.xml.in
index 79ad2c01c..2a2597dd5 100644
--- a/interface-definitions/dhcp-relay.xml.in
+++ b/interface-definitions/dhcp-relay.xml.in
@@ -21,7 +21,7 @@
                 <description>Interface name</description>
               </valueHelp>
               <constraint>
-                #include <include/constraint/interface-name.xml.in>
+                #include <include/constraint/interface-name.xml.i>
               </constraint>
               <multi/>
             </properties>
@@ -37,7 +37,7 @@
                 <description>Interface name</description>
               </valueHelp>
               <constraint>
-                #include <include/constraint/interface-name.xml.in>
+                #include <include/constraint/interface-name.xml.i>
               </constraint>
               <multi/>
             </properties>
diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in
index c0ac16a80..e93c49ebd 100644
--- a/interface-definitions/dns-domain-name.xml.in
+++ b/interface-definitions/dns-domain-name.xml.in
@@ -25,7 +25,7 @@
           <constraint>
             <validator name="ipv4-address"/>
             <validator name="ipv6-address"/>
-            #include <include/constraint/interface-name.xml.in>
+            #include <include/constraint/interface-name.xml.i>
           </constraint>
         </properties>
       </leafNode>
@@ -34,7 +34,7 @@
         <properties>
           <help>System host name (default: vyos)</help>
           <constraint>
-            #include <include/constraint/host-name.xml.in>
+            #include <include/constraint/host-name.xml.i>
           </constraint>
         </properties>
       </leafNode>
diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in
index 14b38b24d..6b7344b1d 100644
--- a/interface-definitions/dns-forwarding.xml.in
+++ b/interface-definitions/dns-forwarding.xml.in
@@ -83,6 +83,13 @@
               <tagNode name="domain">
                 <properties>
                   <help>Domain to forward to a custom DNS server</help>
+                  <valueHelp>
+                    <format>txt</format>
+                    <description>An absolute DNS domain name</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="fqdn"/>
+                  </constraint>
                 </properties>
                 <children>
                   #include <include/name-server-ipv4-ipv6-port.xml.i>
@@ -104,11 +111,11 @@
                 <properties>
                   <help>Domain to host authoritative records for</help>
                   <valueHelp>
-                    <format>text</format>
-                    <description>An absolute DNS name</description>
+                    <format>txt</format>
+                    <description>An absolute DNS domain name</description>
                   </valueHelp>
                   <constraint>
-                    <regex>[-_a-zA-Z0-9.]{1,63}</regex>
+                    <validator name="fqdn"/>
                   </constraint>
                 </properties>
                 <children>
@@ -121,7 +128,7 @@
                         <properties>
                           <help>"A" record</help>
                           <valueHelp>
-                            <format>text</format>
+                            <format>txt</format>
                             <description>A DNS name relative to the root record</description>
                           </valueHelp>
                           <valueHelp>
@@ -158,7 +165,7 @@
                         <properties>
                           <help>"AAAA" record</help>
                           <valueHelp>
-                            <format>text</format>
+                            <format>txt</format>
                             <description>A DNS name relative to the root record</description>
                           </valueHelp>
                           <valueHelp>
@@ -195,7 +202,7 @@
                         <properties>
                           <help>"CNAME" record</help>
                           <valueHelp>
-                            <format>text</format>
+                            <format>txt</format>
                             <description>A DNS name relative to the root record</description>
                           </valueHelp>
                           <valueHelp>
@@ -227,7 +234,7 @@
                         <properties>
                           <help>"MX" record</help>
                           <valueHelp>
-                            <format>text</format>
+                            <format>txt</format>
                             <description>A DNS name relative to the root record</description>
                           </valueHelp>
                           <valueHelp>
@@ -274,7 +281,7 @@
                         <properties>
                           <help>"PTR" record</help>
                           <valueHelp>
-                            <format>text</format>
+                            <format>txt</format>
                             <description>A DNS name relative to the root record</description>
                           </valueHelp>
                           <valueHelp>
@@ -306,7 +313,7 @@
                         <properties>
                           <help>"TXT" record</help>
                           <valueHelp>
-                            <format>text</format>
+                            <format>txt</format>
                             <description>A DNS name relative to the root record</description>
                           </valueHelp>
                           <valueHelp>
@@ -322,7 +329,7 @@
                             <properties>
                               <help>Record contents</help>
                               <valueHelp>
-                                <format>text</format>
+                                <format>txt</format>
                                 <description>Record contents</description>
                               </valueHelp>
                               <multi/>
@@ -336,7 +343,7 @@
                         <properties>
                           <help>"SPF" record (type=SPF)</help>
                           <valueHelp>
-                            <format>text</format>
+                            <format>txt</format>
                             <description>A DNS name relative to the root record</description>
                           </valueHelp>
                           <valueHelp>
@@ -352,7 +359,7 @@
                             <properties>
                               <help>Record contents</help>
                               <valueHelp>
-                                <format>text</format>
+                                <format>txt</format>
                                 <description>Record contents</description>
                               </valueHelp>
                             </properties>
@@ -365,7 +372,7 @@
                         <properties>
                           <help>"SRV" record</help>
                           <valueHelp>
-                            <format>text</format>
+                            <format>txt</format>
                             <description>A DNS name relative to the root record</description>
                           </valueHelp>
                           <valueHelp>
@@ -449,7 +456,7 @@
                         <properties>
                           <help>"NAPTR" record</help>
                           <valueHelp>
-                            <format>text</format>
+                            <format>txt</format>
                             <description>A DNS name relative to the root record</description>
                           </valueHelp>
                           <valueHelp>
diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in
index 624d61759..69901e5d3 100644
--- a/interface-definitions/firewall.xml.in
+++ b/interface-definitions/firewall.xml.in
@@ -349,6 +349,9 @@
           <completionHelp>
             <script>${vyos_completion_dir}/list_interfaces</script>
           </completionHelp>
+          <constraint>
+            #include <include/constraint/interface-name-with-wildcard.xml.i>
+          </constraint>
         </properties>
         <children>
           <node name="in">
diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in
index 1fa051df9..ce6603796 100644
--- a/interface-definitions/high-availability.xml.in
+++ b/interface-definitions/high-availability.xml.in
@@ -220,7 +220,7 @@
                         <description>Interface name</description>
                       </valueHelp>
                       <constraint>
-                        #include <include/constraint/interface-name.xml.in>
+                        #include <include/constraint/interface-name.xml.i>
                       </constraint>
                       <multi/>
                     </properties>
diff --git a/interface-definitions/https.xml.in b/interface-definitions/https.xml.in
index 6adb07598..cf30ab2be 100644
--- a/interface-definitions/https.xml.in
+++ b/interface-definitions/https.xml.in
@@ -60,6 +60,7 @@
                   <multi/>
                 </properties>
               </leafNode>
+              #include <include/allow-client.xml.i>
             </children>
           </tagNode>
           <node name="api" owner="${vyos_conf_scripts_dir}/http-api.py">
diff --git a/interface-definitions/include/allow-client.xml.i b/interface-definitions/include/allow-client.xml.i
new file mode 100644
index 000000000..1b06e2c17
--- /dev/null
+++ b/interface-definitions/include/allow-client.xml.i
@@ -0,0 +1,35 @@
+<!-- include start from allow-client.xml.i -->
+<node name="allow-client">
+  <properties>
+    <help>Restrict to allowed IP client addresses</help>
+  </properties>
+  <children>
+    <leafNode name="address">
+      <properties>
+        <help>Allowed IP client addresses</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>IPv4 address</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv6</format>
+          <description>IPv6 address</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv4net</format>
+          <description>IPv4 address and prefix length</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv6net</format>
+          <description>IPv6 address and prefix length</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ip-address"/>
+          <validator name="ip-cidr"/>
+        </constraint>
+        <multi/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/babel/interface.xml.i b/interface-definitions/include/babel/interface.xml.i
index 586eca7a5..a122ef024 100644
--- a/interface-definitions/include/babel/interface.xml.i
+++ b/interface-definitions/include/babel/interface.xml.i
@@ -10,7 +10,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
   <children>
diff --git a/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
index ee902b0b6..0f760daae 100644
--- a/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
@@ -15,7 +15,7 @@
           <description>Name of IPv4 prefix-list</description>
         </valueHelp>
         <constraint>
-          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
         </constraint>
         <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
@@ -31,7 +31,7 @@
           <description>Name of IPv4 prefix-list</description>
         </valueHelp>
         <constraint>
-          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
         </constraint>
         <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
diff --git a/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
index da966f193..268d9cbc0 100644
--- a/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
@@ -15,7 +15,7 @@
           <description>Name of IPv6 prefix-list</description>
         </valueHelp>
         <constraint>
-          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
         </constraint>
         <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
@@ -31,7 +31,7 @@
           <description>Name of IPv6 prefix-list</description>
         </valueHelp>
         <constraint>
-          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
         </constraint>
         <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
diff --git a/interface-definitions/include/bgp/neighbor-update-source.xml.i b/interface-definitions/include/bgp/neighbor-update-source.xml.i
index 0acec4126..c6aa776c2 100644
--- a/interface-definitions/include/bgp/neighbor-update-source.xml.i
+++ b/interface-definitions/include/bgp/neighbor-update-source.xml.i
@@ -22,7 +22,7 @@
     <constraint>
       <validator name="ipv4-address"/>
       <validator name="ipv6-address"/>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 089c36ef3..bcc131f83 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -810,12 +810,6 @@
             </node>
           </children>
         </node>
-        <leafNode name="advertise-all-vni">
-          <properties>
-            <help>Advertise All local VNIs</help>
-            <valueless/>
-          </properties>
-        </leafNode>
         #include <include/bgp/afi-l2vpn-common.xml.i>
         <leafNode name="advertise-pip">
           <properties>
@@ -942,7 +936,7 @@
     <constraint>
       <validator name="ipv4-address"/>
       <validator name="ipv6-address"/>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
   <children>
@@ -1530,7 +1524,7 @@
   <properties>
     <help>Name of peer-group</help>
     <constraint>
-      #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+      #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
     </constraint>
   </properties>
   <children>
@@ -1565,7 +1559,6 @@
     #include <include/port-number.xml.i>
   </children>
 </tagNode>
-#include <include/route-map.xml.i>
 <node name="timers">
   <properties>
     <help>BGP protocol timers</help>
diff --git a/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore.xml.in b/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore.xml.i
index eb568d7d9..eb568d7d9 100644
--- a/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore.xml.in
+++ b/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore.xml.i
diff --git a/interface-definitions/include/constraint/host-name.xml.in b/interface-definitions/include/constraint/host-name.xml.i
index 202c200f4..202c200f4 100644
--- a/interface-definitions/include/constraint/host-name.xml.in
+++ b/interface-definitions/include/constraint/host-name.xml.i
diff --git a/interface-definitions/include/constraint/interface-name-with-wildcard.xml.i b/interface-definitions/include/constraint/interface-name-with-wildcard.xml.i
new file mode 100644
index 000000000..09867b380
--- /dev/null
+++ b/interface-definitions/include/constraint/interface-name-with-wildcard.xml.i
@@ -0,0 +1,4 @@
+<!-- include start from constraint/interface-name-with-wildcard.xml.in -->
+<regex>(bond|br|dum|en|ersp|eth|gnv|ifb|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|tun|veth|vti|vtun|vxlan|wg|wlan|wwan)([0-9]?)(\*?)(.+)?|lo</regex>
+<validator name="file-path --lookup-path /sys/class/net --directory"/>
+<!-- include end -->
diff --git a/interface-definitions/include/constraint/interface-name.xml.in b/interface-definitions/include/constraint/interface-name.xml.i
index e540e4418..e540e4418 100644
--- a/interface-definitions/include/constraint/interface-name.xml.in
+++ b/interface-definitions/include/constraint/interface-name.xml.i
diff --git a/interface-definitions/include/dhcp-interface-multi.xml.i b/interface-definitions/include/dhcp-interface-multi.xml.i
index e10341037..0db11cf79 100644
--- a/interface-definitions/include/dhcp-interface-multi.xml.i
+++ b/interface-definitions/include/dhcp-interface-multi.xml.i
@@ -10,7 +10,7 @@
       <description>DHCP interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
     <multi/>
   </properties>
diff --git a/interface-definitions/include/dhcp-interface.xml.i b/interface-definitions/include/dhcp-interface.xml.i
index 24edbbd15..b5c94cb24 100644
--- a/interface-definitions/include/dhcp-interface.xml.i
+++ b/interface-definitions/include/dhcp-interface.xml.i
@@ -9,7 +9,7 @@
           <description>DHCP interface name</description>
         </valueHelp>
         <constraint>
-          #include <include/constraint/interface-name.xml.in>
+          #include <include/constraint/interface-name.xml.i>
         </constraint>
       </properties>
     </leafNode>
diff --git a/interface-definitions/include/eigrp/protocol-common-config.xml.i b/interface-definitions/include/eigrp/protocol-common-config.xml.i
index 88365187a..a21d18424 100644
--- a/interface-definitions/include/eigrp/protocol-common-config.xml.i
+++ b/interface-definitions/include/eigrp/protocol-common-config.xml.i
@@ -107,7 +107,6 @@
     <multi/>
   </properties>
 </leafNode>
-#include <include/route-map.xml.i>
 #include <include/router-id.xml.i>
 <!-- FRR timers not implemented yet -->
 <leafNode name="variance">
diff --git a/interface-definitions/include/generic-interface-broadcast.xml.i b/interface-definitions/include/generic-interface-broadcast.xml.i
index 82bfc139b..e37e75012 100644
--- a/interface-definitions/include/generic-interface-broadcast.xml.i
+++ b/interface-definitions/include/generic-interface-broadcast.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from generic-interface-broadcast.xml.i -->
 <leafNode name="interface">
   <properties>
-    <help>Interface Name to use</help>
+    <help>Interface to use</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
     </completionHelp>
@@ -10,7 +10,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/generic-interface-multi-broadcast.xml.i b/interface-definitions/include/generic-interface-multi-broadcast.xml.i
index 8160f816d..ed13cf2cf 100644
--- a/interface-definitions/include/generic-interface-multi-broadcast.xml.i
+++ b/interface-definitions/include/generic-interface-multi-broadcast.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from generic-interface-multi-broadcast.xml.i -->
 <leafNode name="interface">
   <properties>
-    <help>Interface Name to use</help>
+    <help>Interface to use</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
     </completionHelp>
@@ -10,7 +10,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
     <multi/>
   </properties>
diff --git a/interface-definitions/include/generic-interface-multi-wildcard.xml.i b/interface-definitions/include/generic-interface-multi-wildcard.xml.i
new file mode 100644
index 000000000..6c846a795
--- /dev/null
+++ b/interface-definitions/include/generic-interface-multi-wildcard.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from generic-interface-multi-wildcard.xml.i -->
+<leafNode name="interface">
+  <properties>
+    <help>Interface to use</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces</script>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Interface name, wildcard (*) supported</description>
+    </valueHelp>
+    <constraint>
+      #include <include/constraint/interface-name-with-wildcard.xml.i>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/generic-interface-multi.xml.i b/interface-definitions/include/generic-interface-multi.xml.i
index 1b8dc102b..cfc77af3a 100644
--- a/interface-definitions/include/generic-interface-multi.xml.i
+++ b/interface-definitions/include/generic-interface-multi.xml.i
@@ -10,7 +10,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
     <multi/>
   </properties>
diff --git a/interface-definitions/include/generic-interface.xml.i b/interface-definitions/include/generic-interface.xml.i
index 9417f9ef0..65f5bfbb8 100644
--- a/interface-definitions/include/generic-interface.xml.i
+++ b/interface-definitions/include/generic-interface.xml.i
@@ -10,7 +10,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/interface/redirect.xml.i b/interface-definitions/include/interface/redirect.xml.i
index 0421f4074..9b41cd8ff 100644
--- a/interface-definitions/include/interface/redirect.xml.i
+++ b/interface-definitions/include/interface/redirect.xml.i
@@ -10,7 +10,7 @@
       <description>Destination interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/isis/ldp-sync-holddown.xml.i b/interface-definitions/include/isis/ldp-sync-holddown.xml.i
new file mode 100644
index 000000000..15ac26f07
--- /dev/null
+++ b/interface-definitions/include/isis/ldp-sync-holddown.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from isis/ldp-sync-holddown.xml.i -->
+<leafNode name="holddown">
+  <properties>
+    <help>Hold down timer for LDP-IGP cost restoration</help>
+    <valueHelp>
+      <format>u32:0-10000</format>
+      <description>Time to wait in seconds for LDP-IGP synchronization to occur before restoring interface cost</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-10000"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/ldp-sync-interface.xml.i b/interface-definitions/include/isis/ldp-sync-interface.xml.i
new file mode 100644
index 000000000..222a35256
--- /dev/null
+++ b/interface-definitions/include/isis/ldp-sync-interface.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from isis/ldp-igp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>LDP-IGP synchronization configuration for interface</help>
+  </properties>
+  <children>
+    #include <include/generic-disable-node.xml.i>
+    #include <include/isis/ldp-sync-holddown.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/ldp-sync-protocol.xml.i b/interface-definitions/include/isis/ldp-sync-protocol.xml.i
new file mode 100644
index 000000000..b2e696a70
--- /dev/null
+++ b/interface-definitions/include/isis/ldp-sync-protocol.xml.i
@@ -0,0 +1,10 @@
+<!-- include start from isis/ldp-igp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>Protocol wide LDP-IGP synchronization configuration</help>
+  </properties>
+  <children>
+    #include <include/isis/ldp-sync-holddown.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 0e6f19480..4ca7061db 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -152,6 +152,7 @@
     </constraint>
   </properties>
 </leafNode>
+#include <include/isis/ldp-sync-protocol.xml.i>
 <leafNode name="net">
   <properties>
     <help>A Network Entity Title for this process (ISO only)</help>
@@ -172,7 +173,7 @@
 </leafNode>
 <node name="traffic-engineering">
   <properties>
-    <help>Show IS-IS neighbor adjacencies</help>
+    <help>IS-IS traffic engineering extensions</help>
   </properties>
   <children>
     <leafNode name="enable">
@@ -631,6 +632,7 @@
       </properties>
     </leafNode>
     #include <include/isis/metric.xml.i>
+    #include <include/isis/ldp-sync-interface.xml.i>
     <node name="network">
       <properties>
         <help>Set network type</help>
@@ -685,5 +687,4 @@
     </leafNode>
   </children>
 </tagNode>
-#include <include/route-map.xml.i>
 <!-- include end -->
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 25b54b181..b7f22cb88 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -331,6 +331,7 @@
     </constraint>
   </properties>
 </leafNode>
+#include <include/isis/ldp-sync-protocol.xml.i>
 <node name="distance">
   <properties>
     <help>Administrative distance</help>
@@ -358,7 +359,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
   <children>
@@ -385,6 +386,7 @@
     #include <include/ospf/authentication.xml.i>
     #include <include/ospf/intervals.xml.i>
     #include <include/ospf/interface-common.xml.i>
+    #include <include/isis/ldp-sync-interface.xml.i>
     <leafNode name="bandwidth">
       <properties>
         <help>Interface bandwidth (Mbit/s)</help>
@@ -814,7 +816,6 @@
     </leafNode>
   </children>
 </node>
-#include <include/route-map.xml.i>
 <node name="timers">
   <properties>
     <help>Adjust routing timers</help>
@@ -875,4 +876,4 @@
     </node>
   </children>
 </node>
-<!-- include end -->
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
index 014bf9e49..a7de50638 100644
--- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
@@ -118,7 +118,7 @@
       <description>Interface used for routing information exchange</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
   <children>
@@ -256,5 +256,4 @@
     </node>
   </children>
 </node>
-#include <include/route-map.xml.i>
 <!-- include end -->
diff --git a/interface-definitions/include/rip/interface.xml.i b/interface-definitions/include/rip/interface.xml.i
index 0a89f4d92..8007f0208 100644
--- a/interface-definitions/include/rip/interface.xml.i
+++ b/interface-definitions/include/rip/interface.xml.i
@@ -10,7 +10,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
   <children>
diff --git a/interface-definitions/include/routing-passive-interface.xml.i b/interface-definitions/include/routing-passive-interface.xml.i
index 715468e59..8fa0d0fe7 100644
--- a/interface-definitions/include/routing-passive-interface.xml.i
+++ b/interface-definitions/include/routing-passive-interface.xml.i
@@ -16,7 +16,7 @@
     </valueHelp>
     <constraint>
       <regex>(default)</regex>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
     <multi/>
   </properties>
diff --git a/interface-definitions/include/source-interface.xml.i b/interface-definitions/include/source-interface.xml.i
index c25a6a6d0..40fdc6c5e 100644
--- a/interface-definitions/include/source-interface.xml.i
+++ b/interface-definitions/include/source-interface.xml.i
@@ -10,7 +10,7 @@
       <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/static/static-route-interface.xml.i b/interface-definitions/include/static/static-route-interface.xml.i
index db2f0baa6..cb5436847 100644
--- a/interface-definitions/include/static/static-route-interface.xml.i
+++ b/interface-definitions/include/static/static-route-interface.xml.i
@@ -10,7 +10,7 @@
       <description>Gateway interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i
index 34e36f5a7..268cfa005 100644
--- a/interface-definitions/include/static/static-route.xml.i
+++ b/interface-definitions/include/static/static-route.xml.i
@@ -26,7 +26,7 @@
           <description>Gateway interface name</description>
         </valueHelp>
         <constraint>
-          #include <include/constraint/interface-name.xml.in>
+          #include <include/constraint/interface-name.xml.i>
         </constraint>
       </properties>
       <children>
diff --git a/interface-definitions/include/static/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i
index aac02062f..1f8d54108 100644
--- a/interface-definitions/include/static/static-route6.xml.i
+++ b/interface-definitions/include/static/static-route6.xml.i
@@ -25,7 +25,7 @@
           <description>Gateway interface name</description>
         </valueHelp>
         <constraint>
-          #include <include/constraint/interface-name.xml.in>
+          #include <include/constraint/interface-name.xml.i>
         </constraint>
       </properties>
       <children>
diff --git a/interface-definitions/include/system-ip-protocol.xml.i b/interface-definitions/include/system-ip-protocol.xml.i
new file mode 100644
index 000000000..c630eb3f7
--- /dev/null
+++ b/interface-definitions/include/system-ip-protocol.xml.i
@@ -0,0 +1,56 @@
+<!-- include start from system-ip-protocol.xml.i -->
+<tagNode name="protocol">
+  <properties>
+    <help>Filter routing info exchanged between routing protocol and zebra</help>
+    <completionHelp>
+      <list>any babel bgp connected eigrp isis kernel ospf rip static table</list>
+    </completionHelp>
+    <valueHelp>
+      <format>any</format>
+      <description>Any of the above protocols</description>
+    </valueHelp>
+    <valueHelp>
+      <format>babel</format>
+      <description>Babel routing protocol</description>
+    </valueHelp>
+    <valueHelp>
+      <format>bgp</format>
+      <description>Border Gateway Protocol</description>
+    </valueHelp>
+    <valueHelp>
+      <format>connected</format>
+      <description>Connected routes (directly attached subnet or host)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>eigrp</format>
+      <description>Enhanced Interior Gateway Routing Protocol</description>
+    </valueHelp>
+    <valueHelp>
+      <format>isis</format>
+      <description>Intermediate System to Intermediate System</description>
+    </valueHelp>
+    <valueHelp>
+      <format>kernel</format>
+      <description>Kernel routes (not installed via the zebra RIB)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ospf</format>
+      <description>Open Shortest Path First (OSPFv2)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>rip</format>
+      <description>Routing Information Protocol</description>
+    </valueHelp>
+    <valueHelp>
+      <format>static</format>
+      <description>Statically configured routes</description>
+    </valueHelp>
+    <constraint>
+      <regex>(any|babel|bgp|connected|eigrp|isis|kernel|ospf|rip|static|table)</regex>
+    </constraint>
+  </properties>
+  <children>
+    #include <include/route-map.xml.i>
+  </children>
+</tagNode>
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/system-ipv6-protocol.xml.i b/interface-definitions/include/system-ipv6-protocol.xml.i
new file mode 100644
index 000000000..485776a71
--- /dev/null
+++ b/interface-definitions/include/system-ipv6-protocol.xml.i
@@ -0,0 +1,52 @@
+<!-- include start from system-ipv6-protocol.xml.i -->
+<tagNode name="protocol">
+  <properties>
+    <help>Filter routing info exchanged between routing protocol and zebra</help>
+    <completionHelp>
+      <list>any babel bgp connected isis kernel ospfv3 ripng static table</list>
+    </completionHelp>
+    <valueHelp>
+      <format>any</format>
+      <description>Any of the above protocols</description>
+    </valueHelp>
+    <valueHelp>
+      <format>babel</format>
+      <description>Babel routing protocol</description>
+    </valueHelp>
+    <valueHelp>
+      <format>bgp</format>
+      <description>Border Gateway Protocol</description>
+    </valueHelp>
+    <valueHelp>
+      <format>connected</format>
+      <description>Connected routes (directly attached subnet or host)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>isis</format>
+      <description>Intermediate System to Intermediate System</description>
+    </valueHelp>
+    <valueHelp>
+      <format>kernel</format>
+      <description>Kernel routes (not installed via the zebra RIB)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ospfv3</format>
+      <description>Open Shortest Path First (OSPFv3)</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ripng</format>
+      <description>Routing Information Protocol next-generation</description>
+    </valueHelp>
+    <valueHelp>
+      <format>static</format>
+      <description>Statically configured routes</description>
+    </valueHelp>
+    <constraint>
+      <regex>(any|babel|bgp|connected|isis|kernel|ospfv3|ripng|static|table)</regex>
+    </constraint>
+  </properties>
+  <children>
+    #include <include/route-map.xml.i>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/include/version/bgp-version.xml.i b/interface-definitions/include/version/bgp-version.xml.i
index ced49e729..1386ea9bc 100644
--- a/interface-definitions/include/version/bgp-version.xml.i
+++ b/interface-definitions/include/version/bgp-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/bgp-version.xml.i -->
-<syntaxVersion component='bgp' version='3'></syntaxVersion>
+<syntaxVersion component='bgp' version='4'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/isis-version.xml.i b/interface-definitions/include/version/isis-version.xml.i
index 7bf12e81a..f50329b09 100644
--- a/interface-definitions/include/version/isis-version.xml.i
+++ b/interface-definitions/include/version/isis-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/isis-version.xml.i -->
-<syntaxVersion component='isis' version='2'></syntaxVersion>
+<syntaxVersion component='isis' version='3'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/ospf-version.xml.i b/interface-definitions/include/version/ospf-version.xml.i
index 755965daa..df108837b 100644
--- a/interface-definitions/include/version/ospf-version.xml.i
+++ b/interface-definitions/include/version/ospf-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/ospf-version.xml.i -->
-<syntaxVersion component='ospf' version='1'></syntaxVersion>
+<syntaxVersion component='ospf' version='2'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/quagga-version.xml.i b/interface-definitions/include/version/quagga-version.xml.i
index f9944acce..23d884cd4 100644
--- a/interface-definitions/include/version/quagga-version.xml.i
+++ b/interface-definitions/include/version/quagga-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/quagga-version.xml.i -->
-<syntaxVersion component='quagga' version='10'></syntaxVersion>
+<syntaxVersion component='quagga' version='11'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/rip-version.xml.i b/interface-definitions/include/version/rip-version.xml.i
new file mode 100644
index 000000000..30ace486a
--- /dev/null
+++ b/interface-definitions/include/version/rip-version.xml.i
@@ -0,0 +1,3 @@
+<!-- include start from include/version/rip-version.xml.i -->
+<syntaxVersion component='rip' version='1'></syntaxVersion>
+<!-- include end -->
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index f5f1eb1b6..14b1036b4 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -199,7 +199,7 @@
                     <description>Interface name</description>
                   </valueHelp>
                   <constraint>
-                    #include <include/constraint/interface-name.xml.in>
+                    #include <include/constraint/interface-name.xml.i>
                   </constraint>
                   <multi/>
                 </properties>
@@ -218,7 +218,7 @@
                 <description>Interface name</description>
               </valueHelp>
               <constraint>
-                #include <include/constraint/interface-name.xml.in>
+                #include <include/constraint/interface-name.xml.i>
               </constraint>
             </properties>
           </leafNode>
diff --git a/interface-definitions/load-balancing-wan.xml.in b/interface-definitions/load-balancing-wan.xml.in
index 2b812eb4d..c1d7e2c67 100644
--- a/interface-definitions/load-balancing-wan.xml.in
+++ b/interface-definitions/load-balancing-wan.xml.in
@@ -191,15 +191,7 @@
               </constraint>
             </properties>
             <children>
-              <leafNode name="description">
-                <properties>
-                  <help>Description for this rule</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Description for this rule</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               <node name="destination">
                 <properties>
                   <help>Destination</help>
diff --git a/interface-definitions/nat66.xml.in b/interface-definitions/nat66.xml.in
index 6ea611789..7a8970bdf 100644
--- a/interface-definitions/nat66.xml.in
+++ b/interface-definitions/nat66.xml.in
@@ -24,11 +24,7 @@
               <constraintErrorMessage>NAT66 rule number must be between 1 and 999999</constraintErrorMessage>
             </properties>
             <children>
-              <leafNode name="description">
-                <properties>
-                  <help>Rule description</help>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               <leafNode name="disable">
                 <properties>
                   <help>Disable NAT66 rule</help>
@@ -156,11 +152,7 @@
               <constraintErrorMessage>NAT66 rule number must be between 1 and 999999</constraintErrorMessage>
             </properties>
             <children>
-              <leafNode name="description">
-                <properties>
-                  <help>Rule description</help>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               <leafNode name="disable">
                 <properties>
                   <help>Disable NAT66 rule</help>
diff --git a/interface-definitions/ntp.xml.in b/interface-definitions/ntp.xml.in
index 287401ed6..558204a06 100644
--- a/interface-definitions/ntp.xml.in
+++ b/interface-definitions/ntp.xml.in
@@ -57,39 +57,7 @@
               </leafNode>
             </children>
           </tagNode>
-          <node name="allow-client">
-            <properties>
-              <help>Specify NTP clients allowed to access the server</help>
-            </properties>
-            <children>
-              <leafNode name="address">
-                <properties>
-                  <help>IP address</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>Allowed IPv4 address</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv4net</format>
-                    <description>Allowed IPv4 prefix</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>Allowed IPv6 address</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6net</format>
-                    <description>Allowed IPv6 prefix</description>
-                  </valueHelp>
-                  <multi/>
-                  <constraint>
-                    <validator name="ip-address"/>
-                    <validator name="ip-prefix"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
+          #include <include/allow-client.xml.i>
           #include <include/generic-interface-multi.xml.i>
           #include <include/listen-address.xml.i>
           #include <include/interface/vrf.xml.i>
diff --git a/interface-definitions/pki.xml.in b/interface-definitions/pki.xml.in
index c4fde2c78..a13a357fd 100644
--- a/interface-definitions/pki.xml.in
+++ b/interface-definitions/pki.xml.in
@@ -16,11 +16,7 @@
               <help>CA certificate in PEM format</help>
             </properties>
           </leafNode>
-          <leafNode name="description">
-            <properties>
-              <help>Description</help>
-            </properties>
-          </leafNode>
+          #include <include/generic-description.xml.i>
           <node name="private">
             <properties>
               <help>CA private key in PEM format</help>
@@ -63,11 +59,7 @@
               <help>Certificate in PEM format</help>
             </properties>
           </leafNode>
-          <leafNode name="description">
-            <properties>
-              <help>Description</help>
-            </properties>
-          </leafNode>
+          #include <include/generic-description.xml.i>
           <node name="private">
             <properties>
               <help>Certificate private key</help>
diff --git a/interface-definitions/policy-route.xml.in b/interface-definitions/policy-route.xml.in
index bbd6dbf56..d4ec75786 100644
--- a/interface-definitions/policy-route.xml.in
+++ b/interface-definitions/policy-route.xml.in
@@ -12,8 +12,8 @@
         </properties>
         <children>
           #include <include/generic-description.xml.i>
-          #include <include/generic-interface-multi.xml.i>
           #include <include/firewall/enable-default-log.xml.i>
+          #include <include/generic-interface-multi-wildcard.xml.i>
           <tagNode name="rule">
             <properties>
               <help>Policy rule number</help>
@@ -67,8 +67,8 @@
         </properties>
         <children>
           #include <include/generic-description.xml.i>
-          #include <include/generic-interface-multi.xml.i>
           #include <include/firewall/enable-default-log.xml.i>
+          #include <include/generic-interface-multi-wildcard.xml.i>
           <tagNode name="rule">
             <properties>
               <help>Policy rule number</help>
diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in
index 66608be6f..7d5fe79ef 100644
--- a/interface-definitions/policy.xml.in
+++ b/interface-definitions/policy.xml.in
@@ -242,7 +242,7 @@
             <description>BGP extended community-list name</description>
           </valueHelp>
           <constraint>
-            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
           </constraint>
           <constraintErrorMessage>Should be an alphanumeric name</constraintErrorMessage>
         </properties>
@@ -291,7 +291,7 @@
             <description>BGP large-community-list name</description>
           </valueHelp>
           <constraint>
-            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
           </constraint>
           <constraintErrorMessage>Should be an alphanumeric name</constraintErrorMessage>
         </properties>
@@ -340,7 +340,7 @@
             <description>Name of IPv4 prefix-list</description>
           </valueHelp>
           <constraint>
-            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
           </constraint>
           <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
         </properties>
@@ -408,7 +408,7 @@
             <description>Name of IPv6 prefix-list</description>
           </valueHelp>
           <constraint>
-            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
           </constraint>
           <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
         </properties>
diff --git a/interface-definitions/protocols-babel.xml.in b/interface-definitions/protocols-babel.xml.in
index b3377aac1..49fffe230 100644
--- a/interface-definitions/protocols-babel.xml.in
+++ b/interface-definitions/protocols-babel.xml.in
@@ -206,7 +206,7 @@
                         <script>${vyos_completion_dir}/list_interfaces</script>
                       </completionHelp>
                       <constraint>
-                        #include <include/constraint/interface-name.xml.in>
+                        #include <include/constraint/interface-name.xml.i>
                       </constraint>
                     </properties>
                     <children>
@@ -234,7 +234,7 @@
                         <script>${vyos_completion_dir}/list_interfaces</script>
                       </completionHelp>
                       <constraint>
-                        #include <include/constraint/interface-name.xml.in>
+                        #include <include/constraint/interface-name.xml.i>
                       </constraint>
                     </properties>
                     <children>
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index e1a822999..78b461f9d 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -9,6 +9,20 @@
         </properties>
         <children>
           #include <include/bgp/protocol-common-config.xml.i>
+          <node name="address-family">
+            <children>
+              <node name="l2vpn-evpn">
+                <children>
+                  <leafNode name="advertise-all-vni">
+                    <properties>
+                      <help>Advertise all local VNIs</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+            </children>
+          </node>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/protocols-failover.xml.in b/interface-definitions/protocols-failover.xml.in
index 900c76eab..a8c5c717f 100644
--- a/interface-definitions/protocols-failover.xml.in
+++ b/interface-definitions/protocols-failover.xml.in
@@ -48,6 +48,7 @@
                           <constraint>
                             <validator name="ipv4-address"/>
                           </constraint>
+                          <multi/>
                         </properties>
                       </leafNode>
                       <leafNode name="timeout">
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 68d2b64ca..0edd8f2ce 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -39,7 +39,7 @@
                     <script>${vyos_completion_dir}/list_interfaces</script>
                   </completionHelp>
                   <constraint>
-                    #include <include/constraint/interface-name.xml.in>
+                    #include <include/constraint/interface-name.xml.i>
                   </constraint>
                 </properties>
                 <children>
diff --git a/interface-definitions/protocols-ripng.xml.in b/interface-definitions/protocols-ripng.xml.in
index be643896f..9d4d87422 100644
--- a/interface-definitions/protocols-ripng.xml.in
+++ b/interface-definitions/protocols-ripng.xml.in
@@ -40,7 +40,7 @@
                     <script>${vyos_completion_dir}/list_interfaces</script>
                   </completionHelp>
                   <constraint>
-                    #include <include/constraint/interface-name.xml.in>
+                    #include <include/constraint/interface-name.xml.i>
                   </constraint>
                 </properties>
                 <children>
diff --git a/interface-definitions/protocols-static-arp.xml.in b/interface-definitions/protocols-static-arp.xml.in
index 63f450bd8..4b338df63 100644
--- a/interface-definitions/protocols-static-arp.xml.in
+++ b/interface-definitions/protocols-static-arp.xml.in
@@ -20,7 +20,7 @@
                     <description>Interface name</description>
                   </valueHelp>
                   <constraint>
-                    #include <include/constraint/interface-name.xml.in>
+                    #include <include/constraint/interface-name.xml.i>
                   </constraint>
                 </properties>
                 <children>
diff --git a/interface-definitions/qos.xml.in b/interface-definitions/qos.xml.in
index 9b1430ea0..c7bd8606a 100644
--- a/interface-definitions/qos.xml.in
+++ b/interface-definitions/qos.xml.in
@@ -17,7 +17,7 @@
             <description>Interface name</description>
           </valueHelp>
           <constraint>
-            #include <include/constraint/interface-name.xml.in>
+            #include <include/constraint/interface-name.xml.i>
           </constraint>
         </properties>
         <children>
diff --git a/interface-definitions/service-monitoring-telegraf.xml.in b/interface-definitions/service-monitoring-telegraf.xml.in
index 5ba932400..ae0bae900 100644
--- a/interface-definitions/service-monitoring-telegraf.xml.in
+++ b/interface-definitions/service-monitoring-telegraf.xml.in
@@ -74,7 +74,7 @@
                         <properties>
                           <help>Application client id</help>
                           <constraint>
-                            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+                            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
                           </constraint>
                           <constraintErrorMessage>Client-id is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                         </properties>
@@ -83,7 +83,7 @@
                         <properties>
                           <help>Application client secret</help>
                           <constraint>
-                            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+                            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
                           </constraint>
                           <constraintErrorMessage>Client-secret is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                         </properties>
@@ -92,7 +92,7 @@
                         <properties>
                           <help>Set tenant id</help>
                           <constraint>
-                            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+                            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
                           </constraint>
                           <constraintErrorMessage>Tenant-id is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                         </properties>
@@ -107,7 +107,7 @@
                         <description>Remote database name</description>
                       </valueHelp>
                       <constraint>
-                        #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+                        #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
                       </constraint>
                       <constraintErrorMessage>Database is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                     </properties>
@@ -140,7 +140,7 @@
                         <description>Table name</description>
                       </valueHelp>
                       <constraint>
-                        #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
+                        #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i>
                       </constraint>
                       <constraintErrorMessage>Table is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                     </properties>
diff --git a/interface-definitions/service-upnp.xml.in b/interface-definitions/service-upnp.xml.in
index 9e222d29a..1b2e00d91 100644
--- a/interface-definitions/service-upnp.xml.in
+++ b/interface-definitions/service-upnp.xml.in
@@ -24,7 +24,7 @@
                 <script>${vyos_completion_dir}/list_interfaces</script>
               </completionHelp>
               <constraint>
-                #include <include/constraint/interface-name.xml.in>
+                #include <include/constraint/interface-name.xml.i>
               </constraint>
             </properties>
           </leafNode>
@@ -119,7 +119,7 @@
               </valueHelp>
               <multi/>
               <constraint>
-                #include <include/constraint/interface-name.xml.in>
+                #include <include/constraint/interface-name.xml.i>
                 <validator name="ipv4-address"/>
                 <validator name="ipv4-prefix"/>
                 <validator name="ipv6-address"/>
diff --git a/interface-definitions/service-webproxy.xml.in b/interface-definitions/service-webproxy.xml.in
index a315aa2ef..b24997816 100644
--- a/interface-definitions/service-webproxy.xml.in
+++ b/interface-definitions/service-webproxy.xml.in
@@ -538,11 +538,7 @@
                           <multi/>
                         </properties>
                       </leafNode>
-                      <leafNode name="description">
-                        <properties>
-                          <help>Description for source-group</help>
-                        </properties>
-                      </leafNode>
+                      #include <include/generic-description.xml.i>
                       <leafNode name="domain">
                         <properties>
                           <help>Domain for source-group</help>
@@ -644,11 +640,7 @@
                           </leafNode>
                         </children>
                       </tagNode>
-                      <leafNode name="description">
-                        <properties>
-                          <help>Time-period description</help>
-                        </properties>
-                      </leafNode>
+                      #include <include/generic-description.xml.i>
                     </children>
                   </tagNode>
                 </children>
diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in
index 592db7f4e..559e09388 100644
--- a/interface-definitions/snmp.xml.in
+++ b/interface-definitions/snmp.xml.in
@@ -78,15 +78,7 @@
               <constraintErrorMessage>Contact information is limited to 255 characters or less</constraintErrorMessage>
             </properties>
           </leafNode>
-          <leafNode name="description">
-            <properties>
-              <help>Description information</help>
-              <constraint>
-                <regex>.{1,255}</regex>
-              </constraint>
-              <constraintErrorMessage>Description is limited to 255 characters or less</constraintErrorMessage>
-            </properties>
-          </leafNode>
+          #include <include/generic-description.xml.i>
           <tagNode name="listen-address">
             <properties>
               <help>IP address to listen for incoming SNMP requests</help>
diff --git a/interface-definitions/system-config-mgmt.xml.in b/interface-definitions/system-config-mgmt.xml.in
index 1f852d284..716332d2a 100644
--- a/interface-definitions/system-config-mgmt.xml.in
+++ b/interface-definitions/system-config-mgmt.xml.in
@@ -32,7 +32,7 @@
                   <constraint>
                     <validator name="ipv4-address"/>
                     <validator name="ipv6-address"/>
-                    #include <include/constraint/interface-name.xml.in>
+                    #include <include/constraint/interface-name.xml.i>
                   </constraint>
                 </properties>
               </leafNode>
diff --git a/interface-definitions/system-ip.xml.in b/interface-definitions/system-ip.xml.in
index e00dbf252..abdede979 100644
--- a/interface-definitions/system-ip.xml.in
+++ b/interface-definitions/system-ip.xml.in
@@ -48,6 +48,7 @@
               </leafNode>
             </children>
           </node>
+          #include <include/system-ip-protocol.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/system-ipv6.xml.in b/interface-definitions/system-ipv6.xml.in
index 63260d00c..e17e1c01c 100644
--- a/interface-definitions/system-ipv6.xml.in
+++ b/interface-definitions/system-ipv6.xml.in
@@ -36,6 +36,7 @@
               #include <include/arp-ndp-table-size.xml.i>
             </children>
           </node>
+          #include <include/system-ipv6-protocol.xml.i>
           <leafNode name="strict-dad">
             <properties>
               <help>Disable IPv6 operation on interface when DAD fails on LL addr</help>
diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in
index b00741ffe..258913929 100644
--- a/interface-definitions/system-login.xml.in
+++ b/interface-definitions/system-login.xml.in
@@ -225,6 +225,19 @@
               #include <include/interface/vrf.xml.i>
             </children>
           </node>
+          <leafNode name="max-login-session">
+            <properties>
+              <help>Maximum number of all login sessions</help>
+              <valueHelp>
+                <format>u32:1-65536</format>
+                <description>Maximum number of all login sessions</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-65536"/>
+              </constraint>
+              <constraintErrorMessage>Maximum logins must be between 1 and 65536</constraintErrorMessage>
+            </properties>
+          </leafNode>
           <leafNode name="timeout">
             <properties>
               <help>Session timeout</help>
diff --git a/interface-definitions/system-sflow.xml.in b/interface-definitions/system-sflow.xml.in
index 335181fe1..9c748c24a 100644
--- a/interface-definitions/system-sflow.xml.in
+++ b/interface-definitions/system-sflow.xml.in
@@ -42,7 +42,7 @@
                 <description>Interface name</description>
               </valueHelp>
               <constraint>
-                #include <include/constraint/interface-name.xml.in>
+                #include <include/constraint/interface-name.xml.i>
               </constraint>
             </properties>
           </leafNode>
diff --git a/interface-definitions/vpn-ipsec.xml.in b/interface-definitions/vpn-ipsec.xml.in
index 1b3a5532e..64cfbda08 100644
--- a/interface-definitions/vpn-ipsec.xml.in
+++ b/interface-definitions/vpn-ipsec.xml.in
@@ -357,11 +357,11 @@
                 <properties>
                   <help>IKE lifetime</help>
                   <valueHelp>
-                    <format>u32:30-86400</format>
+                    <format>u32:0-86400</format>
                     <description>IKE lifetime in seconds</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="numeric" argument="--range 30-86400"/>
+                    <validator name="numeric" argument="--range 0-86400"/>
                   </constraint>
                 </properties>
                 <defaultValue>28800</defaultValue>
diff --git a/interface-definitions/vpn-l2tp.xml.in b/interface-definitions/vpn-l2tp.xml.in
index 0a92017bd..6b64c5f5d 100644
--- a/interface-definitions/vpn-l2tp.xml.in
+++ b/interface-definitions/vpn-l2tp.xml.in
@@ -124,11 +124,7 @@
                 </children>
               </node>
               #include <include/accel-ppp/client-ipv6-pool.xml.i>
-              <leafNode name="description">
-                <properties>
-                  <help>Description for L2TP remote-access settings</help>
-                </properties>
-              </leafNode>
+              #include <include/generic-description.xml.i>
               #include <include/dhcp-interface.xml.i>
               <leafNode name="idle">
                 <properties>
diff --git a/interface-definitions/vpn-pptp.xml.in b/interface-definitions/vpn-pptp.xml.in
index 00ffd26f9..5a8b4a78a 100644
--- a/interface-definitions/vpn-pptp.xml.in
+++ b/interface-definitions/vpn-pptp.xml.in
@@ -108,9 +108,13 @@
                       </tagNode>
                     </children>
                   </node>
+                  <node name="radius">
+                    <children>
+                      #include <include/accel-ppp/radius-additions-rate-limit.xml.i>
+                    </children>
+                  </node>
                   #include <include/radius-auth-server-ipv4.xml.i>
                   #include <include/accel-ppp/radius-additions.xml.i>
-                  #include <include/accel-ppp/radius-additions-rate-limit.xml.i>
                 </children>
               </node>
             </children>
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 96c6d8be2..a7efe146a 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -34,6 +34,7 @@
             </properties>
             <children>
               #include <include/interface/disable-forwarding.xml.i>
+              #include <include/system-ip-protocol.xml.i>
             </children>
           </node>
           <node name="ipv6">
@@ -42,6 +43,7 @@
             </properties>
             <children>
               #include <include/interface/disable-forwarding.xml.i>
+              #include <include/system-ipv6-protocol.xml.i>
             </children>
           </node>
           <node name="protocols">
@@ -119,20 +121,7 @@
               <constraintErrorMessage>VRF routing table must be in range from 100 to 65535</constraintErrorMessage>
             </properties>
           </leafNode>
-          <leafNode name="vni" owner="${vyos_conf_scripts_dir}/vrf_vni.py">
-            <properties>
-              <help>Virtual Network Identifier</help>
-              <!-- priority must be after BGP -->
-              <priority>822</priority>
-              <valueHelp>
-                <format>u32:0-16777214</format>
-                <description>VXLAN virtual network identifier</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 0-16777214"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/vni.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/xml-component-version.xml.in b/interface-definitions/xml-component-version.xml.in
index 2e6506efc..e05f64643 100644
--- a/interface-definitions/xml-component-version.xml.in
+++ b/interface-definitions/xml-component-version.xml.in
@@ -33,6 +33,7 @@
   #include <include/version/pptp-version.xml.i>
   #include <include/version/qos-version.xml.i>
   #include <include/version/quagga-version.xml.i>
+  #include <include/version/rip-version.xml.i>
   #include <include/version/rpki-version.xml.i>
   #include <include/version/salt-version.xml.i>
   #include <include/version/snmp-version.xml.i>