ifconfig: T2653: move pppoe interface to get_config_dict()

6 files changed, 92 insertions, 42 deletions

diff --git a/data/templates/dhcp-client/ipv6_new.tmpl b/data/templates/dhcp-client/ipv6_new.tmpl
new file mode 100644
index 000000000..112431c5f
--- /dev/null
+++ b/data/templates/dhcp-client/ipv6_new.tmpl
@@ -0,0 +1,47 @@
+# generated by dhcp.py
+# man https://www.unix.com/man-page/debian/5/dhcp6c.conf/
+
+interface {{ ifname }} {
+    request domain-name-servers;
+    request domain-name;
+{% if dhcpv6_options is defined %}
+{%   if dhcpv6_options.parameters_only is defined %}
+    information-only;
+{%    endif %}
+{%    if dhcpv6_options.temporary is not defined %}
+    send ia-na 1; # non-temporary address
+{%    endif %}
+{%    if dhcpv6_options.prefix_delegation is defined %}
+    send ia-pd 2; # prefix delegation
+{%    endif %}
+{%  endif %}
+};
+
+{% if dhcpv6_options is defined %}
+{%   if dhcpv6_options.temporary is not defined %}
+id-assoc na 1 {
+    # Identity association NA
+};
+{%   endif %}
+
+{%   if dhcpv6_options.prefix_delegation is defined %}
+id-assoc pd 2 {
+{%     if dhcpv6_options.prefix_delegation.length is defined %}
+    prefix ::/{{ dhcpv6_options.prefix_delegation.length }} infinity;
+{%     endif %}
+{%     for interface in dhcpv6_options.prefix_delegation.interface %}
+    prefix-interface {{ interface }} {
+{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_id is defined %}
+        sla-id {{ dhcpv6_options.prefix_delegation.interface[interface].sla_id }};
+{%       endif %}
+{%       if dhcpv6_options.prefix_delegation.interface[interface].sla_len is defined %}
+        sla-len {{ dhcpv6_options.prefix_delegation.interface[interface].sla_len }};
+{%       endif %}
+{%       if dhcpv6_options.prefix_delegation.interface[interface].address is defined %}
+        ifid {{ dhcpv6_options.prefix_delegation.interface[interface].address }};
+{%       endif %}
+    };
+{%     endfor %}
+};
+{%   endif %}
+{% endif %}
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl
index 9e6bd2a8e..f69f9fc1a 100644
--- a/data/templates/pppoe/ip-down.script.tmpl
+++ b/data/templates/pppoe/ip-down.script.tmpl
@@ -2,21 +2,21 @@
 
 # As PPPoE is an "on demand" interface we need to re-configure it when it
 # becomes up
-if [ "$6" != "{{ intf }}" ]; then
+if [ "$6" != "{{ ifname }}" ]; then
     exit
 fi
 
 # add some info to syslog
-DIALER_PID=$(cat /var/run/{{ intf }}.pid)
+DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
 logger -t pppd[$DIALER_PID] "executing $0"
 
 {% if not on_demand %}
 # 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/{{ intf }}/upper_* ]; then
+if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
     # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ intf }}/upper_*))
+    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
@@ -24,13 +24,13 @@ if [ -d /sys/class/net/{{ intf }}/upper_* ]; then
 fi
 
 # Always delete default route when interface goes down
-vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ intf }} ${VRF_NAME}"
+vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ ifname }} ${VRF_NAME}"
 {%   if ipv6_enable %}
-vtysh -c "conf t" ${VRF_NAME} -c "no ipv6 route ::/0 {{ intf }} ${VRF_NAME}"
+vtysh -c "conf t" ${VRF_NAME} -c "no ipv6 route ::/0 {{ ifname }} ${VRF_NAME}"
 {%   endif %}
 {% endif %}
 
 {% if dhcpv6_pd_interfaces %}
 # Start wide dhcpv6 client
-systemctl stop dhcp6c@{{ intf }}.service
+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
index 6a2d2af94..cf85ed067 100644
--- a/data/templates/pppoe/ip-pre-up.script.tmpl
+++ b/data/templates/pppoe/ip-pre-up.script.tmpl
@@ -2,17 +2,17 @@
 
 # As PPPoE is an "on demand" interface we need to re-configure it when it
 # becomes up
-if [ "$6" != "{{ intf }}" ]; then
+if [ "$6" != "{{ ifname }}" ]; then
     exit
 fi
 
 # add some info to syslog
-DIALER_PID=$(cat /var/run/{{ intf }}.pid)
+DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
 logger -t pppd[$DIALER_PID] "executing $0"
 
