Merge branch 'vyos:equuleus' into equuleus

60 files changed, 1099 insertions, 139 deletions

diff --git a/interface-definitions/include/accel-ppp/auth-local-users.xml.i b/interface-definitions/include/accel-ppp/auth-local-users.xml.i
index 308d6510d..1b40a9ea7 100644
--- a/interface-definitions/include/accel-ppp/auth-local-users.xml.i
+++ b/interface-definitions/include/accel-ppp/auth-local-users.xml.i
@@ -18,6 +18,9 @@
         <leafNode name="static-ip">
           <properties>
             <help>Static client IP address</help>
+            <constraint>
+              <validator name="ipv4-address"/>
+            </constraint>
           </properties>
           <defaultValue>*</defaultValue>
         </leafNode>
diff --git a/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i b/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
index bd3dadf8d..a692f2335 100644
--- a/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
+++ b/interface-definitions/include/accel-ppp/client-ipv6-pool.xml.i
@@ -27,6 +27,7 @@
                 <validator name="numeric" argument="--range 48-128"/>
               </constraint>
             </properties>
+            <defaultValue>64</defaultValue>
           </leafNode>
       </children>
     </tagNode>
diff --git a/interface-definitions/include/accel-ppp/ppp-interface-cache.xml.i b/interface-definitions/include/accel-ppp/ppp-interface-cache.xml.i
index 9f223d7ed..019601c85 100644
--- a/interface-definitions/include/accel-ppp/ppp-interface-cache.xml.i
+++ b/interface-definitions/include/accel-ppp/ppp-interface-cache.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>PPP interface cache</help>
     <valueHelp>
-      <format>1-256000</format>
+      <format>u32:1-256000</format>
       <description>Count of interfaces to keep in cache</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i
new file mode 100644
index 000000000..3e065329d
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i
@@ -0,0 +1,23 @@
+<!-- include start from accel-ppp/ppp-options-ipv4.xml.i -->
+<leafNode name="ipv4">
+  <properties>
+    <help>IPv4 negotiation algorithm</help>
+    <constraint>
+      <regex>^(deny|allow)$</regex>
+    </constraint>
+    <constraintErrorMessage>invalid value</constraintErrorMessage>
+    <valueHelp>
+      <format>deny</format>
+      <description>Do not negotiate IPv4</description>
+    </valueHelp>
+    <valueHelp>
+      <format>allow</format>
+      <description>Negotiate IPv4 only if client requests</description>
+    </valueHelp>
+    <completionHelp>
+      <list>deny allow</list>
+    </completionHelp>
+  </properties>
+  <defaultValue>allow</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i
new file mode 100644
index 000000000..b9fbac5c6
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i
@@ -0,0 +1,31 @@
+<!-- include start from accel-ppp/ppp-options-ipv6.xml.i -->
+<leafNode name="ipv6">
+  <properties>
+    <help>IPv6 (IPCP6) negotiation algorithm</help>
+    <constraint>
+      <regex>^(deny|allow|prefer|require)$</regex>
+    </constraint>
+    <constraintErrorMessage>invalid value</constraintErrorMessage>
+    <valueHelp>
+      <format>deny</format>
+      <description>Do not negotiate IPv6</description>
+    </valueHelp>
+    <valueHelp>
+      <format>allow</format>
+      <description>Negotiate IPv6 only if client requests</description>
+    </valueHelp>
+    <valueHelp>
+      <format>prefer</format>
+      <description>Ask client for IPv6 negotiation, do not fail if it rejects</description>
+    </valueHelp>
+    <valueHelp>
+      <format>require</format>
+      <description>Require IPv6 negotiation</description>
+    </valueHelp>
+    <completionHelp>
+      <list>deny allow prefer require</list>
+    </completionHelp>
+  </properties>
+  <defaultValue>deny</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/radius-additions.xml.i b/interface-definitions/include/accel-ppp/radius-additions.xml.i
index e65088c43..44ec64d7f 100644
--- a/interface-definitions/include/accel-ppp/radius-additions.xml.i
+++ b/interface-definitions/include/accel-ppp/radius-additions.xml.i
@@ -5,7 +5,7 @@
       <properties>
         <help>Maximum jitter value in seconds to be applied to accounting information interval</help>
         <valueHelp>
-          <format>1-60</format>
+          <format>u32:1-60</format>
           <description>Maximum jitter value in seconds</description>
         </valueHelp>
         <constraint>
@@ -20,7 +20,7 @@
           <properties>
             <help>Accounting port</help>
             <valueHelp>
-              <format>1-65535</format>
+              <format>u32:1-65535</format>
               <description>Numeric IP port (default: 1813)</description>
             </valueHelp>
             <constraint>
@@ -34,7 +34,7 @@
           <properties>
             <help>Mark server unavailable for &lt;n&gt; seconds on failure</help>
             <valueHelp>
-              <format>0-600</format>
+              <format>u32:0-600</format>
               <description>Fail time penalty</description>
             </valueHelp>
             <constraint>
@@ -50,7 +50,7 @@
       <properties>
         <help>Timeout in seconds to wait response from RADIUS server</help>
         <valueHelp>
-          <format>1-60</format>
+          <format>u32:1-60</format>
           <description>Timeout in seconds</description>
         </valueHelp>
         <constraint>
@@ -64,7 +64,7 @@
       <properties>
         <help>Timeout for Interim-Update packets, terminate session afterwards (default 3 seconds)</help>
         <valueHelp>
-          <format>0-60</format>
+          <format>u32:0-60</format>
           <description>Timeout in seconds, 0 to keep active</description>
         </valueHelp>
         <constraint>
@@ -78,7 +78,7 @@
       <properties>
         <help>Number of tries to send Access-Request/Accounting-Request queries</help>
         <valueHelp>
-          <format>1-20</format>
+          <format>u32:1-20</format>
           <description>Maximum tries</description>
         </valueHelp>
         <constraint>
