diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/ifconfig/tunnel.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/python/vyos/ifconfig/tunnel.py b/python/vyos/ifconfig/tunnel.py index 439d88dbc..e5e1300b2 100644 --- a/python/vyos/ifconfig/tunnel.py +++ b/python/vyos/ifconfig/tunnel.py @@ -90,19 +90,21 @@ class TunnelIf(Interface): } def __init__(self, ifname, **kargs): - self.iftype = kargs['encapsulation'] - super().__init__(ifname, **kargs) - - # The gretap interface has the possibility to act as L2 bridge - if self.iftype in ['gretap', 'ip6gretap']: - # no multicast, ttl or tos for gretap - self.definition = { - **TunnelIf.definition, - **{ - 'bridgeable': True, - }, - } + # T3357: we do not have the 'encapsulation' in kargs when calling this + # class from op-mode like "show interfaces tunnel" + if 'encapsulation' in kargs: + self.iftype = kargs['encapsulation'] + # The gretap interface has the possibility to act as L2 bridge + if self.iftype in ['gretap', 'ip6gretap']: + # no multicast, ttl or tos for gretap + self.definition = { + **TunnelIf.definition, + **{ + 'bridgeable': True, + }, + } + super().__init__(ifname, **kargs) def _create(self): if self.config['encapsulation'] in ['ipip6', 'ip6ip6', 'ip6gre']: |