T6895: Merge the hsflowd-based sFlow and uacctd-based sFlow (#4310)

2 files changed, 70 insertions, 46 deletions

diff --git a/src/conf_mode/system_flow-accounting.py b/src/conf_mode/system_flow-accounting.py
index a12ee363d..925c4a562 100755
--- a/src/conf_mode/system_flow-accounting.py
+++ b/src/conf_mode/system_flow-accounting.py
@@ -18,7 +18,6 @@ import os
 import re
 
 from sys import exit
-from ipaddress import ip_address
 
 from vyos.config import Config
 from vyos.config import config_dict_merge
@@ -159,9 +158,9 @@ def get_config(config=None):
 
     # delete individual flow type defaults - should only be added if user
     # sets this feature
-    for flow_type in ['sflow', 'netflow']:
-        if flow_type not in flow_accounting and flow_type in default_values:
-            del default_values[flow_type]
+    flow_type = 'netflow'
+    if flow_type not in flow_accounting and flow_type in default_values:
+        del default_values[flow_type]
 
     flow_accounting = config_dict_merge(default_values, flow_accounting)
 
@@ -171,9 +170,9 @@ def verify(flow_config):
     if not flow_config:
         return None
 
-    # check if at least one collector is enabled
-    if 'sflow' not in flow_config and 'netflow' not in flow_config and 'disable_imt' in flow_config:
-        raise ConfigError('You need to configure at least sFlow or NetFlow, ' \
+    # check if collector is enabled
+    if 'netflow' not in flow_config and 'disable_imt' in flow_config:
+        raise ConfigError('You need to configure NetFlow, ' \
                           'or not set "disable-imt" for flow-accounting!')
 
     # Check if at least one interface is configured
@@ -185,45 +184,7 @@ def verify(flow_config):
     for interface in flow_config['interface']:
         verify_interface_exists(flow_config, interface, warning_only=True)
 
-    # check sFlow configuration
-    if 'sflow' in flow_config:
-        # check if at least one sFlow collector is configured
-        if 'server' not in flow_config['sflow']:
-            raise ConfigError('You need to configure at least one sFlow server!')
-
-        # check that all sFlow collectors use the same IP protocol version
-        sflow_collector_ipver = None
-        for server in flow_config['sflow']['server']:
-            if sflow_collector_ipver:
-                if sflow_collector_ipver != ip_address(server).version:
-                    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']
-
-        # check agent-id for sFlow: we should avoid mixing IPv4 agent-id with IPv6 collectors and vice-versa
-        for server in flow_config['sflow']['server']:
-            if 'agent_address' in flow_config['sflow']:
-                if ip_address(server).version != ip_address(flow_config['sflow']['agent_address']).version:
-                    raise ConfigError('IPv4 and IPv6 addresses can not be mixed in "sflow agent-address" and "sflow '\
-                                      'server". You need to set the same IP version for both "agent-address" and '\
-                                      'all sFlow servers')
-
-        if 'agent_address' in flow_config['sflow']:
-            tmp = flow_config['sflow']['agent_address']
-            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 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']
-                raise ConfigError(f'Configured "sflow source-address {tmp}" does not exist on the system!')
+    verify_vrf(flow_config)
 
     # check NetFlow configuration
     if 'netflow' in flow_config:
diff --git a/src/migration-scripts/flow-accounting/1-to-2 b/src/migration-scripts/flow-accounting/1-to-2
new file mode 100644
index 000000000..5ffb1eec8
--- /dev/null
+++ b/src/migration-scripts/flow-accounting/1-to-2
@@ -0,0 +1,63 @@
+# Copyright 2021-2024 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+# migrate 'system flow-accounting sflow' to 'system sflow'
+
+from vyos.configtree import ConfigTree
+
+base = ['system', 'flow-accounting']
+base_fa_sflow = base + ['sflow']
+base_sflow = ['system', 'sflow']
+
+def migrate(config: ConfigTree) -> None:
+    if not config.exists(base_fa_sflow):
+        # Nothing to do
+        return
+
+    if not config.exists(base_sflow):
+
+        for iface in config.return_values(base + ['interface']):
+            config.set(base_sflow + ['interface'], value=iface, replace=False)
+
+        if config.exists(base + ['vrf']):
+            vrf = config.return_value(base + ['vrf'])
+            config.set(base_sflow + ['vrf'], value=vrf)
+
+        if config.exists(base + ['enable-egress']):
+            config.set(base_sflow + ['enable-egress'])
+
+        if config.exists(base_fa_sflow + ['agent-address']):
+            address = config.return_value(base_fa_sflow + ['agent-address'])
+            config.set(base_sflow + ['agent-address'], value=address)
+
+        if config.exists(base_fa_sflow + ['sampling-rate']):
+            sr = config.return_value(base_fa_sflow + ['sampling-rate'])
+            config.set(base_sflow + ['sampling-rate'], value=sr)
+
+        for server in config.list_nodes(base_fa_sflow + ['server']):
+            config.set(base_sflow + ['server'])
+            config.set_tag(base_sflow + ['server'])
+            config.set(base_sflow + ['server', server])
+            tmp = base_fa_sflow + ['server', server]
+            if config.exists(tmp + ['port']):
+                port = config.return_value(tmp + ['port'])
+                config.set(base_sflow + ['server', server, 'port'], value=port)
+
+    if config.exists(base + ['netflow']):
+        # delete only sflow from flow-accounting if netflow is set
+        config.delete(base_fa_sflow)
+    else:
+        # delete all flow-accounting config otherwise
+        config.delete(base)