From f1b031589e6c58296cdf73b975c71b10c407bdb3 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 10 Apr 2022 09:26:56 +0200
Subject: T4353: enable linting of Jinja2 templates

---
 data/templates/frr/rip_ripng.frr.j2       | 26 +++++++++++++-------------
 data/templates/frr/rpki.frr.tmpl          | 18 ------------------
 data/templates/frr/rpki.frr.tmpl.j2       | 18 ++++++++++++++++++
 data/templates/frr/static_routes_macro.j2 | 22 +++++++++++-----------
 4 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 data/templates/frr/rpki.frr.tmpl
 create mode 100644 data/templates/frr/rpki.frr.tmpl.j2

(limited to 'data/templates/frr')

diff --git a/data/templates/frr/rip_ripng.frr.j2 b/data/templates/frr/rip_ripng.frr.j2
index 3732371b2..dd547bb3e 100644
--- a/data/templates/frr/rip_ripng.frr.j2
+++ b/data/templates/frr/rip_ripng.frr.j2
@@ -5,32 +5,32 @@
  default-metric {{ default_metric }}
 {% endif %}
 {% if passive_interface is vyos_defined %}
-{%   for interface in passive_interface %}
+{%     for interface in passive_interface %}
  passive-interface {{ interface }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 {% if network is vyos_defined %}
-{%   for prefix in network %}
+{%     for prefix in network %}
  network {{ prefix }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 {% if interface is vyos_defined %}
-{%   for ifname in interface %}
+{%     for ifname in interface %}
  network {{ ifname }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 {% if route is vyos_defined %}
-{%   for prefix in route %}
+{%     for prefix in route %}
  route {{ prefix }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 {# timers have default values #}
  timers basic {{ timers['update'] }} {{ timers.timeout }} {{ timers.garbage_collection }}
 {% if redistribute is vyos_defined %}
-{%   for protocol, protocol_config in redistribute.items() %}
-{%     if protocol is vyos_defined('ospfv3') %}
-{%       set protocol = 'ospf6' %}
-{%     endif %}
+{%     for protocol, protocol_config in redistribute.items() %}
+{%         if protocol is vyos_defined('ospfv3') %}
+{%             set protocol = 'ospf6' %}
+{%         endif %}
  redistribute {{ protocol }} {{ 'metric ' ~ protocol_config.metric if protocol_config.metric is vyos_defined }} {{ 'route-map ' ~ protocol_config.route_map if protocol_config.route_map is vyos_defined }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
diff --git a/data/templates/frr/rpki.frr.tmpl b/data/templates/frr/rpki.frr.tmpl
deleted file mode 100644
index 3f4fd3236..000000000
--- a/data/templates/frr/rpki.frr.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-!
-{# as FRR does not support deleting the entire rpki section we leave it in place even when it's empty #}
-rpki
-{% if cache is vyos_defined %}
-{%   for peer, peer_config in cache.items() %}
-{#     port is mandatory and preference uses a default value #}
-{%     if peer_config.ssh.username is vyos_defined %}
- rpki cache {{ peer | replace('_', '-') }} {{ peer_config.port }} {{ peer_config.ssh.username }} {{ peer_config.ssh.private_key_file }} {{ peer_config.ssh.public_key_file }} {{ peer_config.ssh.known_hosts_file }} preference {{ peer_config.preference }}
-{%     else %}
- rpki cache {{ peer | replace('_', '-') }} {{ peer_config.port }} preference {{ peer_config.preference }}
-{%     endif %}
-{%   endfor %}
-{% endif %}
-{% if polling_period is vyos_defined %}
- rpki polling_period {{ polling_period }}
-{% endif %}
-exit
-!
diff --git a/data/templates/frr/rpki.frr.tmpl.j2 b/data/templates/frr/rpki.frr.tmpl.j2
new file mode 100644
index 000000000..9a549d6de
--- /dev/null
+++ b/data/templates/frr/rpki.frr.tmpl.j2
@@ -0,0 +1,18 @@
+!
+{# as FRR does not support deleting the entire rpki section we leave it in place even when it's empty #}
+rpki
+{% if cache is vyos_defined %}
+{%     for peer, peer_config in cache.items() %}
+{#         port is mandatory and preference uses a default value #}
+{%         if peer_config.ssh.username is vyos_defined %}
+ rpki cache {{ peer | replace('_', '-') }} {{ peer_config.port }} {{ peer_config.ssh.username }} {{ peer_config.ssh.private_key_file }} {{ peer_config.ssh.public_key_file }} {{ peer_config.ssh.known_hosts_file }} preference {{ peer_config.preference }}
+{%         else %}
+ rpki cache {{ peer | replace('_', '-') }} {{ peer_config.port }} preference {{ peer_config.preference }}
+{%         endif %}
+{%     endfor %}
+{% endif %}
+{% if polling_period is vyos_defined %}
+ rpki polling_period {{ polling_period }}
+{% endif %}
+exit
+!
diff --git a/data/templates/frr/static_routes_macro.j2 b/data/templates/frr/static_routes_macro.j2
index 0b242a868..1c64ac58b 100644
--- a/data/templates/frr/static_routes_macro.j2
+++ b/data/templates/frr/static_routes_macro.j2
@@ -1,24 +1,24 @@
 {% macro static_routes(ip_ipv6, prefix, prefix_config, table=None) %}
-{%   if prefix_config.blackhole is vyos_defined %}
+{% if prefix_config.blackhole is vyos_defined %}
 {{ ip_ipv6 }} route {{ prefix }} blackhole {{ prefix_config.blackhole.distance if prefix_config.blackhole.distance is vyos_defined }} {{ 'tag ' ~ prefix_config.blackhole.tag if prefix_config.blackhole.tag is vyos_defined }} {{ 'table ' ~ table if table is vyos_defined and table is not none }}
-{%   endif %}
-{%   if prefix_config.reject is vyos_defined %}
+{% endif %}
+{% if prefix_config.reject is vyos_defined %}
 {{ ip_ipv6 }} route {{ prefix }} reject {{ prefix_config.reject.distance if prefix_config.reject.distance is vyos_defined }} {{ 'tag ' ~ prefix_config.reject.tag if prefix_config.reject.tag is vyos_defined }} {{ 'table ' ~ table if table is vyos_defined }}
-{%   endif %}
-{%   if prefix_config.dhcp_interface is vyos_defined %}
+{% endif %}
+{% if prefix_config.dhcp_interface is vyos_defined %}
 {%     set next_hop = prefix_config.dhcp_interface | get_dhcp_router %}
 {%     if next_hop is vyos_defined %}
 {{ ip_ipv6 }} route {{ prefix }} {{ next_hop }} {{ prefix_config.dhcp_interface }} {{ 'table ' ~ table if table is vyos_defined }}
 {%     endif %}
-{%   endif %}
-{%   if prefix_config.interface is vyos_defined %}
+{% endif %}
+{% if prefix_config.interface is vyos_defined %}
 {%     for interface, interface_config in prefix_config.interface.items() if interface_config.disable is not defined %}
 {{ ip_ipv6 }} route {{ prefix }} {{ interface }} {{ interface_config.distance if interface_config.distance is vyos_defined }} {{ 'nexthop-vrf ' ~ interface_config.vrf if interface_config.vrf is vyos_defined }} {{ 'table ' ~ table if table is vyos_defined }}
 {%     endfor %}
-{%   endif %}
-{%   if prefix_config.next_hop is vyos_defined and prefix_config.next_hop is not none %}
+{% endif %}
+{% if prefix_config.next_hop is vyos_defined and prefix_config.next_hop is not none %}
 {%     for next_hop, next_hop_config in prefix_config.next_hop.items() if next_hop_config.disable is not defined %}
-{{ ip_ipv6 }} route {{ prefix }} {{ next_hop }} {{ next_hop_config.interface if next_hop_config.interface is vyos_defined }} {{ next_hop_config.distance if next_hop_config.distance is vyos_defined }} {{ 'nexthop-vrf ' ~ next_hop_config.vrf if next_hop_config.vrf is vyos_defined }} {{ 'table ' ~ table if table is vyos_defined}}
+{{ ip_ipv6 }} route {{ prefix }} {{ next_hop }} {{ next_hop_config.interface if next_hop_config.interface is vyos_defined }} {{ next_hop_config.distance if next_hop_config.distance is vyos_defined }} {{ 'nexthop-vrf ' ~ next_hop_config.vrf if next_hop_config.vrf is vyos_defined }} {{ 'table ' ~ table if table is vyos_defined }}
 {%     endfor %}
-{%   endif %}
+{% endif %}
 {% endmacro %}
-- 
cgit v1.2.3