-echo "{{ description }}" > /sys/class/net/{{ intf }}/ifalias
+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 {{ intf }} master {{ 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
index a274296b6..6adea4bd7 100644
--- a/data/templates/pppoe/ip-up.script.tmpl
+++ b/data/templates/pppoe/ip-up.script.tmpl
@@ -2,13 +2,13 @@
 
 # As PPPoE is an "on demand" interface we need to re-configure it when it
 # becomes up
-if [ "$6" != "{{ intf }}" ]; then
+if [ "$6" != "{{ ifname }}" ]; then
     exit
 fi
 
 {% if not on_demand %}
 # add some info to syslog
-DIALER_PID=$(cat /var/run/{{ intf }}.pid)
+DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
 logger -t pppd[$DIALER_PID] "executing $0"
 
 {%   if default_route != 'none' -%}
@@ -17,9 +17,9 @@ logger -t pppd[$DIALER_PID] "executing $0"
 
 SED_OPT="^ip route"
 VRF_NAME=""
-if [ -d /sys/class/net/{{ intf }}/upper_* ]; then
+if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
     # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ intf }}/upper_*))
+    VRF=$(basename $(ls -d /sys/class/net/{{ ifname }}/upper_*))
     # Remove upper_ prefix from result string
     VRF=${VRF#"upper_"}
     # generate new SED command
@@ -43,7 +43,7 @@ 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 {{ intf }} ${VRF_NAME}"
-logger -t pppd[$DIALER_PID] "added default route via {{ intf }} ${VRF_NAME}"
+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
index 097f1d4c3..511e288ea 100644
--- a/data/templates/pppoe/ipv6-up.script.tmpl
+++ b/data/templates/pppoe/ipv6-up.script.tmpl
@@ -3,17 +3,15 @@
 # As PPPoE is an "on demand" interface we need to re-configure it when it
 # becomes up
 
-if [ "$6" != "{{ intf }}" ]; then
+if [ "$6" != "{{ ifname }}" ]; then
     exit
 fi
 
-set -x
-
 {% if ipv6_autoconf -%}
 # add some info to syslog
-DIALER_PID=$(cat /var/run/{{ intf }}.pid)
+DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
 logger -t pppd[$DIALER_PID] "executing $0"
-logger -t pppd[$DIALER_PID] "configuring interface {{ intf }} via {{ source_interface }}"
+logger -t pppd[$DIALER_PID] "configuring interface {{ ifname }} via {{ source_interface }}"
 
 # Configure interface-specific Host/Router behaviour.
 # Note: It is recommended to have the same setting on all interfaces; mixed
@@ -22,7 +20,7 @@ logger -t pppd[$DIALER_PID] "configuring interface {{ intf }} via {{ source_inte
 # 0  Forwarding disabled
 # 1  Forwarding enabled
 #
-echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/forwarding
+echo 1 > /proc/sys/net/ipv6/conf/{{ ifname }}/forwarding
 
 # Accept Router Advertisements; autoconfigure using them.
 #
@@ -36,15 +34,15 @@ echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/forwarding
 # 2  Overrule forwarding behaviour. Accept Router Advertisements
 #    even if forwarding is enabled.
 #
-echo 2 > /proc/sys/net/ipv6/conf/{{ intf }}/accept_ra
+echo 2 > /proc/sys/net/ipv6/conf/{{ ifname }}/accept_ra
 
 # Autoconfigure addresses using Prefix Information in Router Advertisements.
-echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/autoconf
+echo 1 > /proc/sys/net/ipv6/conf/{{ ifname }}/autoconf
 {% endif %}
 
 {% if dhcpv6_pd_interfaces %}
 # Start wide dhcpv6 client
-systemctl start dhcp6c@{{ intf }}.service
+systemctl start dhcp6c@{{ ifname }}.service
 {% endif %}
 
 
@@ -54,9 +52,9 @@ systemctl start dhcp6c@{{ intf }}.service
 
 SED_OPT="^ipv6 route"
 VRF_NAME=""
-if [ -d /sys/class/net/{{ intf }}/upper_* ]; then
+if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
     # Determine upper (VRF) interface
-    VRF=$(basename $(ls -d /sys/class/net/{{ intf }}/upper_*))
+    VRF=$(basename $(ls -d /sys/class/net/{{ ifname }}/upper_*))
     # Remove upper_ prefix from result string
     VRF=${VRF#"upper_"}
     # generate new SED command
@@ -80,8 +78,8 @@ done
 {%     endif %}
 
 # Add default route to default or VRF routing table
-vtysh -c "conf t" ${VTY_OPT} -c "ipv6 route ::/0 {{ intf }} ${VRF_NAME}"
-logger -t pppd[$DIALER_PID] "added default route via {{ intf }} ${VRF_NAME}"
+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.tmpl b/data/templates/pppoe/peer.tmpl
index fb85265b2..e909843a5 100644
--- a/data/templates/pppoe/peer.tmpl
+++ b/data/templates/pppoe/peer.tmpl
@@ -40,32 +40,37 @@ maxfail 0
 plugin rp-pppoe.so
 {{ source_interface }}
 persist
-ifname {{ intf }}
-ipparam {{ intf }}
+ifname {{ ifname }}
+ipparam {{ ifname }}
 debug
 mtu {{ mtu }}
 mru {{ mtu }}
-user "{{ auth_username }}"
-password "{{ auth_password }}"
-{% if name_server -%}
-usepeerdns
+
+{% if authentication is defined %}
+{{ "user " + authentication.user if authentication.user is defined }}
+{{ "password " + authentication.password if authentication.password is defined }}
 {% endif %}
-{% if ipv6_enable -%}
+
+{{ "usepeerdns" if no_peer_dns is not defined }}
+
+{% if ipv6 is defined and ipv6.enable is defined -%}
 +ipv6
 ipv6cp-use-ipaddr
 {% endif %}
-{% if service_name -%}
+
+{% if service_name is defined -%}
 rp_pppoe_service "{{ service_name }}"
 {% endif %}
-{% if on_demand %}
+
+{% if connect_on_demand is 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 -%}
+{%   if 'auto' in default_route -%}
 defaultroute
-{% elif 'force' in default_route -%}
+{%   elif 'force' in default_route -%}
 defaultroute
 replacedefaultroute
-{% endif %}
+{%   endif %}
 {% endif %}