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_geneve.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_geneve.py')
-rwxr-xr-x | src/conf_mode/interfaces_geneve.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/interfaces_geneve.py b/src/conf_mode/interfaces_geneve.py index f6694ddde..769139e0f 100755 --- a/src/conf_mode/interfaces_geneve.py +++ b/src/conf_mode/interfaces_geneve.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2019-2022 VyOS maintainers and contributors +# Copyright (C) 2019-2024 VyOS 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 @@ -15,7 +15,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from sys import exit -from netifaces import interfaces from vyos.config import Config from vyos.configdict import get_interface_dict @@ -26,6 +25,7 @@ from vyos.configverify import verify_bridge_delete from vyos.configverify import verify_mirror_redirect from vyos.configverify import verify_bond_bridge_member from vyos.ifconfig import GeneveIf +from vyos.utils.network import interface_exists from vyos import ConfigError from vyos import airbag @@ -77,8 +77,8 @@ def generate(geneve): def apply(geneve): # Check if GENEVE interface already exists if 'rebuild_required' in geneve or 'delete' in geneve: - if geneve['ifname'] in interfaces(): - g = GeneveIf(geneve['ifname']) + if interface_exists(geneve['ifname']): + g = GeneveIf(**geneve) # GENEVE is super picky and the tunnel always needs to be recreated, # thus we can simply always delete it first. g.remove() |