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.

13 files changed, 56 insertions, 57 deletions

diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index 6cdfb764c..dcb0b59ed 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -93,10 +93,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        bond['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    bond['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # check if bond has been removed
     cfg_base = 'interfaces bonding ' + bond['intf']
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index a3213f309..0810d63d6 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -60,10 +60,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        bridge['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    bridge['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # Check if bridge has been removed
     if not conf.exists('interfaces bridge ' + bridge['intf']):
diff --git a/src/conf_mode/interfaces-dummy.py b/src/conf_mode/interfaces-dummy.py
index eb0145f65..e79e6222d 100755
--- a/src/conf_mode/interfaces-dummy.py
+++ b/src/conf_mode/interfaces-dummy.py
@@ -38,10 +38,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        dummy['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    dummy['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # Check if interface has been removed
     if not conf.exists('interfaces dummy ' + dummy['intf']):
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index e4f6e5ff2..43cc22589 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -67,10 +67,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        eth['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    eth['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # check if ethernet interface has been removed
     cfg_base = ['interfaces', 'ethernet', eth['intf']]
diff --git a/src/conf_mode/interfaces-geneve.py b/src/conf_mode/interfaces-geneve.py
index eb18ec7a4..8278b54b0 100755
--- a/src/conf_mode/interfaces-geneve.py
+++ b/src/conf_mode/interfaces-geneve.py
@@ -42,10 +42,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        geneve['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    geneve['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # Check if interface has been removed
     if not conf.exists('interfaces geneve ' + geneve['intf']):
diff --git a/src/conf_mode/interfaces-l2tpv3.py b/src/conf_mode/interfaces-l2tpv3.py
index 44fd02654..1b9425f64 100755
--- a/src/conf_mode/interfaces-l2tpv3.py
+++ b/src/conf_mode/interfaces-l2tpv3.py
@@ -47,10 +47,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        l2tpv3['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    l2tpv3['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # Check if interface has been removed
     if not conf.exists('interfaces l2tpv3 ' + l2tpv3['intf']):
diff --git a/src/conf_mode/interfaces-loopback.py b/src/conf_mode/interfaces-loopback.py
index 10722d137..ddd18ae24 100755
--- a/src/conf_mode/interfaces-loopback.py
+++ b/src/conf_mode/interfaces-loopback.py
@@ -37,10 +37,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        loopback['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    loopback['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # Check if interface has been removed
     if not conf.exists('interfaces loopback ' + loopback['intf']):
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py
index 622543b58..6b2e3e52e 100755
--- a/src/conf_mode/interfaces-openvpn.py
+++ b/src/conf_mode/interfaces-openvpn.py
@@ -382,10 +382,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        openvpn['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    openvpn['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # Check if interface instance has been removed
     if not conf.exists('interfaces openvpn ' + openvpn['intf']):
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index 8448bc198..8ec78bab3 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -133,11 +133,11 @@ def get_config():
     base_path = ['interfaces', 'pppoe']
 
     # determine tagNode instance
-    try:
-        pppoe['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-        pppoe['logfile'] = PPP_LOGFILE.format(pppoe['intf'])
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    pppoe['intf'] = os.environ['VYOS_TAGNODE_VALUE']
+    pppoe['logfile'] = PPP_LOGFILE.format(pppoe['intf'])
 
     # Check if interface has been removed
     if not conf.exists(base_path + [pppoe['intf']]):
diff --git a/src/conf_mode/interfaces-pseudo-ethernet.py b/src/conf_mode/interfaces-pseudo-ethernet.py
index 13c809e0d..3d36da226 100755
--- a/src/conf_mode/interfaces-pseudo-ethernet.py
+++ b/src/conf_mode/interfaces-pseudo-ethernet.py
@@ -60,11 +60,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        peth['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
 
+    peth['intf'] = os.environ['VYOS_TAGNODE_VALUE']
     cfg_base = ['interfaces', 'pseudo-ethernet', peth['intf']]
 
     # Check if interface has been removed
diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py
index cfddd0bf8..dabfe4836 100755
--- a/src/conf_mode/interfaces-vxlan.py
+++ b/src/conf_mode/interfaces-vxlan.py
@@ -50,10 +50,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        vxlan['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    vxlan['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # Check if interface has been removed
     if not conf.exists('interfaces vxlan ' + vxlan['intf']):
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'])
 
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index 098aa8d97..5289208d9 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -894,10 +894,10 @@ def get_config():
     conf = Config()
 
     # determine tagNode instance
-    try:
-        wifi['intf'] = os.environ['VYOS_TAGNODE_VALUE']
-    except KeyError as E:
-        print("Interface not specified")
+    if 'VYOS_TAGNODE_VALUE' not in os.environ:
+        raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified')
+
+    wifi['intf'] = os.environ['VYOS_TAGNODE_VALUE']
 
     # check if wireless interface has been removed
     cfg_base = 'interfaces wireless ' + wifi['intf']