diff options
| author | hagbard <vyosdev@derith.de> | 2019-01-06 16:04:52 -0800 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-01-06 16:04:52 -0800 |
| commit | 76fe726e3530158ee175d34b9cb74209ccca2345 (patch) | |
| tree | 99fd5ab6f36f804cea6eb5a0fb388d9abc536320 /src/conf_mode | |
| parent | 60a8793aef2c1af95d7a992bfc0a381e1a8a61cd (diff) | |
| download | vyos-1x-76fe726e3530158ee175d34b9cb74209ccca2345.tar.gz vyos-1x-76fe726e3530158ee175d34b9cb74209ccca2345.zip | |
Fix: T1162 - WireGuard: Unable to modify tunnels - KeyError: 'state'
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/wireguard.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/conf_mode/wireguard.py b/src/conf_mode/wireguard.py index f5452579e..c88e9085a 100755 --- a/src/conf_mode/wireguard.py +++ b/src/conf_mode/wireguard.py @@ -124,7 +124,6 @@ def get_config(): if c.exists(cnf + ' peer ' + p + ' preshared-key'): config_data['interfaces'][intfc]['peer'][p]['psk'] = c.return_value(cnf + ' peer ' + p + ' preshared-key') - return config_data def verify(c): @@ -166,12 +165,13 @@ def apply(c): ### link status up/down aka interface disable for intf in c['interfaces']: - if c['interfaces'][intf]['state'] == 'disable': - sl.syslog(sl.LOG_NOTICE, "disable interface " + intf) - subprocess.call(['ip l s dev ' + intf + ' down ' + ' &>/dev/null'], shell=True) - else: - sl.syslog(sl.LOG_NOTICE, "enable interface " + intf) - subprocess.call(['ip l s dev ' + intf + ' up ' + ' &>/dev/null'], shell=True) + if not c['interfaces'][intf]['status'] == 'delete': + if c['interfaces'][intf]['state'] == 'disable': + sl.syslog(sl.LOG_NOTICE, "disable interface " + intf) + subprocess.call(['ip l s dev ' + intf + ' down ' + ' &>/dev/null'], shell=True) + else: + sl.syslog(sl.LOG_NOTICE, "enable interface " + intf) + subprocess.call(['ip l s dev ' + intf + ' up ' + ' &>/dev/null'], shell=True) ### deletion of a specific interface for intf in c['interfaces']: |