diff --git a/interface-definitions/include/bfd.xml.i b/interface-definitions/include/bfd.xml.i
new file mode 100644
index 000000000..2bc3664e1
--- /dev/null
+++ b/interface-definitions/include/bfd.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from bfd.xml.i -->
+<leafNode name="bfd">
+  <properties>
+    <help>Enable Bidirectional Forwarding Detection (BFD)</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp/domain-name.xml.i b/interface-definitions/include/dhcp/domain-name.xml.i
new file mode 100644
index 000000000..410e27d29
--- /dev/null
+++ b/interface-definitions/include/dhcp/domain-name.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from dhcp/domain-name.xml.i -->
+<leafNode name="domain-name">
+  <properties>
+    <help>Client Domain Name</help>
+    <constraint>
+      <validator name="fqdn"/>
+    </constraint>
+    <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and .-_</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp-server-domain-search.xml.i b/interface-definitions/include/dhcp/domain-search.xml.i
index 4fc55097b..bcc8fcd12 100644
--- a/interface-definitions/include/dhcp-server-domain-search.xml.i
+++ b/interface-definitions/include/dhcp/domain-search.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from dhcp-server-domain-search.xml.i -->
+<!-- include start from dhcp/domain-search.xml.i -->
 <leafNode name="domain-search">
   <properties>
     <help>Client Domain Name search list</help>
diff --git a/interface-definitions/include/dhcp/ntp-server.xml.i b/interface-definitions/include/dhcp/ntp-server.xml.i
new file mode 100644
index 000000000..32d8207e5
--- /dev/null
+++ b/interface-definitions/include/dhcp/ntp-server.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from dhcp/ntp-server.xml.i -->
+                  <leafNode name="ntp-server">
+                    <properties>
+                      <help>IP address of NTP server</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>NTP server IPv4 address</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                      <multi/>
+                    </properties>
+                  </leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp/ping-check.xml.i b/interface-definitions/include/dhcp/ping-check.xml.i
new file mode 100644
index 000000000..a506f68e4
--- /dev/null
+++ b/interface-definitions/include/dhcp/ping-check.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from dhcp/ping-check.xml.i -->
+<leafNode name="ping-check">
+  <properties>
+    <help>Sends ICMP Echo request to the address being assigned</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/generic-description.xml.i b/interface-definitions/include/generic-description.xml.i
new file mode 100644
index 000000000..03fc564e6
--- /dev/null
+++ b/interface-definitions/include/generic-description.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from generic-description.xml.i -->
+<leafNode name="description">
+  <properties>
+    <help>Description</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Description</description>
+    </valueHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface/arp-cache-timeout.xml.i
index b269fecd8..70e69e14a 100644
--- a/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
+++ b/interface-definitions/include/interface/arp-cache-timeout.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>ARP cache entry timeout in seconds</help>
     <valueHelp>
-      <format>1-86400</format>
+      <format>u32:1-86400</format>
       <description>ARP cache entry timout in seconds (default 30)</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/interface/interface-description.xml.i b/interface-definitions/include/interface/description.xml.i
index d618b50d2..d618b50d2 100644
--- a/interface-definitions/include/interface/interface-description.xml.i
+++ b/interface-definitions/include/interface/description.xml.i
diff --git a/interface-definitions/include/interface/dhcpv6-options.xml.i b/interface-definitions/include/interface/dhcpv6-options.xml.i
index a569659a4..a0cac34f1 100644
--- a/interface-definitions/include/interface/dhcpv6-options.xml.i
+++ b/interface-definitions/include/interface/dhcpv6-options.xml.i
@@ -38,7 +38,7 @@
           <properties>
             <help>Request IPv6 prefix length from peer</help>
             <valueHelp>
-              <format>32-64</format>
+              <format>u32:32-64</format>
               <description>Length of delegated prefix</description>
             </valueHelp>
             <constraint>
@@ -71,7 +71,7 @@
               <properties>
                 <help>Interface site-Level aggregator (SLA)</help>
                 <valueHelp>
-                  <format>0-128</format>
+                  <format>u32:0-128</format>
                   <description>Decimal integer which fits in the length of SLA IDs</description>
                 </valueHelp>
                 <constraint>
diff --git a/interface-definitions/include/interface/interface-dial-on-demand.xml.i b/interface-definitions/include/interface/dial-on-demand.xml.i
index 66edd9678..66edd9678 100644
--- a/interface-definitions/include/interface/interface-dial-on-demand.xml.i
+++ b/interface-definitions/include/interface/dial-on-demand.xml.i
diff --git a/interface-definitions/include/interface/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface/disable-arp-filter.xml.i
index 49cddaf76..49cddaf76 100644
--- a/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
+++ b/interface-definitions/include/interface/disable-arp-filter.xml.i
diff --git a/interface-definitions/include/interface/interface-disable-forwarding.xml.i b/interface-definitions/include/interface/disable-forwarding.xml.i
index cb6ef0475..cee9d2a8d 100644
--- a/interface-definitions/include/interface/interface-disable-forwarding.xml.i
+++ b/interface-definitions/include/interface/disable-forwarding.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from interface/interface-disable-forwarding.xml.i -->
 <leafNode name="disable-forwarding">
   <properties>
