1 files changed, 25 insertions, 33 deletions

diff --git a/src/conf_mode/flow_accounting_conf.py b/src/conf_mode/flow_accounting_conf.py
index 7e16235c1..71acd69fa 100755
--- a/src/conf_mode/flow_accounting_conf.py
+++ b/src/conf_mode/flow_accounting_conf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018-2022 VyOS maintainers and contributors
+# Copyright (C) 2018-2023 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
@@ -18,27 +18,24 @@ import os
 import re
 
 from sys import exit
-import ipaddress
-
 from ipaddress import ip_address
 
 from vyos.base import Warning
 from vyos.config import Config
-from vyos.configdict import dict_merge
+from vyos.config import config_dict_merge
+from vyos.configverify import verify_vrf
 from vyos.ifconfig import Section
-from vyos.ifconfig import Interface
 from vyos.template import render
-from vyos.util import call
-from vyos.util import cmd
-from vyos.validate import is_addr_assigned
-from vyos.xml import defaults
+from vyos.utils.process import call
+from vyos.utils.process import cmd
+from vyos.utils.network import is_addr_assigned
 from vyos import ConfigError
 from vyos import airbag
 airbag.enable()
 
 uacctd_conf_path = '/run/pmacct/uacctd.conf'
 systemd_service = 'uacctd.service'
-systemd_override = f'/etc/systemd/system/{systemd_service}.d/override.conf'
+systemd_override = f'/run/systemd/system/{systemd_service}.d/override.conf'
 nftables_nflog_table = 'raw'
 nftables_nflog_chain = 'VYOS_CT_PREROUTING_HOOK'
 egress_nftables_nflog_table = 'inet mangle'
@@ -130,30 +127,19 @@ def get_config(config=None):
 
     flow_accounting = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
 
-    # We have gathered the dict representation of the CLI, but there are default
-    # options which we need to update into the dictionary retrived.
-    default_values = defaults(base)
+    # We have gathered the dict representation of the CLI, but there are
+    # default values which we need to conditionally update into the
+    # dictionary retrieved.
+    default_values = conf.get_config_defaults(**flow_accounting.kwargs,
+                                              recursive=True)
 
-    # delete individual flow type default - should only be added if user uses
-    # this feature
+    # delete individual flow type defaults - should only be added if user
+    # sets this feature
     for flow_type in ['sflow', 'netflow']:
-        if flow_type in default_values:
+        if flow_type not in flow_accounting and flow_type in default_values:
             del default_values[flow_type]
-    flow_accounting = dict_merge(default_values, flow_accounting)
 
-    for flow_type in ['sflow', 'netflow']:
-        if flow_type in flow_accounting:
-            default_values = defaults(base + [flow_type])
-            # we need to merge individual server configurations
-            if 'server' in default_values:
-                del default_values['server']
-            flow_accounting[flow_type] = dict_merge(default_values, flow_accounting[flow_type])
-
-            if 'server' in flow_accounting[flow_type]:
-                default_values = defaults(base + [flow_type, 'server'])
-                for server in flow_accounting[flow_type]['server']:
-                    flow_accounting[flow_type]['server'][server] = dict_merge(
-                        default_values,flow_accounting[flow_type]['server'][server])
+    flow_accounting = config_dict_merge(default_values, flow_accounting)
 
     return flow_accounting
 
@@ -192,8 +178,9 @@ def verify(flow_config):
                     raise ConfigError("All sFlow servers must use the same IP protocol")
             else:
                 sflow_collector_ipver = ip_address(server).version
-	
+
         # check if vrf is defined for Sflow
+        verify_vrf(flow_config)
         sflow_vrf = None
         if 'vrf' in flow_config:
             sflow_vrf = flow_config['vrf']
@@ -211,7 +198,7 @@ def verify(flow_config):
             if not is_addr_assigned(tmp, sflow_vrf):
                 raise ConfigError(f'Configured "sflow agent-address {tmp}" does not exist in the system!')
 
-        # Check if configured netflow source-address exist in the system
+        # Check if configured sflow source-address exist in the system
         if 'source_address' in flow_config['sflow']:
             if not is_addr_assigned(flow_config['sflow']['source_address'], sflow_vrf):
                 tmp = flow_config['sflow']['source_address']
@@ -219,13 +206,18 @@ def verify(flow_config):
 
     # check NetFlow configuration
     if 'netflow' in flow_config:
+        # check if vrf is defined for netflow
+        netflow_vrf = None
+        if 'vrf' in flow_config:
+            netflow_vrf = flow_config['vrf']
+
         # check if at least one NetFlow collector is configured if NetFlow configuration is presented
         if 'server' not in flow_config['netflow']:
             raise ConfigError('You need to configure at least one NetFlow server!')
 
         # Check if configured netflow source-address exist in the system
         if 'source_address' in flow_config['netflow']:
-            if not is_addr_assigned(flow_config['netflow']['source_address']):
+            if not is_addr_assigned(flow_config['netflow']['source_address'], netflow_vrf):
                 tmp = flow_config['netflow']['source_address']
                 raise ConfigError(f'Configured "netflow source-address {tmp}" does not exist on the system!')