firewall: zone: T4353: fix Jinja2 linting errors

2 files changed, 51 insertions, 51 deletions

diff --git a/data/templates/zone_policy/nftables.tmpl b/data/templates/zone_policy/nftables.j2
index 9e532b79e..e4c4dd7da 100644
--- a/data/templates/zone_policy/nftables.tmpl
+++ b/data/templates/zone_policy/nftables.j2
@@ -1,113 +1,113 @@
 #!/usr/sbin/nft -f
 
 {% if cleanup_commands is vyos_defined %}
-{%   for command in cleanup_commands %}
+{%     for command in cleanup_commands %}
 {{ command }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 
 {% if zone is vyos_defined %}
 table ip filter {
-{%   for zone_name, zone_conf in zone.items() if zone_conf.ipv4 %}
-{%     if zone_conf.local_zone is vyos_defined %}
+{%     for zone_name, zone_conf in zone.items() if zone_conf.ipv4 %}
+{%         if zone_conf.local_zone is vyos_defined %}
     chain VZONE_{{ zone_name }}_IN {
         iifname lo counter return
-{%       for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.name is vyos_defined %}
+{%             for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.name is vyos_defined %}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME_{{ from_conf.firewall.name }}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%       endfor %}
+{%             endfor %}
         counter {{ zone_conf.default_action }}
     }
     chain VZONE_{{ zone_name }}_OUT {
         oifname lo counter return
-{%         for from_zone, from_conf in zone_conf.from_local.items() if from_conf.firewall.name is vyos_defined %}
+{%             for from_zone, from_conf in zone_conf.from_local.items() if from_conf.firewall.name is vyos_defined %}
         oifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME_{{ from_conf.firewall.name }}
         oifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%         endfor %}
+{%             endfor %}
         counter {{ zone_conf.default_action }}
     }
-{%     else %}
+{%         else %}
     chain VZONE_{{ zone_name }} {
         iifname { {{ zone_conf.interface | join(",") }} } counter {{ zone_conf | nft_intra_zone_action(ipv6=False) }}
-{%       if zone_conf.intra_zone_filtering is vyos_defined %}
+{%             if zone_conf.intra_zone_filtering is vyos_defined %}
         iifname { {{ zone_conf.interface | join(",") }} } counter return
-{%       endif %}
-{%       for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.name is vyos_defined %}
-{%         if zone[from_zone].local_zone is not defined %}
+{%             endif %}
+{%             for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.name is vyos_defined %}
+{%                 if zone[from_zone].local_zone is not defined %}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME_{{ from_conf.firewall.name }}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%         endif %}
-{%       endfor %}
+{%                 endif %}
+{%             endfor %}
         counter {{ zone_conf.default_action }}
     }
-{%     endif %}
-{%   endfor %}
+{%         endif %}
+{%     endfor %}
 }
 
 table ip6 filter {
-{%   for zone_name, zone_conf in zone.items() if zone_conf.ipv6 %}
-{%     if zone_conf.local_zone is vyos_defined %}
+{%     for zone_name, zone_conf in zone.items() if zone_conf.ipv6 %}
+{%         if zone_conf.local_zone is vyos_defined %}
     chain VZONE6_{{ zone_name }}_IN {
         iifname lo counter return
-{%       for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.ipv6_name is vyos_defined %}
+{%             for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.ipv6_name is vyos_defined %}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME6_{{ from_conf.firewall.ipv6_name }}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%       endfor %}
+{%             endfor %}
         counter {{ zone_conf.default_action }}
     }
     chain VZONE6_{{ zone_name }}_OUT {
         oifname lo counter return
-{%         for from_zone, from_conf in zone_conf.from_local.items() if from_conf.firewall.ipv6_name is vyos_defined %}
+{%             for from_zone, from_conf in zone_conf.from_local.items() if from_conf.firewall.ipv6_name is vyos_defined %}
         oifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME6_{{ from_conf.firewall.ipv6_name }}
         oifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%         endfor %}
+{%             endfor %}
         counter {{ zone_conf.default_action }}
     }