-    <help>Disable IPv4 forwarding on this interface</help>
+    <help>Disable IP forwarding on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/interface/interface-disable-link-detect.xml.i b/interface-definitions/include/interface/disable-link-detect.xml.i
index c528885b2..c528885b2 100644
--- a/interface-definitions/include/interface/interface-disable-link-detect.xml.i
+++ b/interface-definitions/include/interface/disable-link-detect.xml.i
diff --git a/interface-definitions/include/interface/interface-disable.xml.i b/interface-definitions/include/interface/disable.xml.i
index d90e6395b..d90e6395b 100644
--- a/interface-definitions/include/interface/interface-disable.xml.i
+++ b/interface-definitions/include/interface/disable.xml.i
diff --git a/interface-definitions/include/interface/interface-eapol.xml.i b/interface-definitions/include/interface/eapol.xml.i
index 92b7a3f35..92b7a3f35 100644
--- a/interface-definitions/include/interface/interface-eapol.xml.i
+++ b/interface-definitions/include/interface/eapol.xml.i
diff --git a/interface-definitions/include/interface/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface/enable-arp-accept.xml.i
index 7c5d51857..7c5d51857 100644
--- a/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
+++ b/interface-definitions/include/interface/enable-arp-accept.xml.i
diff --git a/interface-definitions/include/interface/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface/enable-arp-announce.xml.i
index f44599c54..f44599c54 100644
--- a/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
+++ b/interface-definitions/include/interface/enable-arp-announce.xml.i
diff --git a/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface/enable-arp-ignore.xml.i
index 3ea39613c..3ea39613c 100644
--- a/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
+++ b/interface-definitions/include/interface/enable-arp-ignore.xml.i
diff --git a/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface/enable-proxy-arp.xml.i
index dbdeeb7a7..dbdeeb7a7 100644
--- a/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
+++ b/interface-definitions/include/interface/enable-proxy-arp.xml.i
diff --git a/interface-definitions/include/interface/interface-hw-id.xml.i b/interface-definitions/include/interface/hw-id.xml.i
index 989cd9cb7..989cd9cb7 100644
--- a/interface-definitions/include/interface/interface-hw-id.xml.i
+++ b/interface-definitions/include/interface/hw-id.xml.i
diff --git a/interface-definitions/include/interface/interface-ipv4-options.xml.i b/interface-definitions/include/interface/interface-ipv4-options.xml.i
deleted file mode 100644
index c2d0677b7..000000000
--- a/interface-definitions/include/interface/interface-ipv4-options.xml.i
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- include start from interface/interface-ipv4-options.xml.i -->
-<node name="ip">
-  <properties>
-    <help>IPv4 routing parameters</help>
-  </properties>
-  <children>
-    #include <include/interface/interface-arp-cache-timeout.xml.i>
-    #include <include/interface/interface-disable-arp-filter.xml.i>
-    #include <include/interface/interface-disable-forwarding.xml.i>
-    #include <include/interface/interface-enable-arp-accept.xml.i>
-    #include <include/interface/interface-enable-arp-announce.xml.i>
-    #include <include/interface/interface-enable-arp-ignore.xml.i>
-    #include <include/interface/interface-enable-proxy-arp.xml.i>
-    #include <include/interface/interface-proxy-arp-pvlan.xml.i>
-    #include <include/interface/interface-source-validation.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv4-options.xml.i b/interface-definitions/include/interface/ipv4-options.xml.i
new file mode 100644
index 000000000..5a45487c5
--- /dev/null
+++ b/interface-definitions/include/interface/ipv4-options.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from interface/interface-ipv4-options.xml.i -->
+<node name="ip">
+  <properties>
+    <help>IPv4 routing parameters</help>
+  </properties>
+  <children>
+    #include <include/interface/arp-cache-timeout.xml.i>
+    #include <include/interface/disable-arp-filter.xml.i>
+    #include <include/interface/disable-forwarding.xml.i>
+    #include <include/interface/enable-arp-accept.xml.i>
+    #include <include/interface/enable-arp-announce.xml.i>
+    #include <include/interface/enable-arp-ignore.xml.i>
+    #include <include/interface/enable-proxy-arp.xml.i>
+    #include <include/interface/proxy-arp-pvlan.xml.i>
+    #include <include/interface/source-validation.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i b/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i
deleted file mode 100644
index 4adb77d1b..000000000
--- a/interface-definitions/include/interface/ipv6-disable-forwarding.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/ipv6-disable-forwarding.xml.i -->
-<leafNode name="disable-forwarding">
-  <properties>
-    <help>Disable IPv6 forwarding on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i b/interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i
index 2b5ec0281..babe6d20f 100644
--- a/interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i
+++ b/interface-definitions/include/interface/ipv6-dup-addr-detect-transmits.xml.i
@@ -3,12 +3,12 @@
   <properties>
     <help>Number of NS messages to send while performing DAD (default: 1)</help>
     <valueHelp>
-      <format>1-n</format>
-      <description>Number of NS messages to send while performing DAD</description>
+      <format>u32:0</format>
+      <description>Disable Duplicate Address Dectection (DAD)</description>
     </valueHelp>
     <valueHelp>
-      <format>0</format>
-      <description>Disable Duplicate Address Dectection (DAD)</description>
+      <format>u32:1-n</format>
+      <description>Number of NS messages to send while performing DAD</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--non-negative"/>
diff --git a/interface-definitions/include/interface/interface-ipv6-options.xml.i b/interface-definitions/include/interface/ipv6-options.xml.i
index dcd5a8710..a5b40c789 100644
--- a/interface-definitions/include/interface/interface-ipv6-options.xml.i
+++ b/interface-definitions/include/interface/ipv6-options.xml.i
@@ -4,8 +4,8 @@
     <help>IPv6 routing parameters</help>
   </properties>
   <children>
+    #include <include/interface/disable-forwarding.xml.i>
     #include <include/interface/ipv6-address.xml.i>
-    #include <include/interface/ipv6-disable-forwarding.xml.i>
     #include <include/interface/ipv6-dup-addr-detect-transmits.xml.i>
   </children>
 </node>
diff --git a/interface-definitions/include/interface/interface-mac.xml.i b/interface-definitions/include/interface/mac.xml.i
index d7107ad23..d7107ad23 100644
--- a/interface-definitions/include/interface/interface-mac.xml.i
+++ b/interface-definitions/include/interface/mac.xml.i
diff --git a/interface-definitions/include/interface/interface-mirror.xml.i b/interface-definitions/include/interface/mirror.xml.i
index b3b45fb43..b3b45fb43 100644
--- a/interface-definitions/include/interface/interface-mirror.xml.i
+++ b/interface-definitions/include/interface/mirror.xml.i
diff --git a/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i b/interface-definitions/include/interface/mtu-1200-16000.xml.i
index 3241ba912..730c6e00d 100644
--- a/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
+++ b/interface-definitions/include/interface/mtu-1200-16000.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
     <valueHelp>
