diff options
author | Christian Breunig <christian@breunig.cc> | 2024-04-03 00:01:13 +0200 |
---|---|---|
committer | Christian Breunig <christian@breunig.cc> | 2024-04-03 21:01:50 +0200 |
commit | 86f793fcb2c6be880819a572cc7982861ca38314 (patch) | |
tree | bd87b2fc0c17921adba331b4ebe7b5f4ce1c6983 /src/conf_mode/interfaces_pseudo-ethernet.py | |
parent | 9305f615e55c68efb2d9c5feb65bc716efa6c20d (diff) | |
download | vyos-1x-86f793fcb2c6be880819a572cc7982861ca38314.tar.gz vyos-1x-86f793fcb2c6be880819a572cc7982861ca38314.zip |
T6199: replace netifaces.interfaces() with common custom helpers
* Use interface_exists() outside of verify()
* Use verify_interface_exists() in verify() to drop common error message
(cherry picked from commit 4c7c168fe970b807750a05ceb66b70c0d8652535)
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() |