Merge branch 'current' into 2fa

author: Kim <kim.sidney@gmail.com> 2021-10-07 16:52:56 +0200
committer: GitHub <noreply@github.com> 2021-10-07 16:52:56 +0200
commit: 2274dbf9047493a00a6f30346b38dacd8cfcf965 (patch)
tree: f431f5f6f1b2770c98ed9047e1cec9209e536366 /interface-definitions/include
parent: 2acfffab8b98238e7d869673a858a4ae21651f0b (diff)
parent: adc7ef387d40e92bd7163ee6b401e99e554394a3 (diff)
download: vyos-1x-2274dbf9047493a00a6f30346b38dacd8cfcf965.tar.gz
vyos-1x-2274dbf9047493a00a6f30346b38dacd8cfcf965.zip
83 files changed, 685 insertions, 420 deletions
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/radius-additions.xml.i b/interface-definitions/include/accel-ppp/radius-additions.xml.i
index fdcff36bf..258ece2b5 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-common.xml.i b/interface-definitions/include/bfd-common.xml.i
index b47b47612..1d6ab5d55 100644
--- a/interface-definitions/include/bfd-common.xml.i
+++ b/interface-definitions/include/bfd-common.xml.i
@@ -14,7 +14,7 @@
       <properties>
         <help>Minimum interval of receiving control packets</help>
         <valueHelp>
-          <format>10-60000</format>
+          <format>u32:10-60000</format>
           <description>Interval in milliseconds</description>
         </valueHelp>
         <constraint>
@@ -27,7 +27,7 @@
       <properties>
         <help>Minimum interval of transmitting control packets</help>
         <valueHelp>
-          <format>10-60000</format>
+          <format>u32:10-60000</format>
           <description>Interval in milliseconds</description>
         </valueHelp>
         <constraint>
@@ -40,7 +40,7 @@
       <properties>
         <help>Multiplier to determine packet loss</help>
         <valueHelp>
-          <format>2-255</format>
+          <format>u32:2-255</format>
           <description>Remote transmission interval will be multiplied by this value</description>
         </valueHelp>
         <constraint>
@@ -53,7 +53,7 @@
       <properties>
         <help>Echo receive transmission interval</help>
         <valueHelp>
-          <format>10-60000</format>
+          <format>u32:10-60000</format>
           <description>The minimal echo receive transmission interval that this system is capable of handling</description>
         </valueHelp>
         <constraint>
diff --git a/interface-definitions/include/bgp/afi-export-import.xml.i b/interface-definitions/include/bgp/afi-export-import.xml.i
new file mode 100644
index 000000000..86817cdb3
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-export-import.xml.i
@@ -0,0 +1,41 @@
+<!-- include start from bgp/afi-export-import.xml.i -->
+<node name="export">
+  <properties>
+    <help>Export routes from this address-family</help>
+  </properties>
+  <children>
+    <leafNode name="vpn">
+      <properties>
+        <help>to/from default instance VPN RIB</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="import">
+  <properties>
+    <help>Import routes to this address-family</help>
+  </properties>
+  <children>
+    <leafNode name="vpn">
+      <properties>
+        <help>to/from default instance VPN RIB</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="vrf">
+      <properties>
+        <help>VRF to import from</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>VRF instance name</description>
+        </valueHelp>
+        <completionHelp>
+          <path>vrf name</path>
+        </completionHelp>
+        <multi/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-l2vpn-common.xml.i b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
index 1673f25a5..8deb189ab 100644
--- a/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
+++ b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
@@ -11,17 +11,48 @@
     <valueless/>
   </properties>
 </leafNode>
-<leafNode name="rd">
+#include <include/bgp/route-distinguisher.xml.i>
+<node name="route-target">
   <properties>
-    <help>Route Distinguisher</help>
-    <valueHelp>
-      <format>txt</format>
-      <description>Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy)</description>
-    </valueHelp>
-    <constraint>
-      <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-    </constraint>
+    <help>Route Target</help>
   </properties>