-      <format>1200-16000</format>
+      <format>u32:1200-16000</format>
       <description>Maximum Transmission Unit in byte</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i b/interface-definitions/include/interface/mtu-1450-16000.xml.i
index 0a35bbbaa..96cfa7054 100644
--- a/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
+++ b/interface-definitions/include/interface/mtu-1450-16000.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
     <valueHelp>
-      <format>1450-16000</format>
+      <format>u32:1450-16000</format>
       <description>Maximum Transmission Unit in byte</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/interface/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface/mtu-64-8024.xml.i
index f75de02ba..3719ece24 100644
--- a/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
+++ b/interface-definitions/include/interface/mtu-64-8024.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
     <valueHelp>
-      <format>64-8024</format>
+      <format>u32:64-8024</format>
       <description>Maximum Transmission Unit in byte</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/interface/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface/mtu-68-1500.xml.i
index 9e6fe8760..d74cdfa9c 100644
--- a/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
+++ b/interface-definitions/include/interface/mtu-68-1500.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
     <valueHelp>
-      <format>68-1500</format>
+      <format>u32:68-1500</format>
       <description>Maximum Transmission Unit in byte</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/interface/interface-mtu-68-16000.xml.i b/interface-definitions/include/interface/mtu-68-16000.xml.i
index 83af7bbd4..41340fbf3 100644
--- a/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
+++ b/interface-definitions/include/interface/mtu-68-16000.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
     <valueHelp>
-      <format>68-16000</format>
+      <format>u32:68-16000</format>
       <description>Maximum Transmission Unit in byte</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i b/interface-definitions/include/interface/parameters-flowlabel.xml.i
index f5e868a64..a89bb13f1 100644
--- a/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
+++ b/interface-definitions/include/interface/parameters-flowlabel.xml.i
@@ -2,9 +2,16 @@
 <leafNode name="flowlabel">
   <properties>
     <help>Specifies the flow label to use in outgoing packets</help>
+    <completionHelp>
+      <list>inherit</list>
+    </completionHelp>
     <valueHelp>
-      <format>0x0-0x0FFFFF</format>
-      <description>Tunnel key, 'inherit' or hex value</description>
+      <format>inherit</format>
+      <description>Copy field from original header</description>
+    </valueHelp>
+    <valueHelp>
+      <format>0x0-0x0fffff</format>
+      <description>Tunnel key, or hex value</description>
     </valueHelp>
     <constraint>
       <regex>^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$</regex>
diff --git a/interface-definitions/include/interface/interface-parameters-key.xml.i b/interface-definitions/include/interface/parameters-key.xml.i
index 1b1d67174..1b1d67174 100644
--- a/interface-definitions/include/interface/interface-parameters-key.xml.i
+++ b/interface-definitions/include/interface/parameters-key.xml.i
diff --git a/interface-definitions/include/interface/interface-parameters-tos.xml.i b/interface-definitions/include/interface/parameters-tos.xml.i
index 83b4e0671..1b342a43e 100644
--- a/interface-definitions/include/interface/interface-parameters-tos.xml.i
+++ b/interface-definitions/include/interface/parameters-tos.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Specifies TOS value to use in outgoing packets</help>
     <valueHelp>
-      <format>0-99</format>
+      <format>u32:0-99</format>
       <description>Type of Service (TOS)</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/interface/interface-parameters-ttl.xml.i b/interface-definitions/include/interface/parameters-ttl.xml.i
index 21a5e5cd9..8ef8c9149 100644
--- a/interface-definitions/include/interface/interface-parameters-ttl.xml.i
+++ b/interface-definitions/include/interface/parameters-ttl.xml.i
@@ -3,11 +3,11 @@
   <properties>
     <help>Specifies TTL value to use in outgoing packets</help>
     <valueHelp>
-      <format>0</format>
-      <description>Copy value from original IP header</description>
+      <format>u32:0</format>
+      <description>Inherit - copy value from original IP header</description>
     </valueHelp>
     <valueHelp>
-      <format>1-255</format>
+      <format>u32:1-255</format>
       <description>Time to Live</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface/proxy-arp-pvlan.xml.i
index 153dfc072..153dfc072 100644
--- a/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
+++ b/interface-definitions/include/interface/proxy-arp-pvlan.xml.i
diff --git a/interface-definitions/include/interface/interface-source-validation.xml.i b/interface-definitions/include/interface/source-validation.xml.i
index 70914f2e9..70914f2e9 100644
--- a/interface-definitions/include/interface/interface-source-validation.xml.i
+++ b/interface-definitions/include/interface/source-validation.xml.i
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 85885c153..7a41bb242 100644
--- a/interface-definitions/include/interface/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -2,6 +2,10 @@
 <tagNode name="vif-s">
   <properties>
     <help>QinQ TAG-S Virtual Local Area Network (VLAN) ID</help>
+    <valueHelp>
+      <format>u32:0-4094</format>
+      <description>QinQ Virtual Local Area Network (VLAN) ID</description>
+    </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 0-4094"/>
     </constraint>
@@ -9,11 +13,11 @@
   </properties>
   <children>
     #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-    #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/disable-link-detect.xml.i>
+    #include <include/interface/disable.xml.i>
     <leafNode name="protocol">
       <properties>
         <help>Protocol used for service VLAN (default: 802.1ad)</help>
@@ -35,10 +39,10 @@
       </properties>
       <defaultValue>802.1ad</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/interface-mtu-68-16000.xml.i>
+    #include <include/interface/ipv4-options.xml.i>
+    #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/mac.xml.i>
+    #include <include/interface/mtu-68-16000.xml.i>
     <tagNode name="vif-c">
       <properties>
         <help>QinQ TAG-C Virtual Local Area Network (VLAN) ID</help>
@@ -49,19 +53,19 @@
       </properties>
       <children>
         #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-        #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-ipv4-options.xml.i>
