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/system_flow-accounting.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/system_flow-accounting.py')
-rwxr-xr-x | src/conf_mode/system_flow-accounting.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/conf_mode/system_flow-accounting.py b/src/conf_mode/system_flow-accounting.py index 206f513c8..2dacd92da 100755 --- a/src/conf_mode/system_flow-accounting.py +++ b/src/conf_mode/system_flow-accounting.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2023 VyOS maintainers and contributors +# Copyright (C) 2018-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 @@ -20,11 +20,10 @@ import re from sys import exit from ipaddress import ip_address -from vyos.base import Warning from vyos.config import Config from vyos.config import config_dict_merge from vyos.configverify import verify_vrf -from vyos.ifconfig import Section +from vyos.configverify import verify_interface_exists from vyos.template import render from vyos.utils.process import call from vyos.utils.process import cmd @@ -184,10 +183,7 @@ def verify(flow_config): # check that all configured interfaces exists in the system for interface in flow_config['interface']: - if interface not in Section.interfaces(): - # Changed from error to warning to allow adding dynamic interfaces - # and interface templates - Warning(f'Interface "{interface}" is not presented in the system') + verify_interface_exists(interface, warning_only=True) # check sFlow configuration if 'sflow' in flow_config: |