-</leafNode>
-#include <include/bgp/route-target.xml.i>
+  <children>
+    <leafNode name="both">
+      <properties>
+        <help>Route Target both import and export</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Route target (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="bgp-route-target" argument="--single"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="import">
+      <properties>
+        <help>Route Target import</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Route target (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="bgp-route-target" argument="--single"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="export">
+      <properties>
+        <help>Route Target export</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Route target (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="bgp-route-target" argument="--single"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-label.xml.i b/interface-definitions/include/bgp/afi-label.xml.i
new file mode 100644
index 000000000..f7a1f609f
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-label.xml.i
@@ -0,0 +1,36 @@
+<!-- include start from bgp/afi-label.xml.i -->
+<node name="label">
+  <properties>
+    <help>Label value for VRF</help>
+  </properties>
+  <children>
+    <node name="vpn">
+      <properties>
+        <help>Between current address-family and VPN</help>
+      </properties>
+      <children>
+        <leafNode name="export">
+          <properties>
+            <help>For routes leaked from current address-family to VPN</help>
+            <completionHelp>
+              <list>auto</list>
+            </completionHelp>
+            <valueHelp>
+              <format>auto</format>
+              <description>Automatically assign a label</description>
+            </valueHelp>
+            <valueHelp>
+              <format>u32:0-1048575</format>
+              <description>Label Value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 0-1048575"/>
+              <regex>^(auto)$</regex>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-path-limit.xml.i b/interface-definitions/include/bgp/afi-path-limit.xml.i
new file mode 100644
index 000000000..e3d630a57
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-path-limit.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from bgp/afi-path-limit.xml.i -->
+<leafNode name="path-limit">
+  <properties>
+    <help>AS-path hopcount limit</help>
+    <valueHelp>
+      <format>u32:0-255</format>
+      <description>AS path hop count limit</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-rd.xml.i b/interface-definitions/include/bgp/afi-rd.xml.i
new file mode 100644
index 000000000..c4d29268c
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-rd.xml.i
@@ -0,0 +1,28 @@
+<!-- include start from bgp/afi-rd.xml.i -->
+<node name="rd">
+  <properties>
+    <help>Specify route distinguisher</help>
+  </properties>
+  <children>
+    <node name="vpn">
+      <properties>
+        <help>Between current address-family and VPN</help>
+      </properties>
+      <children>
+        <leafNode name="export">
+          <properties>
+            <help>For routes leaked from current address-family to VPN</help>
+            <valueHelp>
+              <format>ASN:NN_OR_IP-ADDRESS:NN</format>
+              <description>Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy)</description>
+            </valueHelp>
+            <constraint>
+              <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map-export-import.xml.i b/interface-definitions/include/bgp/afi-route-map-export-import.xml.i
new file mode 100644
index 000000000..eae10d312
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-route-map-export-import.xml.i
@@ -0,0 +1,34 @@
+<!-- include start from bgp/afi-route-map.xml.i -->
+<leafNode name="export">
+  <properties>
+    <help>Route-map to filter outgoing route updates</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>
+<leafNode name="import">
+  <properties>
+    <help>Route-map to filter incoming route updates</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/bgp/afi-route-map-vpn.xml.i b/interface-definitions/include/bgp/afi-route-map-vpn.xml.i
new file mode 100644
index 000000000..e6be113c5
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-route-map-vpn.xml.i
@@ -0,0 +1,17 @@
+<!-- include start from bgp/afi-route-map-vpn.xml.i -->
+<node name="route-map">
+  <properties>
+    <help>Route-map to filter route updates to/from this peer</help>
+  </properties>
+  <children>
+    <node name="vpn">
+      <properties>
+        <help>Between current address-family and VPN</help>
+      </properties>
+      <children>
+        #include <include/bgp/afi-route-map-export-import.xml.i>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map.xml.i b/interface-definitions/include/bgp/afi-route-map.xml.i
index 24a5ddd12..0b6178176 100644
--- a/interface-definitions/include/bgp/afi-route-map.xml.i
+++ b/interface-definitions/include/bgp/afi-route-map.xml.i
@@ -4,38 +4,7 @@
     <help>Route-map to filter route updates to/from this peer</help>
   </properties>
   <children>
-    <leafNode name="export">
-      <properties>
-        <help>Route-map to filter outgoing route updates</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>
-    <leafNode name="import">
-      <properties>
-        <help>Route-map to filter incoming route updates</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 <include/bgp/afi-route-map-export-import.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-target-vpn.xml.i b/interface-definitions/include/bgp/afi-route-target-vpn.xml.i
new file mode 100644
index 000000000..1dc184a02
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-route-target-vpn.xml.i
@@ -0,0 +1,52 @@
+<!-- include start from bgp/route-target-both.xml.i -->
+<node name="route-target">
+  <properties>
+    <help>Specify route distinguisher</help>
+  </properties>
+  <children>
+    <node name="vpn">
+      <properties>
+        <help>Between current address-family and VPN</help>
+      </properties>
+      <children>
+        <leafNode name="both">
+          <properties>
+            <help>Route Target both import and export</help>
+            <valueHelp>
+              <format>txt</format>
+              <description>Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="bgp-route-target" argument="--multi"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="import">
+          <properties>
+            <help>Route Target import</help>
+            <valueHelp>
+              <format>txt</format>
+              <description>Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="bgp-route-target" argument="--multi"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="export">
+          <properties>
+            <help>Route Target export</help>
+            <valueHelp>
+              <format>txt</format>
+              <description>Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="bgp-route-target" argument="--multi"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/neighbor-description.xml.i b/interface-definitions/include/bgp/neighbor-description.xml.i
deleted file mode 100644
index 3095d2560..000000000
--- a/interface-definitions/include/bgp/neighbor-description.xml.i
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- include start from bgp/neighbor-description.xml.i -->
-<leafNode name="description">
-  <properties>
-    <help>Neighbor specific description</help>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/bgp/neighbor-local-as.xml.i b/interface-definitions/include/bgp/neighbor-local-as.xml.i
index 28c6b72b6..8868e3093 100644
--- a/interface-definitions/include/bgp/neighbor-local-as.xml.i
+++ b/interface-definitions/include/bgp/neighbor-local-as.xml.i
@@ -1,22 +1,29 @@
 <!-- include start from bgp/neighbor-local-as.xml.i -->
 <tagNode name="local-as">
   <properties>
-    <help>Local AS number [REQUIRED]</help>
+    <help>Specify alternate ASN for this BGP process</help>
     <valueHelp>
       <format>u32:1-4294967294</format>
-      <description>Local AS number</description>
+      <description>Autonomous System Number (ASN)</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-4294967294"/>
     </constraint>
   </properties>
   <children>
-    <leafNode name="no-prepend">
+    <node name="no-prepend">
       <properties>
-        <help>Disable prepending local-as to updates from EBGP peers</help>
-        <valueless/>
+        <help>Disable prepending local-as from/to updates for eBGP peers</help>
       </properties>
-    </leafNode>
+      <children>
+        <leafNode name="replace-as">
+          <properties>
+            <help>Prepend only local-as from/to updates for eBGP peers</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 5080ce588..2dfae517e 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -93,6 +93,9 @@
             </tagNode>
           </children>
         </node>
+        #include <include/bgp/afi-export-import.xml.i>
+        #include <include/bgp/afi-label.xml.i>
+        #include <include/bgp/afi-maximum-paths.xml.i>
         <tagNode name="network">
           <properties>
             <help>BGP network</help>
@@ -114,7 +117,9 @@
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
-        #include <include/bgp/afi-maximum-paths.xml.i>
+        #include <include/bgp/afi-rd.xml.i>
+        #include <include/bgp/afi-route-map-vpn.xml.i>
+        #include <include/bgp/afi-route-target-vpn.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
@@ -372,18 +377,7 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="rd">
-              <properties>
-                <help>Route Distinguisher</help>
-                <valueHelp>
-                  <format>txt</format>
-                  <description>Route Distinguisher, asn:xxx</description>
-                </valueHelp>
-                <constraint>
-                  <regex>^[0-9]{1,10}:[0-9]{1,5}$</regex>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/route-distinguisher.xml.i>
             <leafNode name="label">
               <properties>
                 <help>MPLS label value assigned to route</help>
@@ -489,6 +483,9 @@
             </tagNode>
           </children>
         </node>
+        #include <include/bgp/afi-export-import.xml.i>
+        #include <include/bgp/afi-label.xml.i>
+        #include <include/bgp/afi-maximum-paths.xml.i>
         <tagNode name="network">
           <properties>
             <help>BGP network</help>
@@ -501,22 +498,13 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="path-limit">
-              <properties>
-                <help>AS-path hopcount limit</help>
-                <valueHelp>
-                  <format>u32:0-255</format>
-                  <description>AS path hop count limit</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-255"/>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/afi-path-limit.xml.i>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
-        #include <include/bgp/afi-maximum-paths.xml.i>
+        #include <include/bgp/afi-rd.xml.i>
+        #include <include/bgp/afi-route-map-vpn.xml.i>
+        #include <include/bgp/afi-route-target-vpn.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
@@ -672,18 +660,7 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="path-limit">
-              <properties>
-                <help>AS-path hopcount limit</help>
-                <valueHelp>
-                  <format>u32:0-255</format>
-                  <description>AS path hop count limit</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-255"/>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/afi-path-limit.xml.i>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
@@ -772,18 +749,7 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="rd">
-              <properties>
-                <help>Route Distinguisher</help>
-                <valueHelp>
-                  <format>txt</format>
-                  <description>Route Distinguisher, asn:xxx</description>
-                </valueHelp>
-                <constraint>
-                  <regex>^[0-9]{1,10}:[0-9]{1,5}$</regex>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/route-distinguisher.xml.i>
             <leafNode name="label">
               <properties>
                 <help>MPLS label value assigned to route</help>
@@ -994,9 +960,9 @@
         </constraint>
       </properties>
     </leafNode>
+    #include <include/generic-description.xml.i>
     #include <include/bgp/neighbor-bfd.xml.i>
     #include <include/bgp/neighbor-capability.xml.i>
-    #include <include/bgp/neighbor-description.xml.i>
     #include <include/bgp/neighbor-disable-capability-negotiation.xml.i>
     #include <include/bgp/neighbor-disable-connected-check.xml.i>
     #include <include/bgp/neighbor-ebgp-multihop.xml.i>
@@ -1008,6 +974,7 @@
       <children>
         #include <include/bgp/peer-group.xml.i>
         #include <include/bgp/remote-as.xml.i>
+        #include <include/source-interface.xml.i>
         <node name="v6only">
           <properties>
             <help>Enable BGP with v6 link-local only</help>
@@ -1286,12 +1253,6 @@
             </constraint>
           </properties>
         </leafNode>
-        <leafNode name="no-ipv4-unicast">
-          <properties>
-            <help>Deactivate IPv4 unicast for a peer by default</help>
-            <valueless/>
-          </properties>
-        </leafNode>
       </children>
     </node>
     <leafNode name="deterministic-med">
@@ -1452,9 +1413,9 @@
         #include <include/bgp/neighbor-afi-l2vpn-evpn.xml.i>
       </children>
     </node>
+    #include <include/generic-description.xml.i>
     #include <include/bgp/neighbor-bfd.xml.i>
     #include <include/bgp/neighbor-capability.xml.i>
-    #include <include/bgp/neighbor-description.xml.i>
     #include <include/bgp/neighbor-disable-capability-negotiation.xml.i>
     #include <include/bgp/neighbor-disable-connected-check.xml.i>
     #include <include/bgp/neighbor-ebgp-multihop.xml.i>
diff --git a/interface-definitions/include/bgp/route-distinguisher.xml.i b/interface-definitions/include/bgp/route-distinguisher.xml.i
new file mode 100644
index 000000000..6d0aa3ef1
--- /dev/null
+++ b/interface-definitions/include/bgp/route-distinguisher.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from bgp/route-distinguisher.xml.i -->
+<leafNode name="rd">
+  <properties>
+    <help>Route Distinguisher</help>
+    <valueHelp>
+      <format>ASN:NN_OR_IP-ADDRESS:NN</format>
+      <description>Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy)</description>
+    </valueHelp>
+    <constraint>
+      <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/route-target.xml.i b/interface-definitions/include/bgp/route-target.xml.i
deleted file mode 100644
index 674b6db15..000000000
--- a/interface-definitions/include/bgp/route-target.xml.i
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- include start from bgp/route-target.xml.i -->
-<node name="route-target">
-  <properties>
-    <help>Route Target</help>
-  </properties>
-  <children>
-    <leafNode name="both">
-      <properties>
-        <help>Route Target both import and export</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
-        </valueHelp>
-        <constraint>
-          <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="export">
-      <properties>
-        <help>Route Target export</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
-        </valueHelp>
-        <constraint>
-          <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="import">
-      <properties>
-        <help>Route Target import</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
-        </valueHelp>
-        <constraint>
-          <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/conntrack-module-disable.xml.i b/interface-definitions/include/conntrack-module-disable.xml.i
deleted file mode 100644
index f891225e0..000000000
--- a/interface-definitions/include/conntrack-module-disable.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from conntrack-module-disable.xml.i -->
-<leafNode name="disable">
-  <properties>
-    <help>Disable connection tracking helper</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/firewall/common-rule.xml.i b/interface-definitions/include/firewall/common-rule.xml.i
index 1ee8da73d..a59c0b390 100644
--- a/interface-definitions/include/firewall/common-rule.xml.i
+++ b/interface-definitions/include/firewall/common-rule.xml.i
@@ -110,7 +110,7 @@
       <description>Both TCP and UDP</description>
     </valueHelp>
     <valueHelp>
-      <format>0-255</format>
+      <format>u32:0-255</format>
       <description>IP protocol number</description>
     </valueHelp>
     <valueHelp>
diff --git a/interface-definitions/include/interface/adjust-mss.xml.i b/interface-definitions/include/interface/adjust-mss.xml.i
new file mode 100644
index 000000000..57019f02c
--- /dev/null
+++ b/interface-definitions/include/interface/adjust-mss.xml.i
@@ -0,0 +1,23 @@
+<!-- include start from interface/adjust-mss.xml.i -->
+<!-- https://datatracker.ietf.org/doc/html/rfc6691 -->
+<leafNode name="adjust-mss">
+  <properties>
+    <help>Adjust TCP MSS value</help>
+    <completionHelp>
+      <list>clamp-mss-to-pmtu</list>
+    </completionHelp>
+    <valueHelp>
+      <format>clamp-mss-to-pmtu</format>
+      <description>Automatically sets the MSS to the proper value</description>
+    </valueHelp>
+    <valueHelp>
+      <format>u32:500-65535</format>
+      <description>TCP Maximum segment size in bytes</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 500-65535"/>
+      <regex>^(clamp-mss-to-pmtu)$</regex>
+    </constraint>
+  </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..cb01d0525 100644
--- a/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
+++ b/interface-definitions/include/interface/arp-cache-timeout.xml.i
@@ -1,9 +1,9 @@
-<!-- include start from interface/interface-arp-cache-timeout.xml.i -->
+<!-- include start from interface/arp-cache-timeout.xml.i -->
 <leafNode name="arp-cache-timeout">
   <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..8579cf7d1 100644
--- a/interface-definitions/include/interface/interface-description.xml.i
+++ b/interface-definitions/include/interface/description.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-description.xml.i -->
+<!-- include start from interface/description.xml.i -->
 <leafNode name="description">
   <properties>
     <help>Interface specific description</help>
diff --git a/interface-definitions/include/interface/dhcpv6-options.xml.i b/interface-definitions/include/interface/dhcpv6-options.xml.i
index ca478a3eb..d1abf4a90 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..30e8c7e97 100644
--- a/interface-definitions/include/interface/interface-dial-on-demand.xml.i
+++ b/interface-definitions/include/interface/dial-on-demand.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-dial-on-demand.xml.i -->
+<!-- include start from interface/dial-on-demand.xml.i -->
 <leafNode name="connect-on-demand">
   <properties>
     <help>Establishment connection automatically when traffic is sent</help>
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..a69455d58 100644
--- a/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
+++ b/interface-definitions/include/interface/disable-arp-filter.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-disable-arp-filter.xml.i -->
+<!-- include start from interface/disable-arp-filter.xml.i -->
 <leafNode name="disable-arp-filter">
   <properties>
     <help>Disable ARP filter on this interface</help>
diff --git a/interface-definitions/include/interface/disable-forwarding.xml.i b/interface-definitions/include/interface/disable-forwarding.xml.i
new file mode 100644
index 000000000..45382ec95
--- /dev/null
+++ b/interface-definitions/include/interface/disable-forwarding.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/disable-forwarding.xml.i -->
+<leafNode name="disable-forwarding">
+  <properties>
+    <help>Disable IP forwarding on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
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..b101ec292 100644
--- a/interface-definitions/include/interface/interface-disable-link-detect.xml.i
+++ b/interface-definitions/include/interface/disable-link-detect.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-disable-link-detect.xml.i -->
+<!-- include start from interface/disable-link-detect.xml.i -->
 <leafNode name="disable-link-detect">
   <properties>
     <help>Ignore link state changes</help>
diff --git a/interface-definitions/include/interface/interface-disable.xml.i b/interface-definitions/include/interface/disable.xml.i
index d90e6395b..b76bd3f53 100644
--- a/interface-definitions/include/interface/interface-disable.xml.i
+++ b/interface-definitions/include/interface/disable.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-disable.xml.i -->
+<!-- include start from interface/disable.xml.i -->
 <leafNode name="disable">
   <properties>
     <help>Administratively disable interface</help>
diff --git a/interface-definitions/include/interface/interface-eapol.xml.i b/interface-definitions/include/interface/eapol.xml.i
index 270ec5b13..c4cdeae0c 100644
--- a/interface-definitions/include/interface/interface-eapol.xml.i
+++ b/interface-definitions/include/interface/eapol.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-eapol.xml.i -->
+<!-- include start from interface/eapol.xml.i -->
 <node name="eapol">
   <properties>
      <help>Extensible Authentication Protocol over Local Area Network</help>
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..90f6bc3db 100644
--- a/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
+++ b/interface-definitions/include/interface/enable-arp-accept.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-enable-arp-accept.xml.i -->
+<!-- include start from interface/enable-arp-accept.xml.i -->
 <leafNode name="enable-arp-accept">
   <properties>
     <help>Enable ARP accept on this interface</help>
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..cf02fce0b 100644
--- a/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
+++ b/interface-definitions/include/interface/enable-arp-announce.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-enable-arp-announce.xml.i -->
+<!-- include start from interface/enable-arp-announce.xml.i -->
 <leafNode name="enable-arp-announce">
   <properties>
     <help>Enable ARP announce on this interface</help>
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..5bb444f35 100644
--- a/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
+++ b/interface-definitions/include/interface/enable-arp-ignore.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-enable-arp-ignore.xml.i -->
+<!-- include start from interface/enable-arp-ignore.xml.i -->
 <leafNode name="enable-arp-ignore">
   <properties>
     <help>Enable ARP ignore on this interface</help>
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..27e497f84 100644
--- a/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
+++ b/interface-definitions/include/interface/enable-proxy-arp.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-enable-proxy-arp.xml.i -->
+<!-- include start from interface/enable-proxy-arp.xml.i -->
 <leafNode name="enable-proxy-arp">
   <properties>
     <help>Enable proxy-arp on this interface</help>
diff --git a/interface-definitions/include/interface/interface-hw-id.xml.i b/interface-definitions/include/interface/hw-id.xml.i
index 989cd9cb7..a3a1eec7c 100644
--- a/interface-definitions/include/interface/interface-hw-id.xml.i
+++ b/interface-definitions/include/interface/hw-id.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-hw-id.xml.i -->
+<!-- include start from interface/hw-id.xml.i -->
 <leafNode name="hw-id">
   <properties>
     <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
diff --git a/interface-definitions/include/interface/interface-disable-forwarding.xml.i b/interface-definitions/include/interface/interface-disable-forwarding.xml.i
deleted file mode 100644
index cb6ef0475..000000000
--- a/interface-definitions/include/interface/interface-disable-forwarding.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-disable-forwarding.xml.i -->
-<leafNode name="disable-forwarding">
-  <properties>
-    <help>Disable IPv4 forwarding on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
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..bca1229c6
--- /dev/null
+++ b/interface-definitions/include/interface/ipv4-options.xml.i
@@ -0,0 +1,19 @@
+<!-- include start from interface/ipv4-options.xml.i -->
+<node name="ip">
+  <properties>
+    <help>IPv4 routing parameters</help>
+  </properties>
+  <children>
+    #include <include/interface/adjust-mss.xml.i>
+    #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..f740ce0c2 100644
--- a/interface-definitions/include/interface/interface-ipv6-options.xml.i
+++ b/interface-definitions/include/interface/ipv6-options.xml.i
@@ -1,11 +1,12 @@
-<!-- include start from interface/interface-ipv6-options.xml.i -->
+<!-- include start from interface/ipv6-options.xml.i -->
 <node name="ipv6">
   <properties>
     <help>IPv6 routing parameters</help>
   </properties>
   <children>
+    #include <include/interface/adjust-mss.xml.i>
+    #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..705330dce 100644
--- a/interface-definitions/include/interface/interface-mac.xml.i
+++ b/interface-definitions/include/interface/mac.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-mac.xml.i -->
+<!-- include start from interface/mac.xml.i -->
 <leafNode name="mac">
   <properties>
     <help>Media Access Control (MAC) address</help>
diff --git a/interface-definitions/include/interface/interface-mirror.xml.i b/interface-definitions/include/interface/mirror.xml.i
index b3b45fb43..2959551f0 100644
--- a/interface-definitions/include/interface/interface-mirror.xml.i
+++ b/interface-definitions/include/interface/mirror.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-mirror.xml.i -->
+<!-- include start from interface/mirror.xml.i -->
 <node name="mirror">
   <properties>
     <help>Incoming/outgoing packet mirroring destination</help>
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..fab053fc1 100644
--- a/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
+++ b/interface-definitions/include/interface/mtu-1200-16000.xml.i
@@ -1,9 +1,9 @@
-<!-- include start from interface/interface-mtu-1200-16000.xml.i -->
+<!-- include start from interface/mtu-1200-16000.xml.i -->
 <leafNode name="mtu">
   <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..1e71eab01 100644
--- a/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
+++ b/interface-definitions/include/interface/mtu-1450-16000.xml.i
@@ -1,9 +1,9 @@
-<!-- include start from interface/interface-mtu-1450-16000.xml.i -->
+<!-- include start from interface/mtu-1450-16000.xml.i -->
 <leafNode name="mtu">
   <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..30c77f768 100644
--- a/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
+++ b/interface-definitions/include/interface/mtu-64-8024.xml.i
@@ -1,9 +1,9 @@
-<!-- include start from interface/interface-mtu-68-8024.xml.i -->
+<!-- include start from interface/mtu-68-8024.xml.i -->
 <leafNode name="mtu">
   <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..693e0be7e 100644
--- a/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
+++ b/interface-definitions/include/interface/mtu-68-1500.xml.i
@@ -1,9 +1,9 @@
-<!-- include start from interface/interface-mtu-68-1500.xml.i -->
+<!-- include start from interface/mtu-68-1500.xml.i -->
 <leafNode name="mtu">
   <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..cb666f470 100644
--- a/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
+++ b/interface-definitions/include/interface/mtu-68-16000.xml.i
@@ -1,9 +1,9 @@
-<!-- include start from interface/interface-mtu-68-16000.xml.i -->
+<!-- include start from interface/mtu-68-16000.xml.i -->
 <leafNode name="mtu">
   <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-dont-fragment.xml.i b/interface-definitions/include/interface/parameters-dont-fragment.xml.i
index 166c31115..d34f0a97b 100644
--- a/interface-definitions/include/interface/interface-parameters-dont-fragment.xml.i
+++ b/interface-definitions/include/interface/parameters-dont-fragment.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-parameters-df.xml.i -->
+<!-- include start from interface/parameters-df.xml.i -->
 <leafNode name="dont-fragment">
   <properties>
     <help>Specifies the usage of the dont fragment (DF) bit</help>
diff --git a/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i b/interface-definitions/include/interface/parameters-flowlabel.xml.i
index ed075e40d..bd0d1e070 100644
--- a/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
+++ b/interface-definitions/include/interface/parameters-flowlabel.xml.i
@@ -1,10 +1,17 @@
-<!-- include start from interface/interface-parameters-flowlabel.xml.i -->
+<!-- include start from interface/parameters-flowlabel.xml.i -->
 <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 6c59f7879..25a6c0303 100644
--- a/interface-definitions/include/interface/interface-parameters-key.xml.i
+++ b/interface-definitions/include/interface/parameters-key.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-parameters-key.xml.i -->
+<!-- include start from interface/parameters-key.xml.i -->
 <leafNode name="key">
   <properties>
     <help>Tunnel key (only GRE tunnels)</help>
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 df193cf24..ade33b4a4 100644
--- a/interface-definitions/include/interface/interface-parameters-ttl.xml.i
+++ b/interface-definitions/include/interface/parameters-ttl.xml.i
@@ -1,13 +1,13 @@
-<!-- include start from interface/interface-parameters-ttl.xml.i -->
+<!-- include start from interface/parameters-ttl.xml.i -->
 <leafNode name="ttl">
   <properties>
     <help>Specifies TTL value to use in outgoing packets</help>
     <valueHelp>
-      <format>0</format>
+      <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..c00b2fe85 100644
--- a/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
+++ b/interface-definitions/include/interface/proxy-arp-pvlan.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-proxy-arp-pvlan.xml.i -->
+<!-- include start from interface/proxy-arp-pvlan.xml.i -->
 <leafNode name="proxy-arp-pvlan">
   <properties>
     <help>Enable private VLAN proxy ARP on this interface</help>
diff --git a/interface-definitions/include/interface/interface-source-validation.xml.i b/interface-definitions/include/interface/source-validation.xml.i
index 70914f2e9..f38065f4d 100644
--- a/interface-definitions/include/interface/interface-source-validation.xml.i
+++ b/interface-definitions/include/interface/source-validation.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-source-validation.xml.i -->
+<!-- include start from interface/source-validation.xml.i -->
 <leafNode name="source-validation">
   <properties>
     <help>Source validation by reversed path (RFC3704)</help>
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 17d1746be..e7ba6d193 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 9e89cbbf6..5644c554f 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>
@@ -45,10 +45,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..5ad978a27 100644
--- a/interface-definitions/include/interface/interface-vrf.xml.i
+++ b/interface-definitions/include/interface/vrf.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-vrf.xml.i -->
+<!-- include start from interface/vrf.xml.i -->
 <leafNode name="vrf">
   <properties>
     <help>VRF instance name</help>
diff --git a/interface-definitions/include/interface/interface-xdp.xml.i b/interface-definitions/include/interface/xdp.xml.i
index 0253f6dad..10223e766 100644
--- a/interface-definitions/include/interface/interface-xdp.xml.i
+++ b/interface-definitions/include/interface/xdp.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from interface/interface-xdp.xml.i -->
+<!-- include start from interface/xdp.xml.i -->
 <leafNode name="xdp">
   <properties>
     <help>Enable eXpress Data Path</help>
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index af5a21f49..84e2f7bb2 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -447,7 +447,7 @@
             <help>Border Gateway Protocol (BGP)</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv4.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="connected">
@@ -455,7 +455,7 @@
             <help>Redistribute connected routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv4.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="kernel">
@@ -463,7 +463,7 @@
             <help>Redistribute kernel routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv4.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="ospf">
@@ -471,7 +471,7 @@
             <help>Redistribute OSPF routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv4.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="rip">
@@ -479,7 +479,7 @@
             <help>Redistribute RIP routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv4.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="static">
@@ -487,7 +487,7 @@
             <help>Redistribute static routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv4.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
       </children>
@@ -502,7 +502,7 @@
             <help>Redistribute BGP routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv6.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="connected">
@@ -510,7 +510,7 @@
             <help>Redistribute connected routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv6.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="kernel">
@@ -518,7 +518,7 @@
             <help>Redistribute kernel routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv6.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="ospf6">
@@ -526,7 +526,7 @@
             <help>Redistribute OSPFv3 routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv6.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="ripng">
@@ -534,7 +534,7 @@
             <help>Redistribute RIPng routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv6.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
         <node name="static">
@@ -542,7 +542,7 @@
             <help>Redistribute static routes into IS-IS</help>
           </properties>
           <children>
-            #include <include/isis/redistribute-ipv6.xml.i>
+            #include <include/isis/redistribute-level-1-2.xml.i>
           </children>
         </node>
       </children>
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 fbb6210c7..000000000
--- a/interface-definitions/include/isis/redistribute-ipv4.xml.i
+++ /dev/null
@@ -1,42 +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>
-    #include <include/route-map.xml.i>
-  </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>
-    #include <include/route-map.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/isis/redistribute-ipv6.xml.i b/interface-definitions/include/isis/redistribute-ipv6.xml.i
deleted file mode 100644
index 7e679e38a..000000000
--- a/interface-definitions/include/isis/redistribute-ipv6.xml.i
+++ /dev/null
@@ -1,42 +0,0 @@
-<!-- include start from isis/redistribute-ipv6.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>
-    #include <include/route-map.xml.i>
-  </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>
-    #include <include/route-map.xml.i>
-  </children>
-</node>
-<!-- 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/ospf/log-adjacency-changes.xml.i b/interface-definitions/include/ospf/log-adjacency-changes.xml.i
new file mode 100644
index 000000000..24c6cbe7a
--- /dev/null
+++ b/interface-definitions/include/ospf/log-adjacency-changes.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from ospf/metric-type.xml.i -->
+<node name="log-adjacency-changes">
+  <properties>
+    <help>Log adjacency state changes</help>
+  </properties>
+  <children>
+    <leafNode name="detail">
+      <properties>
+        <help>Log all state changes</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/metric-type.xml.i b/interface-definitions/include/ospf/metric-type.xml.i
index 83dc24909..ef9fd8ac0 100644
--- a/interface-definitions/include/ospf/metric-type.xml.i
+++ b/interface-definitions/include/ospf/metric-type.xml.i
@@ -4,7 +4,7 @@
     <help>OSPF metric type for default routes (default: 2)</help>
     <valueHelp>
       <format>u32:1-2</format>
-      <description>Metric type for default routes</description>
+      <description>Set OSPF External Type 1/2 metrics</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-2"/>
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index db39b1a86..982e519a9 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -361,6 +361,26 @@
     </constraint>
   </properties>
   <children>
+    <leafNode name="area">
+      <properties>
+        <help>Enable OSPF on this interface</help>
+        <completionHelp>
+          <path>protocols ospf area</path>
+        </completionHelp>
+        <valueHelp>
+          <format>u32</format>
+          <description>OSPF area ID as decimal notation</description>
+        </valueHelp>
+        <valueHelp>
+          <format>ipv4</format>
+          <description>OSPF area ID in IP address notation</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-4294967295"/>
+          <validator name="ip-address"/>
+        </constraint>
+      </properties>
+    </leafNode>
     #include <include/ospf/authentication.xml.i>
     #include <include/ospf/intervals.xml.i>
     #include <include/ospf/interface-common.xml.i>
@@ -418,19 +438,7 @@
     </leafNode>
   </children>
 </tagNode>
-<node name="log-adjacency-changes">
-  <properties>
-    <help>Log adjacency state changes</help>
-  </properties>
-  <children>
-    <leafNode name="detail">
-      <properties>
-        <help>Log all state changes</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-  </children>
-</node>
+#include <include/ospf/log-adjacency-changes.xml.i>
 <node name="max-metric">
   <properties>
     <help>OSPF maximum and infinite-distance metric</help>
@@ -589,7 +597,7 @@
     #include <include/router-id.xml.i>
   </children>
 </node>
-#include <include/routing-passive-interface-xml.i>
+#include <include/routing-passive-interface.xml.i>
 <leafNode name="passive-interface-exclude">
   <properties>
     <help>Interface to exclude when using 'passive-interface default'</help>
@@ -648,7 +656,7 @@
     </node>
     <node name="kernel">
       <properties>
-        <help>Redistribute kernel routes</help>
+        <help>Redistribute Kernel routes</help>
       </properties>
       <children>
         #include <include/ospf/metric.xml.i>
@@ -668,7 +676,7 @@
     </node>
     <node name="static">
       <properties>
-        <help>Redistribute static routes</help>
+        <help>Redistribute statically configured routes</help>
       </properties>
       <children>
         #include <include/ospf/metric.xml.i>
@@ -676,6 +684,23 @@
         #include <include/route-map.xml.i>
       </children>
     </node>
+    <tagNode name="table">
+      <properties>
+        <help>Redistribute non-main Kernel Routing Table</help>
+        <completionHelp>
+          <path>protocols static table</path>
+        </completionHelp>
+        <valueHelp>
+          <format>u32:1-200</format>
+          <description>Policy route table number</description>
+        </valueHelp>
+      </properties>
+      <children>
+        #include <include/ospf/metric.xml.i>
+        #include <include/ospf/metric-type.xml.i>
+        #include <include/route-map.xml.i>
+      </children>
+    </tagNode>
   </children>
 </node>
 <node name="refresh">
diff --git a/interface-definitions/include/pki/ca-certificate.xml.i b/interface-definitions/include/pki/ca-certificate.xml.i
index 14295a281..b32bb676a 100644
--- a/interface-definitions/include/pki/ca-certificate.xml.i
+++ b/interface-definitions/include/pki/ca-certificate.xml.i
@@ -2,13 +2,13 @@
 <leafNode name="ca-certificate">
   <properties>
     <help>Certificate Authority in PKI configuration</help>
-    <valueHelp>
-      <format>CA name</format>
-      <description>Name of CA in PKI configuration</description>
-    </valueHelp>
     <completionHelp>
       <path>pki ca</path>
     </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Name of CA in PKI configuration</description>
+    </valueHelp>
   </properties>
 </leafNode>
 <!-- include end -->
diff --git a/interface-definitions/include/pki/certificate.xml.i b/interface-definitions/include/pki/certificate.xml.i
index 436aa90ba..1ba70e058 100644
--- a/interface-definitions/include/pki/certificate.xml.i
+++ b/interface-definitions/include/pki/certificate.xml.i
@@ -2,13 +2,13 @@
 <leafNode name="certificate">
   <properties>
     <help>Certificate in PKI configuration</help>
-    <valueHelp>
-      <format>cert name</format>
-      <description>Name of certificate in PKI configuration</description>
-    </valueHelp>
     <completionHelp>
       <path>pki certificate</path>
     </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Name of certificate in PKI configuration</description>
+    </valueHelp>
   </properties>
 </leafNode>
 <!-- include end -->
diff --git a/interface-definitions/include/pki/private-key.xml.i b/interface-definitions/include/pki/private-key.xml.i
index 6099daa89..ae4e9103e 100644
--- a/interface-definitions/include/pki/private-key.xml.i
+++ b/interface-definitions/include/pki/private-key.xml.i
@@ -7,13 +7,13 @@
     <leafNode name="key">
       <properties>
         <help>Private key in PKI configuration</help>
-        <valueHelp>
-          <format>key name</format>
-          <description>Name of private key in PKI configuration</description>
-        </valueHelp>
         <completionHelp>
           <path>pki key-pair</path>
         </completionHelp>
+        <valueHelp>
+          <format>txt</format>
+          <description>Name of private key in PKI configuration</description>
+        </valueHelp>
       </properties>
     </leafNode>
     <leafNode name="passphrase">
diff --git a/interface-definitions/include/pki/public-key.xml.i b/interface-definitions/include/pki/public-key.xml.i
index dfc6979fd..3067bff74 100644
--- a/interface-definitions/include/pki/public-key.xml.i
+++ b/interface-definitions/include/pki/public-key.xml.i
@@ -2,13 +2,13 @@
 <leafNode name="public-key">
   <properties>
     <help>Public key in PKI configuration</help>
-    <valueHelp>
-      <format>key name</format>
-      <description>Name of public key in PKI configuration</description>
-    </valueHelp>
     <completionHelp>
       <path>pki key-pair</path>
     </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Name of public key in PKI configuration</description>
+    </valueHelp>
   </properties>
 </leafNode>
 <!-- include end -->
diff --git a/interface-definitions/include/port-number.xml.i b/interface-definitions/include/port-number.xml.i
index b62aef32b..6820df0c4 100644
--- a/interface-definitions/include/port-number.xml.i
+++ b/interface-definitions/include/port-number.xml.i
@@ -9,6 +9,7 @@
     <constraint>
       <validator name="numeric" argument="--range 1-65535"/>
     </constraint>
+    <constraintErrorMessage>Port number must be in range 1 to 65535</constraintErrorMessage>
   </properties>
 </leafNode>
 <!-- include end -->
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/routing-passive-interface-xml.i b/interface-definitions/include/routing-passive-interface.xml.i
index 9bd4dac2a..43dfb5e44 100644
--- a/interface-definitions/include/routing-passive-interface-xml.i
+++ b/interface-definitions/include/routing-passive-interface.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from routing-passive-interface-xml.i -->
+<!-- include start from routing-passive-interface.xml.i -->
 <leafNode name="passive-interface">
   <properties>
     <help>Suppress routing updates on an interface</help>
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>
diff --git a/interface-definitions/include/vni.xml.i b/interface-definitions/include/vni.xml.i
index be45c0c97..36176caa3 100644
--- a/interface-definitions/include/vni.xml.i
+++ b/interface-definitions/include/vni.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Virtual Network Identifier</help>
     <valueHelp>
-      <format>0-16777214</format>
+      <format>u32:0-16777214</format>
       <description>VXLAN virtual network identifier</description>
     </valueHelp>
     <constraint>
diff --git a/interface-definitions/include/vrrp-transition-script.xml.i b/interface-definitions/include/vrrp-transition-script.xml.i
new file mode 100644
index 000000000..cf57c3c74
--- /dev/null
+++ b/interface-definitions/include/vrrp-transition-script.xml.i
@@ -0,0 +1,41 @@
+<!-- include start from vrrp-transition-script.xml.i -->
+<node name="transition-script">
+  <properties>
+    <help>VRRP transition scripts</help>
+  </properties>
+  <children>
+    <leafNode name="master">
+      <properties>
+        <help>Script to run on VRRP state transition to master</help>
+        <constraint>
+          <validator name="script"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="backup">
+      <properties>
+        <help>Script to run on VRRP state transition to backup</help>
+        <constraint>
+          <validator name="script"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="fault">
+      <properties>
+        <help>Script to run on VRRP state transition to fault</help>
+        <constraint>
+          <validator name="script"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="stop">
+      <properties>
+        <help>Script to run on VRRP state transition to stop</help>
+        <constraint>
+          <validator name="script"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
author	Kim <kim.sidney@gmail.com>	2021-10-07 16:52:56 +0200
committer	GitHub <noreply@github.com>	2021-10-07 16:52:56 +0200
commit	2274dbf9047493a00a6f30346b38dacd8cfcf965 (patch)
tree	f431f5f6f1b2770c98ed9047e1cec9209e536366 /interface-definitions/include
parent	2acfffab8b98238e7d869673a858a4ae21651f0b (diff)
parent	adc7ef387d40e92bd7163ee6b401e99e554394a3 (diff)
download	vyos-1x-2274dbf9047493a00a6f30346b38dacd8cfcf965.tar.gz vyos-1x-2274dbf9047493a00a6f30346b38dacd8cfcf965.zip