-        #include <include/interface/interface-ipv6-options.xml.i>
-        #include <include/interface/interface-mac.xml.i>
-        #include <include/interface/interface-mtu-68-16000.xml.i>
-        #include <include/interface/interface-vrf.xml.i>
+        #include <include/interface/disable-link-detect.xml.i>
+        #include <include/interface/disable.xml.i>
+        #include <include/interface/ipv4-options.xml.i>
+        #include <include/interface/ipv6-options.xml.i>
+        #include <include/interface/mac.xml.i>
+        #include <include/interface/mtu-68-16000.xml.i>
+        #include <include/interface/vrf.xml.i>
       </children>
     </tagNode>
-    #include <include/interface/interface-vrf.xml.i>
+    #include <include/interface/vrf.xml.i>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
index 4e7aeb0f9..fdf09c5f9 100644
--- a/interface-definitions/include/interface/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Virtual Local Area Network (VLAN) ID</help>
     <valueHelp>
-      <format>0-4094</format>
+      <format>u32:0-4094</format>
       <description>Virtual Local Area Network (VLAN) ID</description>
     </valueHelp>
     <constraint>
@@ -13,12 +13,12 @@
   </properties>
   <children>
     #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-    #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/disable-link-detect.xml.i>
+    #include <include/interface/disable.xml.i>
+    #include <include/interface/vrf.xml.i>
     <leafNode name="egress-qos">
       <properties>
         <help>VLAN egress QoS</help>
@@ -43,10 +43,10 @@
         <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
       </properties>
     </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/interface-mtu-68-16000.xml.i>
