diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-22 19:48:32 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-05-22 20:00:28 +0200 |
| commit | 645c43ba60d29ca676a4323ccc5ca16c6bd8127a (patch) | |
| tree | aebd99c4029af19d6affe70e22c0367ed656d8ff | |
| parent | 3870247517741ce23e2fcee8aaa1d194f0ad621b (diff) | |
| download | vyos-1x-645c43ba60d29ca676a4323ccc5ca16c6bd8127a.tar.gz vyos-1x-645c43ba60d29ca676a4323ccc5ca16c6bd8127a.zip | |
nat: T6365: use interface_exists() over netifaces.interfaces()
| -rwxr-xr-x | src/conf_mode/nat.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/conf_mode/nat.py b/src/conf_mode/nat.py index db02ca66f..f74bb217e 100755 --- a/src/conf_mode/nat.py +++ b/src/conf_mode/nat.py @@ -17,7 +17,6 @@ import os from sys import exit -from netifaces import interfaces from vyos.base import Warning from vyos.config import Config @@ -30,6 +29,7 @@ from vyos.utils.dict import dict_search_args from vyos.utils.process import cmd from vyos.utils.process import run from vyos.utils.network import is_addr_assigned +from vyos.utils.network import interface_exists from vyos import ConfigError from vyos import airbag @@ -153,8 +153,8 @@ def verify(nat): if interface_name not in 'any': if interface_name.startswith('!'): interface_name = interface_name[1:] - if interface_name not in interfaces(): - Warning(f'NAT interface "{interface_name}" for source NAT rule "{rule}" does not exist!') + if not interface_exists(interface_name): + Warning(f'Interface "{interface_name}" for source NAT rule "{rule}" does not exist!') else: group_name = config['outbound_interface']['group'] if group_name[0] == '!': @@ -190,8 +190,8 @@ def verify(nat): if interface_name not in 'any': if interface_name.startswith('!'): interface_name = interface_name[1:] - if interface_name not in interfaces(): - Warning(f'NAT interface "{interface_name}" for destination NAT rule "{rule}" does not exist!') + if not interface_exists(interface_name): + Warning(f'Interface "{interface_name}" for destination NAT rule "{rule}" does not exist!') else: group_name = config['inbound_interface']['group'] if group_name[0] == '!': |