diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-08-13 06:00:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-13 06:00:11 +0200 |
| commit | dc34fb02dfdc1c271ff73555a0cf707d9b4f7a2d (patch) | |
| tree | acf26bd90811d6765005c73ae14400e8af75376b /src/conf_mode/vpn_ipsec.py | |
| parent | c50c55b93027d9000fa4fd966197402c1422ed3f (diff) | |
| parent | 7e7196de61d9500b01a9e65582127cb80c249ae2 (diff) | |
| download | vyos-1x-dc34fb02dfdc1c271ff73555a0cf707d9b4f7a2d.tar.gz vyos-1x-dc34fb02dfdc1c271ff73555a0cf707d9b4f7a2d.zip | |
Merge pull request #3972 from vyos/mergify/bp/circinus/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'): |