diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-10-31 14:50:47 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-10-31 14:51:23 +0100 |
| commit | 85bf315f71b411e3cdcd19793c4f7e1e5efed917 (patch) | |
| tree | 4b7138bf2af4dafd7497e1887510506ffdd36a82 /src | |
| parent | 17215846b512851e7df8cdfcfc06c18b1d27f763 (diff) | |
| download | vyos-1x-85bf315f71b411e3cdcd19793c4f7e1e5efed917.tar.gz vyos-1x-85bf315f71b411e3cdcd19793c4f7e1e5efed917.zip | |
tunnel: T3956: GRE key check must not be run on our own interface instance
(cherry picked from commit e482377b29df05e60dbdb31d6276ae2030ffa2f9)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/interfaces-tunnel.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py index da8624202..30f57ec0c 100755 --- a/src/conf_mode/interfaces-tunnel.py +++ b/src/conf_mode/interfaces-tunnel.py @@ -107,6 +107,10 @@ def verify(tunnel): # Check pairs tunnel source-address/encapsulation/key with exists tunnels. # Prevent the same key for 2 tunnels with same source-address/encap. T2920 for tunnel_if in Section.interfaces('tunnel'): + # It makes no sense to run the test for re-used GRE keys on our + # own interface we are currently working on + if tunnel['ifname'] == tunnel_if: + continue tunnel_cfg = get_interface_config(tunnel_if) # no match on encapsulation - bail out if dict_search('linkinfo.info_kind', tunnel_cfg) != tunnel['encapsulation']: |