ifconfig: T2653: move pppoe interface to get_config_dict()

1 files changed, 17 insertions, 12 deletions

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 %}