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 +++---
smoketest/scripts/cli/test_interfaces_vxlan.py | 5 +++--
3 files changed, 7 insertions(+), 7 deletions(-)
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>
diff --git a/smoketest/scripts/cli/test_interfaces_vxlan.py b/smoketest/scripts/cli/test_interfaces_vxlan.py
index fcc1b15ce..adbe7138b 100755
--- a/smoketest/scripts/cli/test_interfaces_vxlan.py
+++ b/smoketest/scripts/cli/test_interfaces_vxlan.py
@@ -27,8 +27,9 @@ class VXLANInterfaceTest(BasicInterfaceTest.BaseTest):
cls._test_mtu = True
cls._base_path = ['interfaces', 'vxlan']
cls._options = {
- 'vxlan0': ['vni 10', 'remote 127.0.0.2'],
- 'vxlan1': ['vni 20', 'group 239.1.1.1', 'source-interface eth0'],
+ 'vxlan10': ['vni 10', 'remote 127.0.0.2'],
+ 'vxlan20': ['vni 20', 'group 239.1.1.1', 'source-interface eth0'],
+ 'vxlan30': ['vni 30', 'remote 2001:db8:2000::1', 'source-address 2001:db8:1000::1'],
}
cls._interfaces = list(cls._options)
--
cgit v1.2.3