diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-27 21:56:07 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-02-27 21:56:07 +0100 |
| commit | 760f5891018988e5bb6ac88bdd8df6f490a6283f (patch) | |
| tree | a640bf4c802e63e2e66c99cc65223fd272932630 | |
| parent | d55ec755c14b421bfaf4074c2ec83d8d16bd784d (diff) | |
| download | vyos-1x-760f5891018988e5bb6ac88bdd8df6f490a6283f.tar.gz vyos-1x-760f5891018988e5bb6ac88bdd8df6f490a6283f.zip | |
geneve: T2653: add IPv6 support
| -rw-r--r-- | interface-definitions/include/tunnel-remote.xml.i | 18 | ||||
| -rw-r--r-- | interface-definitions/interfaces-geneve.xml.in | 13 | ||||
| -rw-r--r-- | interface-definitions/interfaces-vxlan.xml.in | 17 |
3 files changed, 20 insertions, 28 deletions
diff --git a/interface-definitions/include/tunnel-remote.xml.i b/interface-definitions/include/tunnel-remote.xml.i new file mode 100644 index 000000000..d5b50d3f6 --- /dev/null +++ b/interface-definitions/include/tunnel-remote.xml.i @@ -0,0 +1,18 @@ +<!-- included start from tunnel-remote.xml.i --> +<leafNode name="remote"> + <properties> + <help>Tunnel remote address</help> + <valueHelp> + <format>ipv4</format> + <description>Tunnel remote IPv4 address</description> + </valueHelp> + <valueHelp> + <format>ipv6</format> + <description>Tunnel remote IPv6 address</description> + </valueHelp> + <constraint> + <validator name="ip-address"/> + </constraint> + </properties> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in index 0c776e3c3..1a5b4aafd 100644 --- a/interface-definitions/interfaces-geneve.xml.in +++ b/interface-definitions/interfaces-geneve.xml.in @@ -23,18 +23,7 @@ #include <include/interface-ipv6-options.xml.i> #include <include/interface-mac.xml.i> #include <include/interface-mtu-1450-16000.xml.i> - <leafNode name="remote"> - <properties> - <help>Remote address of GENEVE tunnel</help> - <valueHelp> - <format>ipv4</format> - <description>Remote address of GENEVE tunnel</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> + #include <include/tunnel-remote.xml.i> <leafNode name="vni"> <properties> <help>Virtual Network Identifier</help> diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in index f90a86274..e865ff4c8 100644 --- a/interface-definitions/interfaces-vxlan.xml.in +++ b/interface-definitions/interfaces-vxlan.xml.in @@ -44,22 +44,7 @@ <leafNode name="mtu"> <defaultValue>1450</defaultValue> </leafNode> - <leafNode name="remote"> - <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> - </properties> - </leafNode> + #include <include/tunnel-remote.xml.i> <leafNode name="port"> <properties> <help>Destination port of VXLAN tunnel (default: 8472)</help> |