diff options
author | Christian Breunig <christian@breunig.cc> | 2024-08-19 18:13:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-19 18:13:14 +0200 |
commit | 827fcb2967ec41d288248e5760707e3980415a34 (patch) | |
tree | 68cbbf736c88263411cbe6867e9f4881a50c68df /src/conf_mode/vpn_ipsec.py | |
parent | ab4a52254622c32d2293dd4d683aa440a9b60330 (diff) | |
parent | a6362cc32135b39b4320221006f48fef78f40c24 (diff) | |
download | vyos-1x-827fcb2967ec41d288248e5760707e3980415a34.tar.gz vyos-1x-827fcb2967ec41d288248e5760707e3980415a34.zip |
Merge pull request #3973 from vyos/mergify/bp/sagitta/pr-3961
configverify: T6642: verify_interface_exists requires config_dict arg (backport #3961)
Diffstat (limited to 'src/conf_mode/vpn_ipsec.py')
-rwxr-xr-x | src/conf_mode/vpn_ipsec.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/vpn_ipsec.py b/src/conf_mode/vpn_ipsec.py index cf82b767f..65dd458ec 100755 --- a/src/conf_mode/vpn_ipsec.py +++ b/src/conf_mode/vpn_ipsec.py @@ -180,9 +180,9 @@ def verify(ipsec): for interface in ipsec['interface']: # exclude check interface for dynamic interfaces if tmp.match(interface): - verify_interface_exists(interface, warning_only=True) + verify_interface_exists(ipsec, interface, warning_only=True) else: - verify_interface_exists(interface) + verify_interface_exists(ipsec, interface) if 'l2tp' in ipsec: if 'esp_group' in ipsec['l2tp']: @@ -243,7 +243,7 @@ def verify(ipsec): if 'dhcp_interface' in ra_conf: dhcp_interface = ra_conf['dhcp_interface'] - verify_interface_exists(dhcp_interface) + verify_interface_exists(ipsec, dhcp_interface) dhcp_base = directories['isc_dhclient_dir'] if not os.path.exists(f'{dhcp_base}/dhclient_{dhcp_interface}.conf'): @@ -414,7 +414,7 @@ def verify(ipsec): if 'dhcp_interface' in peer_conf: dhcp_interface = peer_conf['dhcp_interface'] - verify_interface_exists(dhcp_interface) + verify_interface_exists(ipsec, dhcp_interface) dhcp_base = directories['isc_dhclient_dir'] if not os.path.exists(f'{dhcp_base}/dhclient_{dhcp_interface}.conf'): |