summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-22 07:24:40 +0200
committerGitHub <noreply@github.com>2020-04-22 07:24:40 +0200
commita6d6dcfa9d0a1e49079c23fa6cad804185afa589 (patch)
tree5adf0c0bef3aa06109e2c228031064b8b7b7fe76 /python
parenta3a4d23ff557216bd9b11b5653457f2b95251301 (diff)
parentd7a67220732ba8dc3d6c3f8a8823685d6e9ed60a (diff)
downloadvyos-1x-a6d6dcfa9d0a1e49079c23fa6cad804185afa589.tar.gz
vyos-1x-a6d6dcfa9d0a1e49079c23fa6cad804185afa589.zip
Merge pull request #372 from thomas-mangin/T2354
tunnel: T2354: do not allow display as bridge option
Diffstat (limited to 'python')
-rw-r--r--python/vyos/ifconfig/tunnel.py16
1 files changed, 15 insertions, 1 deletions
diff --git a/python/vyos/ifconfig/tunnel.py b/python/vyos/ifconfig/tunnel.py
index 690b61366..85c22b5b4 100644
--- a/python/vyos/ifconfig/tunnel.py
+++ b/python/vyos/ifconfig/tunnel.py
@@ -43,7 +43,7 @@ class _Tunnel(Interface):
**{
'section': 'tunnel',
'prefixes': ['tun',],
- 'bridgeable': True,
+ 'bridgeable': False,
},
}
@@ -135,6 +135,13 @@ class GREIf(_Tunnel):
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/tree/ip/link_gre.c
"""
+ definition = {
+ **_Tunnel.definition,
+ **{
+ 'bridgeable': True,
+ },
+ }
+
ip = [IP4, IP6]
tunnel = IP4
@@ -160,6 +167,13 @@ class GRETapIf(_Tunnel):
# no multicast, ttl or tos for gretap
+ definition = {
+ **_Tunnel.definition,
+ **{
+ 'bridgeable': True,
+ },
+ }
+
ip = [IP4, ]
tunnel = IP4