summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorjack9603301 <jack9603301@163.com>2021-02-05 12:15:30 +0800
committerjack9603301 <jack9603301@163.com>2021-02-05 13:45:55 +0800
commitd86567f57b710d78872745b07416dc6d4ae3d7ab (patch)
tree5728bcc08dcf99d2e8dfc5281c522203a642c4a2 /interface-definitions
parent8413278c90132d2a1eb5e4322d14f207ab485fa4 (diff)
downloadvyos-1x-d86567f57b710d78872745b07416dc6d4ae3d7ab.tar.gz
vyos-1x-d86567f57b710d78872745b07416dc6d4ae3d7ab.zip
tunnel: erspan: T3030: Fixed tunnel option missing
In 8413278c, we left out a parameter in the tunnel that caused the tunnel smoke test to fail. Now, let's add it
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/tunnel-parameters-ip.xml.i85
-rw-r--r--interface-definitions/interfaces-erspan.xml.in9
-rw-r--r--interface-definitions/interfaces-tunnel.xml.in15
3 files changed, 61 insertions, 48 deletions
diff --git a/interface-definitions/include/tunnel-parameters-ip.xml.i b/interface-definitions/include/tunnel-parameters-ip.xml.i
index c304bd3ff..cbecb94a4 100644
--- a/interface-definitions/include/tunnel-parameters-ip.xml.i
+++ b/interface-definitions/include/tunnel-parameters-ip.xml.i
@@ -1,49 +1,42 @@
<!-- included start from tunnel-parameters-ip.xml.i -->
-<node name="ip">
+<leafNode name="ttl">
<properties>
- <help>IPv4 specific tunnel parameters</help>
+ <help>Time to live field</help>
+ <valueHelp>
+ <format>0-255</format>
+ <description>Time to live (default 255)</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 0-255"/>
+ </constraint>
+ <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
</properties>
- <children>
- <leafNode name="ttl">
- <properties>
- <help>Time to live field</help>
- <valueHelp>
- <format>0-255</format>
- <description>Time to live (default 255)</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 0-255"/>
- </constraint>
- <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
- </properties>
- <defaultValue>255</defaultValue>
- </leafNode>
- <leafNode name="tos">
- <properties>
- <help>Type of Service (TOS)</help>
- <valueHelp>
- <format>0-99</format>
- <description>Type of Service (TOS)</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 0-99"/>
- </constraint>
- <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
- </properties>
- <defaultValue>inherit</defaultValue>
- </leafNode>
- <leafNode name="key">
- <properties>
- <help>Tunnel key</help>
- <valueHelp>
- <format>u32</format>
- <description>Tunnel key</description>
- </valueHelp>
- <constraint>
- <validator name="numeric" argument="--range 0-4294967295"/>
- </constraint>
- <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
- </properties>
- </leafNode>
- </children>
-</node>
+ <defaultValue>255</defaultValue>
+</leafNode>
+<leafNode name="tos">
+ <properties>
+ <help>Type of Service (TOS)</help>
+ <valueHelp>
+ <format>0-99</format>
+ <description>Type of Service (TOS)</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 0-99"/>
+ </constraint>
+ <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
+ </properties>
+ <defaultValue>inherit</defaultValue>
+</leafNode>
+<leafNode name="key">
+ <properties>
+ <help>Tunnel key</help>
+ <valueHelp>
+ <format>u32</format>
+ <description>Tunnel key</description>
+ </valueHelp>
+ <constraint>
+ <validator name="numeric" argument="--range 0-4294967295"/>
+ </constraint>
+ <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
+ </properties>
+</leafNode>
diff --git a/interface-definitions/interfaces-erspan.xml.in b/interface-definitions/interfaces-erspan.xml.in
index afc29a658..64b3af61a 100644
--- a/interface-definitions/interfaces-erspan.xml.in
+++ b/interface-definitions/interfaces-erspan.xml.in
@@ -46,7 +46,14 @@
<help>ERSPAN Tunnel parameters</help>
</properties>
<children>
- #include <include/tunnel-parameters-ip.xml.i>
+ <node name="ip">
+ <properties>
+ <help>IPv4 specific tunnel parameters</help>
+ </properties>
+ <children>
+ #include <include/tunnel-parameters-ip.xml.i>
+ </children>
+ </node>
<leafNode name="version">
<properties>
<help>ERSPAN version number setting(default:1)</help>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index 279c05cca..45573a826 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -140,7 +140,20 @@
<help>Tunnel parameters</help>
</properties>
<children>
- #include <include/tunnel-parameters-ip.xml.i>
+ <node name="ip">
+ <properties>
+ <help>IPv4 specific tunnel parameters</help>
+ </properties>
+ <children>
+ <leafNode name="no-pmtu-discovery">
+ <properties>
+ <help>Disable path MTU discovery</help>
+ <valueless/>
+ </properties>
+ </leafNode>
+ #include <include/tunnel-parameters-ip.xml.i>
+ </children>
+ </node>
<node name="ipv6">
<properties>
<help>IPv6 specific tunnel parameters</help>