-{%     else %}
+{%         else %}
     chain VZONE6_{{ zone_name }} {
         iifname { {{ zone_conf.interface | join(",") }} } counter {{ zone_conf | nft_intra_zone_action(ipv6=True) }}
-{%       if zone_conf.intra_zone_filtering is vyos_defined %}
+{%             if zone_conf.intra_zone_filtering is vyos_defined %}
         iifname { {{ zone_conf.interface | join(",") }} } counter return
-{%       endif %}
-{%       for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.ipv6_name is vyos_defined %}
-{%         if zone[from_zone].local_zone is not defined %}
+{%             endif %}
+{%             for from_zone, from_conf in zone_conf.from.items() if from_conf.firewall.ipv6_name is vyos_defined %}
+{%                 if zone[from_zone].local_zone is not defined %}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter jump NAME6_{{ from_conf.firewall.ipv6_name }}
         iifname { {{ zone[from_zone].interface | join(",") }} } counter return
-{%         endif %}
-{%       endfor %}
+{%                 endif %}
+{%             endfor %}
         counter {{ zone_conf.default_action }}
     }
-{%     endif %}
-{%   endfor %}
+{%         endif %}
+{%     endfor %}
 }
 
-{%   for zone_name, zone_conf in zone.items() %}
-{%     if zone_conf.ipv4 %}
-{%       if 'local_zone' in zone_conf %}
+{%     for zone_name, zone_conf in zone.items() %}
+{%         if zone_conf.ipv4 %}
+{%             if 'local_zone' in zone_conf %}
 insert rule ip filter VYOS_FW_LOCAL counter jump VZONE_{{ zone_name }}_IN
 insert rule ip filter VYOS_FW_OUTPUT counter jump VZONE_{{ zone_name }}_OUT
-{%       else %}
+{%             else %}
 insert rule ip filter VYOS_FW_FORWARD oifname { {{ zone_conf.interface | join(',') }} } counter jump VZONE_{{ zone_name }}
-{%       endif %}
-{%     endif %}
-{%     if zone_conf.ipv6 %}
-{%       if 'local_zone' in zone_conf %}
+{%             endif %}
+{%         endif %}
+{%         if zone_conf.ipv6 %}
+{%             if 'local_zone' in zone_conf %}
 insert rule ip6 filter VYOS_FW6_LOCAL counter jump VZONE6_{{ zone_name }}_IN
 insert rule ip6 filter VYOS_FW6_OUTPUT counter jump VZONE6_{{ zone_name }}_OUT
-{%       else %}
+{%             else %}
 insert rule ip6 filter VYOS_FW6_FORWARD oifname { {{ zone_conf.interface | join(',') }} } counter jump VZONE6_{{ zone_name }}
-{%       endif %}
-{%     endif %}
-{%   endfor %}
+{%             endif %}
+{%         endif %}
+{%     endfor %}
 
 {# Ensure that state-policy rule is first in the chain #}
-{%   if firewall.state_policy is vyos_defined %}
-{%     for chain in ['VYOS_FW_FORWARD', 'VYOS_FW_OUTPUT', 'VYOS_FW_LOCAL'] %}
+{%     if firewall.state_policy is vyos_defined %}
+{%         for chain in ['VYOS_FW_FORWARD', 'VYOS_FW_OUTPUT', 'VYOS_FW_LOCAL'] %}
 insert rule ip filter {{ chain }} jump VYOS_STATE_POLICY
-{%     endfor %}
-{%     for chain in ['VYOS_FW6_FORWARD', 'VYOS_FW6_OUTPUT', 'VYOS_FW6_LOCAL'] %}
+{%         endfor %}
+{%         for chain in ['VYOS_FW6_FORWARD', 'VYOS_FW6_OUTPUT', 'VYOS_FW6_LOCAL'] %}
 insert rule ip6 filter {{ chain }} jump VYOS_STATE_POLICY6
-{%     endfor %}
-{%   endif %}
+{%         endfor %}
+{%     endif %}
 
 {% endif %}
diff --git a/src/conf_mode/zone_policy.py b/src/conf_mode/zone_policy.py
index dc0617353..070a4deea 100755
--- a/src/conf_mode/zone_policy.py
+++ b/src/conf_mode/zone_policy.py
@@ -192,7 +192,7 @@ def generate(zone_policy):
             if 'local_zone' in zone_conf:
                 zone_conf['from_local'] = get_local_from(data, zone)
 
-    render(nftables_conf, 'zone_policy/nftables.tmpl', data)
+    render(nftables_conf, 'zone_policy/nftables.j2', data)
     return None
 
 def apply(zone_policy):