diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-09 07:38:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 07:38:37 +0200 |
| commit | b102408165037d57453ce4928b93958a54c69dcd (patch) | |
| tree | f8102ed870909d4f3bebaa92e4380d6a64bf5521 | |
| parent | d4469e373df1ee5f572cd601cb0aa7fd1bdd7770 (diff) | |
| parent | 62210a1de8ae87980f1b1880736d1cded327cb46 (diff) | |
| download | vyos-1x-b102408165037d57453ce4928b93958a54c69dcd.tar.gz vyos-1x-b102408165037d57453ce4928b93958a54c69dcd.zip | |
Merge pull request #317 from thomas-mangin/T2028-remote
tunnel: T2028: fix remote and registration
| -rw-r--r-- | python/vyos/ifconfig/tunnel.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-tunnel.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/python/vyos/ifconfig/tunnel.py b/python/vyos/ifconfig/tunnel.py index 1bbb9eb6a..05060669a 100644 --- a/python/vyos/ifconfig/tunnel.py +++ b/python/vyos/ifconfig/tunnel.py @@ -31,7 +31,7 @@ def enable_to_on(value): raise ValueError(f'expect enable or disable but got "{value}"') - +@Interface.register class _Tunnel(Interface): """ _Tunnel: private base class for tunnels diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py index 28b1cf60f..38d490c3c 100755 --- a/src/conf_mode/interfaces-tunnel.py +++ b/src/conf_mode/interfaces-tunnel.py @@ -567,9 +567,9 @@ def verify(conf): incompatible = [] if afi_local == IP6: - incompatible.extend(['ttl', 'tos', 'key',]) + incompatible.extend(['remote','ttl', 'tos', 'key',]) if afi_local == IP4: - incompatible.extend(['encaplimit', 'flowlabel', 'hoplimit', 'tclass']) + incompatible.extend(['remote','encaplimit', 'flowlabel', 'hoplimit', 'tclass']) for option in incompatible: if option in options: |