From d7a67220732ba8dc3d6c3f8a8823685d6e9ed60a Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Tue, 21 Apr 2020 22:39:16 +0100
Subject: tunnel: T2354: do not allow display as bridge option

---
 python/vyos/ifconfig/tunnel.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'python')

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
 
-- 
cgit v1.2.3