Merge pull request #1414 from sever-sever/T4532

netflow: T4532: replace dot and colons to dash

2 files changed, 15 insertions, 15 deletions

diff --git a/data/templates/pmacct/uacctd.conf.j2 b/data/templates/pmacct/uacctd.conf.j2
index a5016691f..8fbc09e83 100644
--- a/data/templates/pmacct/uacctd.conf.j2
+++ b/data/templates/pmacct/uacctd.conf.j2
@@ -21,13 +21,13 @@ imt_mem_pools_number: 169
 {% set plugin = [] %}
 {% if netflow.server is vyos_defined %}
 {%     for server in netflow.server %}
-{%         set nf_server_key = 'nf_' ~ server | replace(':', '.') %}
+{%         set nf_server_key = 'nf_' ~ server | dot_colon_to_dash %}
 {%         set _ = plugin.append('nfprobe['~ nf_server_key ~ ']') %}
 {%     endfor %}
 {% endif %}
 {% if sflow.server is vyos_defined %}
 {%     for server in sflow.server %}
-{%         set sf_server_key = 'sf_' ~ server | replace(':', '.') %}
+{%         set sf_server_key = 'sf_' ~ server | dot_colon_to_dash %}
 {%         set _ = plugin.append('sfprobe[' ~ sf_server_key ~ ']') %}
 {%     endfor %}
 {% endif %}
@@ -40,7 +40,7 @@ plugins: {{ plugin | join(',') }}
 # NetFlow servers
 {%     for server, server_config in netflow.server.items() %}
 {#         # prevent pmacct syntax error when using IPv6 flow collectors #}
-{%         set nf_server_key = 'nf_' ~ server | replace(':', '.') %}
+{%         set nf_server_key = 'nf_' ~ server | dot_colon_to_dash %}
 nfprobe_receiver[{{ nf_server_key }}]: {{ server | bracketize_ipv6 }}:{{ server_config.port }}
 nfprobe_version[{{ nf_server_key }}]: {{ netflow.version }}
 {%         if netflow.engine_id is vyos_defined %}
@@ -66,7 +66,7 @@ nfprobe_timeouts[{{ nf_server_key }}]: expint={{ netflow.timeout.expiry_interval
 # sFlow servers
 {%     for server, server_config in sflow.server.items() %}
 {#         # prevent pmacct syntax error when using IPv6 flow collectors #}
-{%         set sf_server_key = 'sf_' ~ server | replace(':', '.') %}
+{%         set sf_server_key = 'sf_' ~ server | dot_colon_to_dash %}
 sfprobe_receiver[{{ sf_server_key }}]: {{ server | bracketize_ipv6 }}:{{ server_config.port }}
 sfprobe_agentip[{{ sf_server_key }}]: {{ sflow.agent_address }}
 {%         if sflow.sampling_rate is vyos_defined %}
diff --git a/smoketest/scripts/cli/test_system_flow-accounting.py b/smoketest/scripts/cli/test_system_flow-accounting.py
index a6eef3fb6..df60b9613 100755
--- a/smoketest/scripts/cli/test_system_flow-accounting.py
+++ b/smoketest/scripts/cli/test_system_flow-accounting.py
@@ -144,14 +144,15 @@ class TestSystemFlowAccounting(VyOSUnitTestSHIM.TestCase):
         self.assertNotIn(f'plugins: memory', uacctd)
 
         for server, server_config in sflow_server.items():
+            plugin_name = server.replace('.', '-')
             if 'port' in server_config:
-                self.assertIn(f'sfprobe_receiver[sf_{server}]: {server}', uacctd)
+                self.assertIn(f'sfprobe_receiver[sf_{plugin_name}]: {server}', uacctd)
             else:
-                self.assertIn(f'sfprobe_receiver[sf_{server}]: {server}:6343', uacctd)
+                self.assertIn(f'sfprobe_receiver[sf_{plugin_name}]: {server}:6343', uacctd)
 
-            self.assertIn(f'sfprobe_agentip[sf_{server}]: {agent_address}', uacctd)
-            self.assertIn(f'sampling_rate[sf_{server}]: {sampling_rate}', uacctd)
-            self.assertIn(f'sfprobe_source_ip[sf_{server}]: {source_address}', uacctd)
+            self.assertIn(f'sfprobe_agentip[sf_{plugin_name}]: {agent_address}', uacctd)
+            self.assertIn(f'sampling_rate[sf_{plugin_name}]: {sampling_rate}', uacctd)
+            self.assertIn(f'sfprobe_source_ip[sf_{plugin_name}]: {source_address}', uacctd)
 
         self.cli_delete(['interfaces', 'dummy', dummy_if])
 
@@ -194,8 +195,7 @@ class TestSystemFlowAccounting(VyOSUnitTestSHIM.TestCase):
 
         for server, server_config in sflow_server.items():
             tmp_srv = server
-            if is_ipv6(tmp_srv):
-                tmp_srv = tmp_srv.replace(':', '.')
+            tmp_srv = tmp_srv.replace(':', '-')
 
             if 'port' in server_config:
                 self.assertIn(f'sfprobe_receiver[sf_{tmp_srv}]: {bracketize_ipv6(server)}', uacctd)
@@ -265,16 +265,16 @@ class TestSystemFlowAccounting(VyOSUnitTestSHIM.TestCase):
         tmp = []
         for server, server_config in netflow_server.items():
             tmp_srv = server
-            if is_ipv6(tmp_srv):
-                tmp_srv = tmp_srv.replace(':', '.')
+            tmp_srv = tmp_srv.replace('.', '-')
+            tmp_srv = tmp_srv.replace(':', '-')
             tmp.append(f'nfprobe[nf_{tmp_srv}]')
         tmp.append('memory')
         self.assertIn('plugins: ' + ','.join(tmp), uacctd)
 
         for server, server_config in netflow_server.items():
             tmp_srv = server
-            if is_ipv6(tmp_srv):
-                tmp_srv = tmp_srv.replace(':', '.')
+            tmp_srv = tmp_srv.replace('.', '-')
+            tmp_srv = tmp_srv.replace(':', '-')
 
             self.assertIn(f'nfprobe_engine[nf_{tmp_srv}]: {engine_id}', uacctd)
             self.assertIn(f'nfprobe_maxflows[nf_{tmp_srv}]: {max_flows}', uacctd)