1 files changed, 36 insertions, 28 deletions
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index f90a86274..97a40a9dc 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -37,29 +37,45 @@
           </leafNode>
           #include <include/interface-ipv4-options.xml.i>
           #include <include/interface-ipv6-options.xml.i>
-          #include <include/source-address-ipv4.xml.i>
-          #include <include/source-interface.xml.i>
           #include <include/interface-mac.xml.i>
           #include <include/interface-mtu-1200-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1450</defaultValue>
           </leafNode>
-          <leafNode name="remote">
+          <node name="parameters">
             <properties>
-              <help>Remote address of VXLAN tunnel</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>Remote IPv4 address of VXLAN tunnel</description>
-              </valueHelp>
-              <valueHelp>
-                <format>ipv6</format>
-                <description>Remote IPv6 address of VXLAN tunnel</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ip-address"/>
-              </constraint>
+              <help>VXLAN tunnel parameters</help>
             </properties>
-          </leafNode>
+            <children>
+              <node name="ip">
+                <properties>
+                  <help>IPv4 specific tunnel parameters</help>
+                </properties>
+                <children>
+                  #include <include/interface-parameters-dont-fragment.xml.i>
+                  #include <include/interface-parameters-tos.xml.i>
+                  #include <include/interface-parameters-ttl.xml.i>
+                  <leafNode name="ttl">
+                    <defaultValue>16</defaultValue>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="ipv6">
+                <properties>
+                  <help>IPv6 specific tunnel parameters</help>
+                </properties>
+                <children>
+                  #include <include/interface-parameters-flowlabel.xml.i>
+                </children>
+              </node>
+              <leafNode name="nolearning">
+                <properties>
+                  <help>Do not add unknown addresses into forwarding database</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
           <leafNode name="port">
             <properties>
               <help>Destination port of VXLAN tunnel (default: 8472)</help>
@@ -73,18 +89,10 @@
             </properties>
             <defaultValue>8472</defaultValue>
           </leafNode>
-          <leafNode name="vni">
-            <properties>
-              <help>Virtual Network Identifier</help>
-              <valueHelp>
-                <format>0-16777214</format>
-                <description>VXLAN virtual network identifier</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 0-16777214"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/source-address-ipv4-ipv6.xml.i>
+          #include <include/source-interface.xml.i>
+          #include <include/tunnel-remote.xml.i>
+          #include <include/vni.xml.i>
         </children>
       </tagNode>
     </children>