diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-28 09:16:59 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-02-28 09:20:30 +0100 |
| commit | 3e4ac30427fe2af7a304f7e73eb9ecdb27b1ae99 (patch) | |
| tree | 0b021f7120c8371bbb0913c17022cd9735c23242 | |
| parent | ea10a87430452b5d1def7007dbf6fd349bce4c01 (diff) | |
| download | vyos-1x-3e4ac30427fe2af7a304f7e73eb9ecdb27b1ae99.tar.gz vyos-1x-3e4ac30427fe2af7a304f7e73eb9ecdb27b1ae99.zip | |
vxlan: T3369: add underlay IPv6 support
(cherry picked from commit d41e8e860a66f45d295081f024aa2918f221443f)
| -rw-r--r-- | interface-definitions/include/source-address-ipv4-ipv6.xml.i | 3 | ||||
| -rw-r--r-- | interface-definitions/interfaces-vxlan.xml.in | 6 | ||||
| -rwxr-xr-x | 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 e865ff4c8..a6870c3e2 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> <leafNode name="port"> <properties> <help>Destination port of VXLAN tunnel (default: 8472)</help> @@ -58,6 +55,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> <leafNode name="vni"> <properties> <help>Virtual Network Identifier</help> 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) |