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_pseudo-ethernet.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_pseudo-ethernet.py')
| -rwxr-xr-x | src/conf_mode/interfaces_pseudo-ethernet.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/conf_mode/interfaces_pseudo-ethernet.py b/src/conf_mode/interfaces_pseudo-ethernet.py index dce5c2358..446beffd3 100755 --- a/src/conf_mode/interfaces_pseudo-ethernet.py +++ b/src/conf_mode/interfaces_pseudo-ethernet.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 @@ -29,8 +28,8 @@ from vyos.configverify import verify_source_interface from vyos.configverify import verify_vlan_config from vyos.configverify import verify_mtu_parent from vyos.configverify import verify_mirror_redirect -from vyos.configverify import verify_bond_bridge_member from vyos.ifconfig import MACVLANIf +from vyos.utils.network import interface_exists from vyos import ConfigError from vyos import airbag @@ -84,8 +83,8 @@ def generate(peth): def apply(peth): # Check if the MACVLAN interface already exists if 'rebuild_required' in peth or 'deleted' in peth: - if peth['ifname'] in interfaces(): - p = MACVLANIf(peth['ifname']) + if interface_exists(peth['ifname']): + p = MACVLANIf(**peth) # MACVLAN is always needs to be recreated, # thus we can simply always delete it first. p.remove() |