diff options
| author | srividya0208 <68350089+srividya0208@users.noreply.github.com> | 2023-08-10 18:31:43 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-10 15:01:43 +0200 |
| commit | e146f9c300335ecdcc118343e4eab3df30cd56de (patch) | |
| tree | a964a4b201e62ad0f53623b020a9b1d5d169b471 /src/conf_mode | |
| parent | 7a43a92057f7b777b472318d4ebb8fa9d02215ab (diff) | |
| download | vyos-1x-e146f9c300335ecdcc118343e4eab3df30cd56de.tar.gz vyos-1x-e146f9c300335ecdcc118343e4eab3df30cd56de.zip | |
tunnel: T5223: clear GRE key id after deletion
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/interfaces-tunnel.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/conf_mode/interfaces-tunnel.py b/src/conf_mode/interfaces-tunnel.py index 6a075970e..91aed9cc3 100755 --- a/src/conf_mode/interfaces-tunnel.py +++ b/src/conf_mode/interfaces-tunnel.py @@ -55,6 +55,9 @@ def get_config(config=None): tmp = is_node_changed(conf, base + [ifname, 'encapsulation']) if tmp: tunnel.update({'encapsulation_changed': {}}) + tmp = is_node_changed(conf, base + [ifname, 'parameters', 'ip', 'key']) + if tmp: tunnel.update({'key_changed': {}}) + # We also need to inspect other configured tunnels as there are Kernel # restrictions where we need to comply. E.g. GRE tunnel key can't be used # twice, or with multiple GRE tunnels to the same location we must specify @@ -197,7 +200,8 @@ def apply(tunnel): remote = dict_search('linkinfo.info_data.remote', tmp) if ('deleted' in tunnel or 'encapsulation_changed' in tunnel or encap in - ['gretap', 'ip6gretap', 'erspan', 'ip6erspan'] or remote in ['any']): + ['gretap', 'ip6gretap', 'erspan', 'ip6erspan'] or remote in ['any'] or + 'key_changed' in tunnel): if interface in interfaces(): tmp = Interface(interface) tmp.remove() |