summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--python/vyos/utils/vti_updown_db.py4
-rwxr-xr-xsrc/etc/ipsec.d/vti-up-down6
2 files changed, 5 insertions, 5 deletions
diff --git a/python/vyos/utils/vti_updown_db.py b/python/vyos/utils/vti_updown_db.py
index f4dd24007..0587b48e8 100644
--- a/python/vyos/utils/vti_updown_db.py
+++ b/python/vyos/utils/vti_updown_db.py
@@ -173,7 +173,7 @@ class VTIUpDownDB:
self._fileHandle.truncate()
for interface in self._ifsDown:
- vti_link = get_interface_config(interface)
+ vti_link = get_interface_config(interface) or {}
vti_link_up = (vti_link['operstate'] != 'DOWN' if 'operstate' in vti_link else False)
if vti_link_up:
call(f'sudo ip link set {interface} down')
@@ -182,7 +182,7 @@ class VTIUpDownDB:
self._ifsDown.clear()
for interface in self._ifsUp:
- vti_link = get_interface_config(interface)
+ vti_link = get_interface_config(interface) or {}
vti_link_up = (vti_link['operstate'] != 'DOWN' if 'operstate' in vti_link else False)
if not vti_link_up:
vti = interface_dict_supplier(interface)
diff --git a/src/etc/ipsec.d/vti-up-down b/src/etc/ipsec.d/vti-up-down
index 49acd27d2..58089bbae 100755
--- a/src/etc/ipsec.d/vti-up-down
+++ b/src/etc/ipsec.d/vti-up-down
@@ -29,7 +29,7 @@ from vyos.configquery import ConfigTreeQuery
from vyos.configdict import get_interface_dict
from vyos.utils.commit import wait_for_commit_lock
from vyos.utils.process import call
-from vyos.utils.vti_updown_db import open_vti_updown_db_for_update
+from vyos.utils.vti_updown_db import open_vti_updown_db_for_create_or_update
def supply_interface_dict(interface):
# Lazy-load the running config on first invocation
@@ -58,10 +58,10 @@ if __name__ == '__main__':
wait_for_commit_lock()
if verb in ['up-client', 'up-client-v6', 'up-host', 'up-host-v6']:
- with open_vti_updown_db_for_update() as db:
+ with open_vti_updown_db_for_create_or_update() as db:
db.add(interface, connection, protocol)
db.commit(supply_interface_dict)
elif verb in ['down-client', 'down-client-v6', 'down-host', 'down-host-v6']:
- with open_vti_updown_db_for_update() as db:
+ with open_vti_updown_db_for_create_or_update() as db:
db.remove(interface, connection, protocol)
db.commit(supply_interface_dict)