+    #include <include/interface/ipv4-options.xml.i>
+    #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/mac.xml.i>
+    #include <include/interface/mtu-68-16000.xml.i>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/interface-vrf.xml.i b/interface-definitions/include/interface/vrf.xml.i
index ef6ca1241..ef6ca1241 100644
--- a/interface-definitions/include/interface/interface-vrf.xml.i
+++ b/interface-definitions/include/interface/vrf.xml.i
diff --git a/interface-definitions/include/isis-redistribute-ipv4.xml.i b/interface-definitions/include/isis-redistribute-ipv4.xml.i
deleted file mode 100644
index 774086a81..000000000
--- a/interface-definitions/include/isis-redistribute-ipv4.xml.i
+++ /dev/null
@@ -1,56 +0,0 @@
-<!-- include start from isis-redistribute-ipv4.xml.i -->
-<node name="level-1">
-  <properties>
-    <help>Redistribute into level-1</help>
-  </properties>
-  <children>
-    <leafNode name="metric">
-      <properties>
-        <help>Metric for redistributed routes</help>
-        <valueHelp>
-          <format>u32:0-16777215</format>
-          <description>ISIS default metric</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-16777215"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="route-map">
-      <properties>
-        <help>Route map reference</help>
-        <completionHelp>
-          <path>policy route-map</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<node name="level-2">
-  <properties>
-    <help>Redistribute into level-2</help>
-  </properties>
-  <children>
-    <leafNode name="metric">
-      <properties>
-        <help>Metric for redistributed routes</help>
-        <valueHelp>
-          <format>u32:0-16777215</format>
-          <description>ISIS default metric</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-16777215"/>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="route-map">
-      <properties>
-        <help>Route map reference</help>
-        <completionHelp>
-          <path>policy route-map</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/isis/default-information-level.xml.i b/interface-definitions/include/isis/default-information-level.xml.i
new file mode 100644
index 000000000..5ade72a4b
--- /dev/null
+++ b/interface-definitions/include/isis/default-information-level.xml.i
@@ -0,0 +1,32 @@
+<!-- include start from isis/default-information-level.xml.i -->
+<node name="level-1">
+  <properties>
+    <help>Distribute default route into level-1</help>
+  </properties>
+  <children>
+    <leafNode name="always">
+      <properties>
+        <help>Always advertise default route</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    #include <include/isis/metric.xml.i>
+    #include <include/route-map.xml.i>
+  </children>
+</node>
+<node name="level-2">
+  <properties>
+    <help>Distribute default route into level-2</help>
+  </properties>
+  <children>
+    <leafNode name="always">
+      <properties>
+        <help>Always advertise default route</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    #include <include/isis/metric.xml.i>
+    #include <include/route-map.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/metric.xml.i b/interface-definitions/include/isis/metric.xml.i
new file mode 100644
index 000000000..30e2cdc10
--- /dev/null
+++ b/interface-definitions/include/isis/metric.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from isis/metric.xml.i -->
+<leafNode name="metric">
+  <properties>
+    <help>Set default metric for circuit</help>
+    <valueHelp>
+      <format>u32:0-16777215</format>
+      <description>Default metric value</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-16777215"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/passive.xml.i b/interface-definitions/include/isis/passive.xml.i
new file mode 100644
index 000000000..6d05f8cc7
--- /dev/null
+++ b/interface-definitions/include/isis/passive.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from isis/passive.xml.i -->
+<leafNode name="passive">
+  <properties>
+    <help>Configure passive mode for interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
new file mode 100644
index 000000000..84e2f7bb2
--- /dev/null
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -0,0 +1,769 @@
+<!-- include start from isis/protocol-common-config.xml.i -->
+<node name="area-password">
+  <properties>
+    <help>Configure the authentication password for an area</help>
+  </properties>
+  <children>
+    <leafNode name="plaintext-password">
+      <properties>
+        <help>Plain-text authentication type</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Level-wide password</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="md5">
+      <properties>
+        <help>MD5 authentication type</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Level-wide password</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="default-information">
+  <properties>
+    <help>Control distribution of default information</help>
+  </properties>
+  <children>
+    <node name="originate">
+      <properties>
+        <help>Distribute a default route</help>
+      </properties>
+      <children>
+        <node name="ipv4">
+          <properties>
+            <help>Distribute default route for IPv4</help>
+          </properties>
+          <children>
+            #include <include/isis/default-information-level.xml.i>
+          </children>
+        </node>
+        <node name="ipv6">
+          <properties>
+            <help>Distribute default route for IPv6</help>
+          </properties>
+          <children>
+            #include <include/isis/default-information-level.xml.i>
+          </children>
+        </node>
+      </children>
+    </node>
+  </children>
+</node>
+<node name="domain-password">
+  <properties>
+    <help>Set the authentication password for a routing domain</help>
+  </properties>
+  <children>
+    <leafNode name="plaintext-password">
+      <properties>
+        <help>Plain-text authentication type</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Level-wide password</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="md5">
+      <properties>
+        <help>MD5 authentication type</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Level-wide password</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="dynamic-hostname">
+  <properties>
+    <help>Dynamic hostname for IS-IS</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="level">
+  <properties>
+    <help>IS-IS level number</help>
+    <completionHelp>
+      <list>level-1 level-1-2 level-2</list>
+    </completionHelp>
+    <valueHelp>
+      <format>level-1</format>
+      <description>Act as a station router</description>
+    </valueHelp>
+    <valueHelp>
+      <format>level-1-2</format>
+      <description>Act as both a station and an area router</description>
+    </valueHelp>
+    <valueHelp>
+      <format>level-2</format>
+      <description>Act as an area router</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(level-1|level-1-2|level-2)$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="log-adjacency-changes">
+  <properties>
+    <help>Log adjacency state changes</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="lsp-gen-interval">
+  <properties>
+    <help>Minimum interval between regenerating same LSP</help>
+    <valueHelp>
+      <format>u32:1-120</format>
+      <description>Minimum interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-120"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="lsp-mtu">
+  <properties>
+    <help>Configure the maximum size of generated LSPs</help>
+    <valueHelp>
+      <format>u32:128-4352</format>
+      <description>Maximum size of generated LSPs</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 128-4352"/>
+    </constraint>
+  </properties>
+  <defaultValue>1497</defaultValue>
+</leafNode>
+<leafNode name="lsp-refresh-interval">
+  <properties>
+    <help>LSP refresh interval</help>
+    <valueHelp>
+      <format>u32:1-65235</format>
+      <description>LSP refresh interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65235"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="max-lsp-lifetime">
+  <properties>
+    <help>Maximum LSP lifetime</help>
+    <valueHelp>
+      <format>u32:350-65535</format>
+      <description>LSP lifetime in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="metric-style">
+  <properties>
+    <help>Use old-style (ISO 10589) or new-style packet formats</help>
+    <completionHelp>
+      <list>narrow transition wide</list>
+    </completionHelp>
+    <valueHelp>
+      <format>narrow</format>
+      <description>Use old style of TLVs with narrow metric</description>
+    </valueHelp>
+    <valueHelp>
+      <format>transition</format>
+      <description>Send and accept both styles of TLVs during transition</description>
+    </valueHelp>
+    <valueHelp>
+      <format>wide</format>
+      <description>Use new style of TLVs to carry wider metric</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(narrow|transition|wide)$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="net">
+  <properties>
+    <help>A Network Entity Title for this process (ISO only)</help>
+    <valueHelp>
+      <format>XX.XXXX. ... .XXX.XX</format>
+      <description>Network entity title (NET)</description>
+    </valueHelp>
+    <constraint>
+      <regex>[a-fA-F0-9]{2}(\.[a-fA-F0-9]{4}){3,9}\.[a-fA-F0-9]{2}</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="purge-originator">
+  <properties>
+    <help>Use the RFC 6232 purge-originator</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<node name="traffic-engineering">
+  <properties>
+    <help>Show IS-IS neighbor adjacencies</help>
+  </properties>
+  <children>
+    <leafNode name="enable">
+      <properties>
+        <help>Enable MPLS traffic engineering extensions</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+<!--
+    <node name="inter-as">
+      <properties>
+        <help>MPLS traffic engineering inter-AS support</help>
+      </properties>
+      <children>
+        <leafNode name="level-1">
+          <properties>
+            <help>Area native mode self originate inter-AS LSP with L1 only flooding scope</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+        <leafNode name="level-1-2">
+          <properties>
+            <help>Area native mode self originate inter-AS LSP with L1 and L2 flooding scope</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+        <leafNode name="level-2">
+          <properties>
+            <help>Area native mode self originate inter-AS LSP with L2 only flooding scope</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+    <leafNode name="inter-as">
+      <properties>
+        <help>MPLS traffic engineering inter-AS support</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+-->
+    <leafNode name="address">
+      <properties>
+        <help>MPLS traffic engineering router ID</help>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>IPv4 address</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="segment-routing">
+  <properties>
+    <help>Segment-Routing (SPRING) settings</help>
+  </properties>
+  <children>
+    <leafNode name="enable">
+      <properties>
+        <help>Enable segment-routing functionality</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <node name="global-block">
+      <properties>
+        <help>Global block label range</help>
+      </properties>
+      <children>
+        <leafNode name="low-label-value">
+          <properties>
+            <help>The lower bound of the global block</help>
+            <valueHelp>
+              <format>u32:16-1048575</format>
+              <description>MPLS label value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 16-1048575"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="high-label-value">
+          <properties>
+            <help>The upper bound of the global block</help>
+            <valueHelp>
+              <format>u32:16-1048575</format>
+              <description>MPLS label value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 16-1048575"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+<!--
+    <node name="local-block">
+      <properties>
+        <help>Local Block label range</help>
+      </properties>
+      <children>
+        <leafNode name="low-label-value">
+          <properties>
+            <help>The lower bound of the local block</help>
+            <valueHelp>
+              <format>u32:16-1048575</format>
+              <description>MPLS label value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="  range 16-1048575"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="high-label-value">
+          <properties>
+            <help>The upper bound of the local block</help>
+            <valueHelp>
+              <format>u32:16-1048575</format>
+              <description>MPLS label value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="  range 16-1048575"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+-->
+    <leafNode name="maximum-label-depth">
+      <properties>
+        <help>Maximum MPLS labels allowed for this router</help>
+        <valueHelp>
+          <format>u32:1-16</format>
+            <description>MPLS label depth</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-16"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <tagNode name="prefix">
+      <properties>
+        <help>Static IPv4/IPv6 prefix segment/label mapping</help>
+        <valueHelp>
+          <format>ipv4net</format>
+          <description>IPv4 prefix segment</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv6net</format>
+          <description>IPv6 prefix segment</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv4-prefix"/>
+          <validator name="ipv6-prefix"/>
+        </constraint>
+      </properties>
+      <children>
+        <node name="absolute">
+          <properties>
+            <help>Specify the absolute value of prefix segment/label ID</help>
+          </properties>
+          <children>
+            <leafNode name="value">
+              <properties>
+                <help>Specify the absolute value of prefix segment/label ID</help>
+                <valueHelp>
+                  <format>u32:16-1048575</format>
+                    <description>The absolute segment/label ID value</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 16-1048575"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="explicit-null">
+              <properties>
+                <help>Request upstream neighbor to replace segment/label with explicit null label</help>
+                <valueless/>
+              </properties>
+            </leafNode>
+            <leafNode name="no-php-flag">
+              <properties>
+                <help>Do not request penultimate hop popping for segment/label</help>
+                <valueless/>
+              </properties>
+            </leafNode>
+          </children>
+        </node>
+        <node name="index">
+          <properties>
+            <help>Specify the index value of prefix segment/label ID</help>
+          </properties>
+          <children>
+            <leafNode name="value">
+              <properties>
+                <help>Specify the index value of prefix segment/label ID</help>
+                <valueHelp>
+                  <format>u32:0-65535</format>
+                    <description>The index segment/label ID value</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 0-65535"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="explicit-null">
+              <properties>
+                <help>Request upstream neighbor to replace segment/label with explicit null label</help>
+                <valueless/>
+              </properties>
+            </leafNode>
+            <leafNode name="no-php-flag">
+              <properties>
+                <help>Do not request penultimate hop popping for segment/label</help>
+                <valueless/>
+              </properties>
+            </leafNode>
+          </children>
+        </node>
+      </children>
+    </tagNode>
+  </children>
+</node>
+<node name="redistribute">
+  <properties>
+    <help>Redistribute information from another routing protocol</help>
+  </properties>
+  <children>
+    <node name="ipv4">
+      <properties>
+        <help>Redistribute IPv4 routes</help>
+      </properties>
+      <children>
+        <node name="bgp">
+          <properties>
+            <help>Border Gateway Protocol (BGP)</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="connected">
+          <properties>
+            <help>Redistribute connected routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="kernel">
+          <properties>
+            <help>Redistribute kernel routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="ospf">
+          <properties>
+            <help>Redistribute OSPF routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="rip">
+          <properties>
+            <help>Redistribute RIP routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="static">
+          <properties>
+            <help>Redistribute static routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+      </children>
+    </node>
+    <node name="ipv6">
+      <properties>
+        <help>Redistribute IPv6 routes</help>
+      </properties>
+      <children>
+        <node name="bgp">
+          <properties>
+            <help>Redistribute BGP routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="connected">
+          <properties>
+            <help>Redistribute connected routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="kernel">
+          <properties>
+            <help>Redistribute kernel routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="ospf6">
+          <properties>
+            <help>Redistribute OSPFv3 routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="ripng">
+          <properties>
+            <help>Redistribute RIPng routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+        <node name="static">
+          <properties>
+            <help>Redistribute static routes into IS-IS</help>
+          </properties>
+          <children>
+            #include <include/isis/redistribute-level-1-2.xml.i>
+          </children>
+        </node>
+      </children>
+    </node>
+  </children>
+</node>
+<leafNode name="set-attached-bit">
+  <properties>
+    <help>Set attached bit to identify as L1/L2 router for inter-area traffic</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="set-overload-bit">
+  <properties>
+    <help>Set overload bit to avoid any transit traffic</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<node name="spf-delay-ietf">
+  <properties>
+    <help>IETF SPF delay algorithm</help>
+  </properties>
+  <children>
+    <leafNode name="init-delay">
+      <properties>
+        <help>Delay used while in QUIET state</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Delay used while in QUIET state (in ms)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="short-delay">
+      <properties>
+        <help>Delay used while in SHORT_WAIT state</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Delay used while in SHORT_WAIT state (in ms)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="long-delay">
+      <properties>
+        <help>Delay used while in LONG_WAIT</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Delay used while in LONG_WAIT state in ms</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="holddown">
+      <properties>
+        <help>Time with no received IGP events before considering IGP stable</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Time with no received IGP events before considering IGP stable in ms</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="time-to-learn">
+      <properties>
+        <help>Maximum duration needed to learn all the events related to a single failure</help>
+        <valueHelp>
+          <format>u32:0-60000</format>
+          <description>Maximum duration needed to learn all the events related to a single failure in ms</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-60000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<leafNode name="spf-interval">
+  <properties>
+    <help>Minimum interval between SPF calculations</help>
+    <valueHelp>
+      <format>u32:1-120</format>
+      <description>Interval in seconds</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-120"/>
+    </constraint>
+  </properties>
+</leafNode>
+<tagNode name="interface">
+  <properties>
+    <help>Interface params</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+  </properties>
+  <children>
+    #include <include/bfd.xml.i>
+    <leafNode name="circuit-type">
+      <properties>
+        <help>Configure circuit type for interface</help>
+        <completionHelp>
+          <list>level-1 level-1-2 level-2-only</list>
+        </completionHelp>
+        <valueHelp>
+          <format>level-1</format>
+          <description>Level-1 only adjacencies are formed</description>
+        </valueHelp>
+        <valueHelp>
+          <format>level-1-2</format>
+          <description>Level-1-2 adjacencies are formed</description>
+        </valueHelp>
+        <valueHelp>
+          <format>level-2-only</format>
+          <description>Level-2 only adjacencies are formed</description>
+        </valueHelp>
+        <constraint>
+          <regex>^(level-1|level-1-2|level-2-only)$</regex>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="hello-padding">
+      <properties>
+        <help>Add padding to IS-IS hello packets</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="hello-interval">
+      <properties>
+        <help>Set Hello interval</help>
+        <valueHelp>
+          <format>u32:1-600</format>
+          <description>Set Hello interval</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 1-600"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="hello-multiplier">
+      <properties>
+        <help>Set Hello interval</help>
+        <valueHelp>
+          <format>u32:2-100</format>
+          <description>Set multiplier for Hello holding time</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 2-100"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    #include <include/isis/metric.xml.i>
+    <node name="network">
+      <properties>
+        <help>Set network type</help>
+      </properties>
+      <children>
+        <leafNode name="point-to-point">
+          <properties>
+            <help>point-to-point network type</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+    #include <include/isis/passive.xml.i>
+    <node name="password">
+      <properties>
+        <help>Configure the authentication password for a circuit</help>
+      </properties>
+      <children>
+        <leafNode name="plaintext-password">
+          <properties>
+            <help>Plain-text authentication type</help>
+            <valueHelp>
+              <format>txt</format>
+              <description>Circuit password</description>
+            </valueHelp>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+    <leafNode name="priority">
+      <properties>
+        <help>Set priority for Designated Router election</help>
+        <valueHelp>
+          <format>u32:0-127</format>
+          <description>Priority value</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-127"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="psnp-interval">
+      <properties>
+        <help>Set PSNP interval</help>
+        <valueHelp>
+          <format>u32:0-127</format>
+          <description>PSNP interval in seconds</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-127"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="no-three-way-handshake">
+      <properties>
+        <help>Disable three-way handshake</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</tagNode>
+#include <include/route-map.xml.i>
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/isis/redistribute-level-1-2.xml.i b/interface-definitions/include/isis/redistribute-level-1-2.xml.i
new file mode 100644
index 000000000..abb85274f
--- /dev/null
+++ b/interface-definitions/include/isis/redistribute-level-1-2.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from isis/redistribute-level-1-2.xml.i -->
+<node name="level-1">
+  <properties>
+    <help>Redistribute into level-1</help>
+  </properties>
+  <children>
+    #include <include/isis/metric.xml.i>
+    #include <include/route-map.xml.i>
+  </children>
+</node>
+<node name="level-2">
+  <properties>
+    <help>Redistribute into level-2</help>
+  </properties>
+  <children>
+    #include <include/isis/metric.xml.i>
+    #include <include/route-map.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp/name-server.xml.i b/interface-definitions/include/name-server-ipv4-ipv6.xml.i
index e744b384f..14973234b 100644
--- a/interface-definitions/include/accel-ppp/name-server.xml.i
+++ b/interface-definitions/include/name-server-ipv4-ipv6.xml.i
@@ -1,7 +1,7 @@
-<!-- include start from accel-ppp/name-server.xml.i -->
+<!-- include start from name-server-ipv4-ipv6.xml.i -->
 <leafNode name="name-server">
   <properties>
