From d41e8e860a66f45d295081f024aa2918f221443f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 28 Feb 2021 09:16:59 +0100
Subject: vxlan: T3369: add underlay IPv6 support

---
 interface-definitions/include/source-address-ipv4-ipv6.xml.i | 3 +--
 interface-definitions/interfaces-vxlan.xml.in                | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/source-address-ipv4-ipv6.xml.i b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
index 004e04f7b..93cfd7c63 100644
--- a/interface-definitions/include/source-address-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
@@ -14,8 +14,7 @@
       <description>IPv6 source address</description>
     </valueHelp>
     <constraint>
-      <validator name="ipv4-address"/>
-      <validator name="ipv6-address"/>
+      <validator name="ip-address"/>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index efe6218e1..a2ff34186 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -37,14 +37,11 @@
           </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>
-          #include <include/tunnel-remote.xml.i>
           <node name="parameters">
             <properties>
               <help>VXLAN tunnel parameters</help>
@@ -94,6 +91,9 @@
             </properties>
             <defaultValue>8472</defaultValue>
           </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>
-- 
cgit v1.2.3