diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-04-03 19:23:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 19:23:14 +0200 |
| commit | d4b53a38359d80a4578d6fb2d8c76241b310f866 (patch) | |
| tree | 72d8b52266a25c26132c615b64adfa8b3345ff7c /src/conf_mode/interfaces_tunnel.py | |
| parent | fe09b767cfae7879dcbb8b2cfd52644342776b7e (diff) | |
| parent | 74198e68a6edbdb36a6103a7666de530bdd71696 (diff) | |
| download | vyos-1x-d4b53a38359d80a4578d6fb2d8c76241b310f866.tar.gz vyos-1x-d4b53a38359d80a4578d6fb2d8c76241b310f866.zip | |
Merge pull request #3240 from c-po/spring-cleaning
T6199: spring cleaning - drop unused Python imports
Diffstat (limited to 'src/conf_mode/interfaces_tunnel.py')
| -rwxr-xr-x | src/conf_mode/interfaces_tunnel.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/conf_mode/interfaces_tunnel.py b/src/conf_mode/interfaces_tunnel.py index efa5ebc64..43ba72857 100755 --- a/src/conf_mode/interfaces_tunnel.py +++ b/src/conf_mode/interfaces_tunnel.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2022 yOS maintainers and contributors +# Copyright (C) 2018-2024 yOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -14,10 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import os - from sys import exit -from netifaces import interfaces from vyos.config import Config from vyos.configdict import get_interface_dict @@ -31,10 +28,10 @@ from vyos.configverify import verify_vrf from vyos.configverify import verify_tunnel from vyos.configverify import verify_bond_bridge_member from vyos.ifconfig import Interface -from vyos.ifconfig import Section from vyos.ifconfig import TunnelIf -from vyos.utils.network import get_interface_config from vyos.utils.dict import dict_search +from vyos.utils.network import get_interface_config +from vyos.utils.network import interface_exists from vyos import ConfigError from vyos import airbag airbag.enable() @@ -202,7 +199,7 @@ def apply(tunnel): if ('deleted' in tunnel or 'encapsulation_changed' in tunnel or encap in ['gretap', 'ip6gretap', 'erspan', 'ip6erspan'] or remote in ['any'] or 'key_changed' in tunnel): - if interface in interfaces(): + if interface_exists(interface): tmp = Interface(interface) tmp.remove() if 'deleted' in tunnel: |