flow-accounting: T4353: fix Jinja2 linting errors

3 files changed, 26 insertions, 26 deletions

diff --git a/data/templates/pmacct/override.conf.tmpl b/data/templates/pmacct/override.conf.j2
index 213569ddc..213569ddc 100644
--- a/data/templates/pmacct/override.conf.tmpl
+++ b/data/templates/pmacct/override.conf.j2
diff --git a/data/templates/pmacct/uacctd.conf.tmpl b/data/templates/pmacct/uacctd.conf.j2
index 7e4f80e95..ea6247005 100644
--- a/data/templates/pmacct/uacctd.conf.tmpl
+++ b/data/templates/pmacct/uacctd.conf.j2
@@ -20,14 +20,14 @@ imt_mem_pools_number: 169
 
 {% set plugin = [] %}
 {% if netflow.server is vyos_defined %}
-{%   for server in netflow.server %}
-{%     set _ = plugin.append('nfprobe[nf_' ~ server ~ ']') %}
-{%   endfor %}
+{%     for server in netflow.server %}
+{%         set _ = plugin.append('nfprobe[nf_' ~ server ~ ']') %}
+{%     endfor %}
 {% endif %}
 {% if sflow.server is vyos_defined %}
-{%   for server in sflow.server %}
-{%     set _ = plugin.append('sfprobe[sf_' ~ server ~ ']') %}
-{%   endfor %}
+{%     for server in sflow.server %}
+{%         set _ = plugin.append('sfprobe[sf_' ~ server ~ ']') %}
+{%     endfor %}
 {% endif %}
 {% if disable_imt is not defined %}
 {%     set _ = plugin.append('memory') %}
@@ -36,39 +36,39 @@ plugins: {{ plugin | join(',') }}
 
 {% if netflow.server is vyos_defined %}
 # NetFlow servers
-{%   for server, server_config in netflow.server.items() %}
+{%     for server, server_config in netflow.server.items() %}
 nfprobe_receiver[nf_{{ server }}]: {{ server }}:{{ server_config.port }}
 nfprobe_version[nf_{{ server }}]: {{ netflow.version }}
-{%     if netflow.engine_id is vyos_defined %}
+{%         if netflow.engine_id is vyos_defined %}
 nfprobe_engine[nf_{{ server }}]: {{ netflow.engine_id }}
-{%     endif %}
-{%     if netflow.max_flows is vyos_defined %}
+{%         endif %}
+{%         if netflow.max_flows is vyos_defined %}
 nfprobe_maxflows[nf_{{ server }}]: {{ netflow.max_flows }}
-{%     endif %}
-{%     if netflow.sampling_rate is vyos_defined %}
+{%         endif %}
+{%         if netflow.sampling_rate is vyos_defined %}
 sampling_rate[nf_{{ server }}]: {{ netflow.sampling_rate }}
-{%     endif %}
-{%     if netflow.source_address is vyos_defined %}
+{%         endif %}
+{%         if netflow.source_address is vyos_defined %}
 nfprobe_source_ip[nf_{{ server }}]: {{ netflow.source_address }}
-{%     endif %}
-{%     if netflow.timeout is vyos_defined %}
+{%         endif %}
+{%         if netflow.timeout is vyos_defined %}
 nfprobe_timeouts[nf_{{ server }}]: expint={{ netflow.timeout.expiry_interval }}:general={{ netflow.timeout.flow_generic }}:icmp={{ netflow.timeout.icmp }}:maxlife={{ netflow.timeout.max_active_life }}:tcp.fin={{ netflow.timeout.tcp_fin }}:tcp={{ netflow.timeout.tcp_generic }}:tcp.rst={{ netflow.timeout.tcp_rst }}:udp={{ netflow.timeout.udp }}
-{%     endif %}
+{%         endif %}
 
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 
 {% if sflow.server is vyos_defined %}
 # sFlow servers
-{%   for server, server_config in sflow.server.items() %}
+{%     for server, server_config in sflow.server.items() %}
 sfprobe_receiver[sf_{{ server }}]: {{ server }}:{{ server_config.port }}
 sfprobe_agentip[sf_{{ server }}]: {{ sflow.agent_address }}
-{%     if sflow.sampling_rate is vyos_defined %}
+{%         if sflow.sampling_rate is vyos_defined %}
 sampling_rate[sf_{{ server }}]: {{ sflow.sampling_rate }}
-{%     endif %}
-{%     if sflow.source_address is vyos_defined %}
+{%         endif %}
+{%         if sflow.source_address is vyos_defined %}
 sfprobe_source_ip[sf_{{ server }}]: {{ sflow.source_address }}
-{%     endif %}
+{%         endif %}
 
-{%   endfor %}
+{%     endfor %}
 {% endif %}
diff --git a/src/conf_mode/flow_accounting_conf.py b/src/conf_mode/flow_accounting_conf.py
index 25bf54790..7f7a98b04 100755
--- a/src/conf_mode/flow_accounting_conf.py
+++ b/src/conf_mode/flow_accounting_conf.py
@@ -239,8 +239,8 @@ def generate(flow_config):
     if not flow_config:
         return None
 
-    render(uacctd_conf_path, 'pmacct/uacctd.conf.tmpl', flow_config)
-    render(systemd_override, 'pmacct/override.conf.tmpl', flow_config)
+    render(uacctd_conf_path, 'pmacct/uacctd.conf.j2', flow_config)
+    render(systemd_override, 'pmacct/override.conf.j2', flow_config)
     # Reload systemd manager configuration
     call('systemctl daemon-reload')