summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-04-09 13:40:04 +0200
committerChristian Poessinger <christian@poessinger.com>2021-04-09 13:40:04 +0200
commit616379793c6510ff69fb5707e7481953eac2ef2b (patch)
treefcf98a0ad4dd9f5c7d80f84f70d1b2de34ded880 /interface-definitions
parent6f5f8d6ce273eb7bd02a9513b15c5fd00caad12e (diff)
downloadvyos-1x-616379793c6510ff69fb5707e7481953eac2ef2b.tar.gz
vyos-1x-616379793c6510ff69fb5707e7481953eac2ef2b.zip
tunnel: T3030: re-enable erspan version 2 support
This was not possible due to a regression in iproute2 where the erspan_dir key did not have a value. See [1] for more information. [1]: https://lore.kernel.org/netdev/3ac544c09842410fb863b332917a03ad@poessinger.com/
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/interfaces-tunnel.xml.in12
1 files changed, 2 insertions, 10 deletions
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index e4bdcb3d7..536edcb99 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -158,9 +158,6 @@
<help>ERSPAN Tunnel parameters</help>
</properties>
<children>
-
-<!---
-Temporary disabled b/c of https://github.com/shemminger/iproute2/issues/41
<leafNode name="direction">
<properties>
<help>Specifies mirrored traffic direction</help>
@@ -188,12 +185,10 @@ Temporary disabled b/c of https://github.com/shemminger/iproute2/issues/41
<description>Unique identifier of ERSPAN engine</description>
</valueHelp>
<constraint>
-fix double hyphen below ...
- <validator name="numeric" argument="- -range 0-1048575"/>
+ <validator name="numeric" argument="--range 0-1048575"/>
</constraint>
</properties>
</leafNode>
--->
<leafNode name="index">
<properties>
<help>Specifify ERSPAN version 1 index field</help>
@@ -213,15 +208,12 @@ fix double hyphen below ...
<format>1</format>
<description>ERSPAN Type II</description>
</valueHelp>
-<!--
-Temporary disabled b/c of https://github.com/shemminger/iproute2/issues/41
<valueHelp>
<format>2</format>
<description>ERSPAN Type III</description>
</valueHelp>
--->
<constraint>
- <validator name="numeric" argument="--range 1-1"/>
+ <validator name="numeric" argument="--range 1-2"/>
</constraint>
</properties>
<defaultValue>1</defaultValue>