summaryrefslogtreecommitdiff
path: root/src/conf_mode/interfaces-wireguard.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-03-03 18:25:56 +0100
committerChristian Poessinger <christian@poessinger.com>2020-03-03 18:29:13 +0100
commit47e6d60216ba6b3c86acb4097d04a454c9d0e723 (patch)
tree4b16312c5574be949a5c0c5b38f9c2a9e05206db /src/conf_mode/interfaces-wireguard.py
parentbaa692d070fa80b514cf819cd5583d44247d955d (diff)
downloadvyos-1x-47e6d60216ba6b3c86acb4097d04a454c9d0e723.tar.gz
vyos-1x-47e6d60216ba6b3c86acb4097d04a454c9d0e723.zip
interfaces: T1579: fix c/p error when evaluating os.environ['VYOS_TAGNODE_VALUE']
This has been only a theoretical problem but then the error condition was triggered - only an error has been printed instead of raising an Exception.
Diffstat (limited to 'src/conf_mode/interfaces-wireguard.py')
-rwxr-xr-xsrc/conf_mode/interfaces-wireguard.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/conf_mode/interfaces-wireguard.py b/src/conf_mode/interfaces-wireguard.py
index ff12a5172..0d6373d89 100755
--- a/src/conf_mode/interfaces-wireguard.py
+++ b/src/conf_mode/interfaces-wireguard.py
@@ -56,6 +56,10 @@ def get_config():
if not c.exists(['interfaces', 'wireguard']):
return None
+ # determine tagNode instance
+ if 'VYOS_TAGNODE_VALUE' not in os.environ:
+ raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
dflt_cnf = {
'intfc': '',
'addr': [],
@@ -71,14 +75,10 @@ def get_config():
'pk': '{}/default/private.key'.format(kdir)
}
- if os.getenv('VYOS_TAGNODE_VALUE'):
- ifname = str(os.environ['VYOS_TAGNODE_VALUE'])
- wg = deepcopy(dflt_cnf)
- wg['intfc'] = ifname
- wg['descr'] = ifname
- else:
- print("ERROR: VYOS_TAGNODE_VALUE undefined")
- sys.exit(1)
+ ifname = str(os.environ['VYOS_TAGNODE_VALUE'])
+ wg = deepcopy(dflt_cnf)
+ wg['intfc'] = ifname
+ wg['descr'] = ifname
c.set_level(['interfaces', 'wireguard'])