-    <help>Domain Name Server (DNS) propagated to client</help>
+    <help>Domain Name Servers (DNS) addresses</help>
     <valueHelp>
       <format>ipv4</format>
       <description>Domain Name Server (DNS) IPv4 address</description>
diff --git a/interface-definitions/include/name-server-ipv4.xml.i b/interface-definitions/include/name-server-ipv4.xml.i
new file mode 100644
index 000000000..0cf884e03
--- /dev/null
+++ b/interface-definitions/include/name-server-ipv4.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from name-server-ipv4.xml.i -->
+<leafNode name="name-server">
+  <properties>
+    <help>Domain Name Servers (DNS) addresses</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Domain Name Server (DNS) IPv4 address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/name-server-ipv6.xml.i b/interface-definitions/include/name-server-ipv6.xml.i
new file mode 100644
index 000000000..d4517c4c6
--- /dev/null
+++ b/interface-definitions/include/name-server-ipv6.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from name-server-ipv6.xml.i -->
+<leafNode name="name-server">
+  <properties>
+    <help>Domain Name Servers (DNS) addresses</help>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>Domain Name Server (DNS) IPv6 address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv6-address"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index 579d19bdd..084f1f722 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -278,7 +278,7 @@
           <description>Robust Header Compression</description>
         </valueHelp>
         <valueHelp>
