From 644a0fe475b137185ada36a6b7a0ca43259f1d0a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 1 May 2022 20:27:07 +0200
Subject: pppoe: T4353: fix Jinja2 linting errors

---
 data/templates/pppoe/ip-down.script.tmpl   | 38 --------------
 data/templates/pppoe/ip-pre-up.script.tmpl | 18 -------
 data/templates/pppoe/ip-up.script.tmpl     | 49 ------------------
 data/templates/pppoe/ipv6-up.script.tmpl   | 46 -----------------
 data/templates/pppoe/peer.j2               | 82 ++++++++++++++++++++++++++++++
 data/templates/pppoe/peer.tmpl             | 82 ------------------------------
 src/conf_mode/interfaces-pppoe.py          |  2 +-
 7 files changed, 83 insertions(+), 234 deletions(-)
 delete mode 100644 data/templates/pppoe/ip-down.script.tmpl
 delete mode 100644 data/templates/pppoe/ip-pre-up.script.tmpl
 delete mode 100644 data/templates/pppoe/ip-up.script.tmpl
 delete mode 100644 data/templates/pppoe/ipv6-up.script.tmpl
 create mode 100644 data/templates/pppoe/peer.j2
 delete mode 100644 data/templates/pppoe/peer.tmpl

diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl
deleted file mode 100644
index 0be7b03c8..000000000
--- a/data/templates/pppoe/ip-down.script.tmpl
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# As PPPoE is an "on demand" interface we need to re-configure it when it
-# becomes up
-if [ "$6" != "{{ ifname }}" ]; then
-    exit
-fi
-
-# add some info to syslog
-DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
-logger -t pppd[$DIALER_PID] "executing $0"
-
-{% if connect_on_demand is not defined %}
-# See https://phabricator.vyos.net/T2248. Determine if we are enslaved to a
-# VRF, this is needed to properly insert the default route.
-VRF_NAME=""
-if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
-    # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ ifname }}/upper_*))
-    # Remove upper_ prefix from result string
-    VRF=${VRF#"upper_"}
-    # Populate variable to run in VR context
-    VRF_NAME="vrf ${VRF_NAME}"
-fi
-
-{%   if default_route != 'none' %}
-# Always delete default route when interface goes down if we installed it
-vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ ifname }} ${VRF_NAME}"
-{%      if ipv6.address.autoconf is vyos_defined %}
-vtysh -c "conf t" ${VRF_NAME} -c "no ipv6 route ::/0 {{ ifname }} ${VRF_NAME}"
-{%      endif %}
-{%   endif %}
-{% endif %}
-
-{% if dhcpv6_options.pd is vyos_defined %}
-# Stop wide dhcpv6 client
-systemctl stop dhcp6c@{{ ifname }}.service
-{% endif %}
diff --git a/data/templates/pppoe/ip-pre-up.script.tmpl b/data/templates/pppoe/ip-pre-up.script.tmpl
deleted file mode 100644
index a54e4e9bd..000000000
--- a/data/templates/pppoe/ip-pre-up.script.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# As PPPoE is an "on demand" interface we need to re-configure it when it
-# becomes up
-if [ "$6" != "{{ ifname }}" ]; then
-    exit
-fi
-
-# add some info to syslog
-DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
-logger -t pppd[$DIALER_PID] "executing $0"
-
-echo "{{ description }}" > /sys/class/net/{{ ifname }}/ifalias
-
-{% if vrf %}
-logger -t pppd[$DIALER_PID] "configuring dialer interface $6 for VRF {{ vrf }}"
-ip link set dev {{ ifname }} master {{ vrf }}
-{% endif %}
diff --git a/data/templates/pppoe/ip-up.script.tmpl b/data/templates/pppoe/ip-up.script.tmpl
deleted file mode 100644
index 302756960..000000000
--- a/data/templates/pppoe/ip-up.script.tmpl
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# As PPPoE is an "on demand" interface we need to re-configure it when it
-# becomes up
-if [ "$6" != "{{ ifname }}" ]; then
-    exit
-fi
-
-{% if connect_on_demand is not defined %}
-# add some info to syslog
-DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
-logger -t pppd[$DIALER_PID] "executing $0"
-
-{%   if default_route != 'none' %}
-# See https://phabricator.vyos.net/T2248 & T2220. Determine if we are enslaved
-# to a VRF, this is needed to properly insert the default route.
-
-SED_OPT="^ip route"
-VRF_NAME=""
-if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
-    # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ ifname }}/upper_*))
-    # Remove upper_ prefix from result string
-    VRF=${VRF#"upper_"}
-    # generate new SED command
-    SED_OPT="vrf ${VRF}"
-    # generate vtysh option
-    VRF_NAME="vrf ${VRF}"
-fi
-
-{%     if default_route == 'auto' %}
-# Only insert a new default route if there is no default route configured
-routes=$(vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep 0.0.0.0/0 | wc -l)
-if [ "$routes" -ne 0 ]; then
-    exit 1
-fi
-
-{%     elif default_route == 'force' %}
-# Retrieve current static default routes and remove it from the routing table
-vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep 0.0.0.0/0 | while read route ; do
-    vtysh -c "conf t" ${VTY_OPT} -c "no ${route} ${VRF_NAME}"
-done
-{%     endif %}
-
-# Add default route to default or VRF routing table
-vtysh -c "conf t" ${VTY_OPT} -c "ip route 0.0.0.0/0 {{ ifname }} ${VRF_NAME}"
-logger -t pppd[$DIALER_PID] "added default route via {{ ifname }} ${VRF_NAME}"
-{%   endif %}
-{% endif %}
diff --git a/data/templates/pppoe/ipv6-up.script.tmpl b/data/templates/pppoe/ipv6-up.script.tmpl
deleted file mode 100644
index da73cb4d5..000000000
--- a/data/templates/pppoe/ipv6-up.script.tmpl
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# As PPPoE is an "on demand" interface we need to re-configure it when it
-# becomes up
-
-if [ "$6" != "{{ ifname }}" ]; then
-    exit
-fi
-
-
-{% if default_route != 'none' %}
-# See https://phabricator.vyos.net/T2248 & T2220. Determine if we are enslaved
-# to a VRF, this is needed to properly insert the default route.
-
-SED_OPT="^ipv6 route"
-VRF_NAME=""
-if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
-    # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ ifname }}/upper_*))
-    # Remove upper_ prefix from result string
-    VRF=${VRF#"upper_"}
-    # generate new SED command
-    SED_OPT="vrf ${VRF}"
-    # generate vtysh option
-    VRF_NAME="vrf ${VRF}"
-fi
-
-{%   if default_route == 'auto' %}
-# Only insert a new default route if there is no default route configured
-routes=$(vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep ::/0 | wc -l)
-if [ "$routes" -ne 0 ]; then
-    exit 1
-fi
-
-{%   elif default_route == 'force' %}
-# Retrieve current static default routes and remove it from the routing table
-vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep ::/0 | while read route ; do
-    vtysh -c "conf t" ${VTY_OPT} -c "no ${route} ${VRF_NAME}"
-done
-{%   endif %}
-
-# Add default route to default or VRF routing table
-vtysh -c "conf t" ${VTY_OPT} -c "ipv6 route ::/0 {{ ifname }} ${VRF_NAME}"
-logger -t pppd[$DIALER_PID] "added default route via {{ ifname }} ${VRF_NAME}"
-{% endif %}
-
diff --git a/data/templates/pppoe/peer.j2 b/data/templates/pppoe/peer.j2
new file mode 100644
index 000000000..6221abb9b
--- /dev/null
+++ b/data/templates/pppoe/peer.j2
@@ -0,0 +1,82 @@
+### Autogenerated by interfaces-pppoe.py ###
+{{ '# ' ~ description if description is vyos_defined else '' }}
+
+# Require peer to provide the local IP address if it is not
+# specified explicitly in the config file.
+noipdefault
+
+# Don't show the password in logfiles:
+hide-password
+
+# Standard Link Control Protocol (LCP) parameters:
+lcp-echo-interval 20
+lcp-echo-failure 3
+
+# RFC 2516, paragraph 7 mandates that the following options MUST NOT be
+# requested and MUST be rejected if requested by the peer:
+# Address-and-Control-Field-Compression (ACFC)
+noaccomp
+
+# Asynchronous-Control-Character-Map (ACCM)
+default-asyncmap
+
+# Override any connect script that may have been set in /etc/ppp/options.
+connect /bin/true
+
+# Don't try to authenticate the remote node
+noauth
+
+# Don't try to proxy ARP for the remote endpoint. User can set proxy
+# arp entries up manually if they wish. More importantly, having
+# the "proxyarp" parameter set disables the "defaultroute" option.
+noproxyarp
+
+# Unlimited connection attempts
+maxfail 0
+
+plugin rp-pppoe.so {{ source_interface }}
+{% if access_concentrator is vyos_defined %}
+rp_pppoe_ac '{{ access_concentrator }}'
+{% endif %}
+{% if service_name is vyos_defined %}
+rp_pppoe_service '{{ service_name }}'
+{% endif %}
+
+persist
+ifname {{ ifname }}
+ipparam {{ ifname }}
+debug
+mtu {{ mtu }}
+mru {{ mtu }}
+
+{% if authentication is vyos_defined %}
+{{ 'user "' + authentication.user + '"' if authentication.user is vyos_defined }}
+{{ 'password "' + authentication.password + '"' if authentication.password is vyos_defined }}
+{% endif %}
+
+{{ "usepeerdns" if no_peer_dns is not vyos_defined }}
+
+{% if ipv6 is vyos_defined %}
++ipv6 {{ 'ipv6cp-use-ipaddr' if ipv6.address.autoconf is vyos_defined }}
+{% else %}
+noipv6
+{% endif %}
+
+{% if connect_on_demand is vyos_defined %}
+demand
+# See T2249. PPP default route options should only be set when in on-demand
+# mode. As soon as we are not in on-demand mode the default-route handling is
+# passed to the ip-up.d/ip-down.s scripts which is required for VRF support.
+{%     if 'auto' in default_route %}
+defaultroute
+{{ 'defaultroute6' if ipv6 is vyos_defined }}
+{%     elif 'force' in default_route %}
+defaultroute
+replacedefaultroute
+{{ 'defaultroute6' if ipv6 is vyos_defined }}
+{%     endif %}
+{% else %}
+nodefaultroute
+noreplacedefaultroute
+{{ 'nodefaultroute6' if ipv6 is vyos_defined }}
+{% endif %}
diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl
deleted file mode 100644
index d6d63debf..000000000
--- a/data/templates/pppoe/peer.tmpl
+++ /dev/null
@@ -1,82 +0,0 @@
-### Autogenerated by interfaces-pppoe.py ###
-{{ '# ' ~ description if description is vyos_defined else '' }}
-
-# Require peer to provide the local IP address if it is not
-# specified explicitly in the config file.
-noipdefault
-
-# Don't show the password in logfiles:
-hide-password
-
-# Standard Link Control Protocol (LCP) parameters:
-lcp-echo-interval 20
-lcp-echo-failure 3
-
-# RFC 2516, paragraph 7 mandates that the following options MUST NOT be
-# requested and MUST be rejected if requested by the peer:
-# Address-and-Control-Field-Compression (ACFC)
-noaccomp
-
-# Asynchronous-Control-Character-Map (ACCM)
-default-asyncmap
-
-# Override any connect script that may have been set in /etc/ppp/options.
-connect /bin/true
-
-# Don't try to authenticate the remote node
-noauth
-
-# Don't try to proxy ARP for the remote endpoint. User can set proxy
-# arp entries up manually if they wish. More importantly, having
-# the "proxyarp" parameter set disables the "defaultroute" option.
-noproxyarp
-
-# Unlimited connection attempts
-maxfail 0
-
-plugin rp-pppoe.so {{ source_interface }}
-{% if access_concentrator is vyos_defined %}
-rp_pppoe_ac '{{ access_concentrator }}'
-{% endif %}
-{% if service_name is vyos_defined %}
-rp_pppoe_service '{{ service_name }}'
-{% endif %}
-
-persist
-ifname {{ ifname }}
-ipparam {{ ifname }}
-debug
-mtu {{ mtu }}
-mru {{ mtu }}
-
-{% if authentication is vyos_defined %}
-{{ 'user "' + authentication.user + '"' if authentication.user is vyos_defined }}
-{{ 'password "' + authentication.password + '"' if authentication.password is vyos_defined }}
-{% endif %}
-
-{{ "usepeerdns" if no_peer_dns is not vyos_defined }}
-
-{% if ipv6 is vyos_defined %}
-+ipv6 {{ 'ipv6cp-use-ipaddr' if ipv6.address.autoconf is vyos_defined }}
-{% else %}
-noipv6
-{% endif %}
-
-{% if connect_on_demand is vyos_defined %}
-demand
-# See T2249. PPP default route options should only be set when in on-demand
-# mode. As soon as we are not in on-demand mode the default-route handling is
-# passed to the ip-up.d/ip-down.s scripts which is required for VRF support.
-{%   if 'auto' in default_route %}
-defaultroute
-{{ 'defaultroute6' if ipv6 is vyos_defined }}
-{%   elif 'force' in default_route %}
-defaultroute
-replacedefaultroute
-{{ 'defaultroute6' if ipv6 is vyos_defined }}
-{%   endif %}
-{% else %}
-nodefaultroute
-noreplacedefaultroute
-{{ 'nodefaultroute6' if ipv6 is vyos_defined }}
-{% endif %}
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py
index 26daa8381..e2fdc7a42 100755
--- a/src/conf_mode/interfaces-pppoe.py
+++ b/src/conf_mode/interfaces-pppoe.py
@@ -92,7 +92,7 @@ def generate(pppoe):
         return None
 
     # Create PPP configuration files
-    render(config_pppoe, 'pppoe/peer.tmpl', pppoe, permission=0o640)
+    render(config_pppoe, 'pppoe/peer.j2', pppoe, permission=0o640)
 
     return None
 
-- 
cgit v1.2.3