From f0a13824f39f9da95c77234ad000ce66c3c3b04e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 1 May 2022 18:51:22 +0200
Subject: lldp: T4353: fix Jinja2 linting errors

---
 data/templates/lldp/lldpd.j2       |  2 ++
 data/templates/lldp/lldpd.tmpl     |  2 --
 data/templates/lldp/vyos.conf.j2   | 25 +++++++++++++++++++++++++
 data/templates/lldp/vyos.conf.tmpl | 25 -------------------------
 src/conf_mode/lldp.py              |  4 ++--
 5 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 data/templates/lldp/lldpd.j2
 delete mode 100644 data/templates/lldp/lldpd.tmpl
 create mode 100644 data/templates/lldp/vyos.conf.j2
 delete mode 100644 data/templates/lldp/vyos.conf.tmpl

diff --git a/data/templates/lldp/lldpd.j2 b/data/templates/lldp/lldpd.j2
new file mode 100644
index 000000000..3c499197d
--- /dev/null
+++ b/data/templates/lldp/lldpd.j2
@@ -0,0 +1,2 @@
+### Autogenerated by lldp.py ###
+DAEMON_ARGS="-M 4 {{ '-x' if snmp.enable is vyos_defined }} {{ '-c' if legacy_protocols.cdp is vyos_defined }} {{ '-e' if legacy_protocols.edp is vyos_defined }} {{ '-f' if legacy_protocols.fdp is vyos_defined }} {{ '-s' if legacy_protocols.sonmp is vyos_defined }}"
diff --git a/data/templates/lldp/lldpd.tmpl b/data/templates/lldp/lldpd.tmpl
deleted file mode 100644
index 9ab1e4367..000000000
--- a/data/templates/lldp/lldpd.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-### Autogenerated by lldp.py ###
-DAEMON_ARGS="-M 4{% if snmp.enable is vyos_defined %} -x{% endif %}{% if legacy_protocols.cdp is vyos_defined %} -c{% endif %}{% if legacy_protocols.edp is vyos_defined %} -e{% endif %}{% if legacy_protocols.fdp is vyos_defined %} -f{% endif %}{% if legacy_protocols.sonmp is vyos_defined %} -s{% endif %}"
diff --git a/data/templates/lldp/vyos.conf.j2 b/data/templates/lldp/vyos.conf.j2
new file mode 100644
index 000000000..ec84231d8
--- /dev/null
+++ b/data/templates/lldp/vyos.conf.j2
@@ -0,0 +1,25 @@
+### Autogenerated by lldp.py ###
+
+configure system platform VyOS
+configure system description "VyOS {{ version }}"
+{% if interface is vyos_defined %}
+{%     set tmp = [] %}
+{%     for iface, iface_options in interface.items() if not iface_options.disable %}
+{%         if iface == 'all' %}
+{%             set iface = '*' %}
+{%         endif %}
+{%         set _ = tmp.append(iface) %}
+{%         if iface_options.location is vyos_defined %}
+{%             if iface_options.location.elin is vyos_defined %}
+configure ports {{ iface }} med location elin "{{ iface_options.location.elin }}"
+{%             endif %}
+{%             if iface_options.location.coordinate_based is vyos_defined %}
+configure ports {{ iface }} med location coordinate latitude "{{ iface_options.location.coordinate_based.latitude }}" longitude "{{ iface_options.location.coordinate_based.longitude }}" altitude "{{ iface_options.location.coordinate_based.altitude }}m" datum "{{ iface_options.location.coordinate_based.datum }}"
+{%             endif %}
+{%         endif %}
+{%     endfor %}
+configure system interface pattern "{{ tmp | join(",") }}"
+{% endif %}
+{% if management_address is vyos_defined %}
+configure system ip management pattern {{ management_address | join(",") }}
+{% endif %}
diff --git a/data/templates/lldp/vyos.conf.tmpl b/data/templates/lldp/vyos.conf.tmpl
deleted file mode 100644
index c34a851aa..000000000
--- a/data/templates/lldp/vyos.conf.tmpl
+++ /dev/null
@@ -1,25 +0,0 @@
-### Autogenerated by lldp.py ###
-
-configure system platform VyOS
-configure system description "VyOS {{ version }}"
-{% if interface is vyos_defined %}
-{%   set tmp = [] %}
-{%   for iface, iface_options in interface.items() if not iface_options.disable %}
-{%     if iface == 'all' %}
-{%       set iface = '*' %}
-{%     endif %}
-{%     set _ = tmp.append(iface) %}
-{%     if iface_options.location is vyos_defined %}
-{%       if iface_options.location.elin is vyos_defined %}
-configure ports {{ iface }} med location elin "{{ iface_options.location.elin }}"
-{%       endif %}
-{%       if iface_options.location.coordinate_based is vyos_defined %}
-configure ports {{ iface }} med location coordinate latitude "{{ iface_options.location.coordinate_based.latitude }}" longitude "{{ iface_options.location.coordinate_based.longitude }}" altitude "{{ iface_options.location.coordinate_based.altitude }}m" datum "{{ iface_options.location.coordinate_based.datum }}"
-{%       endif %}
-{%     endif %}
-{%   endfor %}
-configure system interface pattern "{{ tmp | join(",") }}"
-{% endif %}
-{% if management_address is vyos_defined %}
-configure system ip management pattern {{ management_address | join(",") }}
-{% endif %}
diff --git a/src/conf_mode/lldp.py b/src/conf_mode/lldp.py
index 2bb615eb7..c703c1fe0 100755
--- a/src/conf_mode/lldp.py
+++ b/src/conf_mode/lldp.py
@@ -111,8 +111,8 @@ def generate(lldp):
     if lldp is None:
         return
 
-    render(config_file, 'lldp/lldpd.tmpl', lldp)
-    render(vyos_config_file, 'lldp/vyos.conf.tmpl', lldp)
+    render(config_file, 'lldp/lldpd.j2', lldp)
+    render(vyos_config_file, 'lldp/vyos.conf.j2', lldp)
 
 def apply(lldp):
     systemd_service = 'lldpd.service'
-- 
cgit v1.2.3