-          <format>0-255</format>
+          <format>u32:0-255</format>
           <description>IP protocol number</description>
         </valueHelp>
         <constraint>
diff --git a/interface-definitions/include/pppoe-access-concentrator.xml.i b/interface-definitions/include/pppoe-access-concentrator.xml.i
new file mode 100644
index 000000000..ccfcc1c49
--- /dev/null
+++ b/interface-definitions/include/pppoe-access-concentrator.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from pppoe-access-concentrator.xml.i -->
+<leafNode name="access-concentrator">
+  <properties>
+    <help>Access concentrator name</help>
+    <constraint>
+      <regex>[a-zA-Z0-9]{1,100}</regex>
+    </constraint>
+    <constraintErrorMessage>Access-concentrator name must be alphanumerical only (max. 100 characters)</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/route-map.xml.i b/interface-definitions/include/route-map.xml.i
new file mode 100644
index 000000000..88092b7d4
--- /dev/null
+++ b/interface-definitions/include/route-map.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from route-map.xml.i -->
+<leafNode name="route-map">
+  <properties>
+    <help>Specify route-map name to use</help>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route map name</description>
+    </valueHelp>
+    <constraint>
+      <regex>^[-_a-zA-Z0-9.]+$</regex>
+    </constraint>
+    <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/source-address-ipv4.xml.i b/interface-definitions/include/source-address-ipv4.xml.i
index 86235df61..052678113 100644
--- a/interface-definitions/include/source-address-ipv4.xml.i
+++ b/interface-definitions/include/source-address-ipv4.xml.i
@@ -1,7 +1,7 @@
 <!-- include start from source-address-ipv4.xml.i -->
 <leafNode name="source-address">
   <properties>
-    <help>IPv4 source address used to initiiate connection</help>
+    <help>IPv4 source address used to initiate connection</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_local_ips.sh --ipv4</script>
     </completionHelp>