diff options
author | Daniil Baturin <daniil@vyos.io> | 2024-04-04 15:09:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-04 15:09:55 +0200 |
commit | 7f077a0dfc410d974f891e34f0726809d4b1a5b1 (patch) | |
tree | 637bdf33a0e87ae735ecd3f19ab120863b3f30be /src/conf_mode/interfaces_vxlan.py | |
parent | d729069c58c0a670e1f57d6d12c57a41e330742b (diff) | |
parent | ca84e6845e6cfeb5f4f5798594b390afb735901f (diff) | |
download | vyos-1x-7f077a0dfc410d974f891e34f0726809d4b1a5b1.tar.gz vyos-1x-7f077a0dfc410d974f891e34f0726809d4b1a5b1.zip |
Merge pull request #3241 from c-po/spring-cleaning-sagitta
T6199: spring cleaning - drop unused Python imports (backport #3240)
Diffstat (limited to 'src/conf_mode/interfaces_vxlan.py')
-rwxr-xr-x | src/conf_mode/interfaces_vxlan.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/conf_mode/interfaces_vxlan.py b/src/conf_mode/interfaces_vxlan.py index 4251e611b..39365968a 100755 --- a/src/conf_mode/interfaces_vxlan.py +++ b/src/conf_mode/interfaces_vxlan.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2019-2023 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 @@ -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.base import Warning from vyos.config import Config @@ -35,6 +32,7 @@ from vyos.ifconfig import Interface from vyos.ifconfig import VXLANIf from vyos.template import is_ipv6 from vyos.utils.dict import dict_search +from vyos.utils.network import interface_exists from vyos import ConfigError from vyos import airbag airbag.enable() @@ -212,8 +210,8 @@ def generate(vxlan): def apply(vxlan): # Check if the VXLAN interface already exists if 'rebuild_required' in vxlan or 'delete' in vxlan: - if vxlan['ifname'] in interfaces(): - v = VXLANIf(vxlan['ifname']) + if interface_exists(vxlan['ifname']): + v = VXLANIf(**vxlan) # VXLAN is super picky and the tunnel always needs to be recreated, # thus we can simply always delete it first. v.remove() |