summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2024-01-22 09:32:06 +0200
committerGitHub <noreply@github.com>2024-01-22 09:32:06 +0200
commit34419458d99cf8d07279f92935c0f10d9b603f33 (patch)
tree7db6b73ba03087473534097995f512b555a3dd4e /src
parent56dabbfddc6f7d15e27b5293bcf1ed2deb031c38 (diff)
parent64473fa6f320375fb3d3de4de9e729f456ee5ae2 (diff)
downloadvyos-1x-34419458d99cf8d07279f92935c0f10d9b603f33.tar.gz
vyos-1x-34419458d99cf8d07279f92935c0f10d9b603f33.zip
Merge pull request #2869 from c-po/sflow-t5968
sflow: T5968: add VRF support
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/system_sflow.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/conf_mode/system_sflow.py b/src/conf_mode/system_sflow.py
index 2df1bbb7a..41119b494 100755
--- a/src/conf_mode/system_sflow.py
+++ b/src/conf_mode/system_sflow.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-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
@@ -19,6 +19,7 @@ import os
from sys import exit
from vyos.config import Config
+from vyos.configverify import verify_vrf
from vyos.template import render
from vyos.utils.process import call
from vyos.utils.network import is_addr_assigned
@@ -46,7 +47,6 @@ def get_config(config=None):
return sflow
-
def verify(sflow):
if not sflow:
return None
@@ -68,9 +68,8 @@ def verify(sflow):
if 'server' not in sflow:
raise ConfigError('You need to configure at least one sFlow server!')
- # return True if all checks were passed
- return True
-
+ verify_vrf(sflow)
+ return None
def generate(sflow):
if not sflow:
@@ -81,7 +80,6 @@ def generate(sflow):
# Reload systemd manager configuration
call('systemctl daemon-reload')
-
def apply(sflow):
if not sflow:
# Stop flow-accounting daemon and remove configuration file
@@ -93,7 +91,6 @@ def apply(sflow):
# Start/reload flow-accounting daemon
call(f'systemctl restart {systemd_service}')
-
if __name__ == '__main__':
try:
config = get_config()