Merge branch 'dhcpv6-pd-t2506' of github.com:c-po/vyos-1x into current

* 'dhcpv6-pd-t2506' of github.com:c-po/vyos-1x:
  dhcpv6-pd: T2506: use common dictionary definition for config parameters
  dhcpv6-pd: T2506: add option to request specific prefix length
  dhcpv6-pd: pppoe: T2506: restructure CLI

1 files changed, 6 insertions, 3 deletions

diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 6cfe24d3e..490f14726 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -10,7 +10,7 @@ interface {{ ifname }} {
 {%  if not dhcpv6_temporary %}
     send ia-na 1; # non-temporary address
 {%  endif %}
-{%  if dhcpv6_pd %}
+{%  if dhcpv6_pd_interfaces %}
     send ia-pd 2; # prefix delegation
 {%  endif %}
 };
@@ -21,9 +21,12 @@ id-assoc na 1 {
 };
 {%  endif %}
 
-{%  if dhcpv6_pd %}
+{%  if dhcpv6_pd_interfaces %}
 id-assoc pd 2 {
-{%  for intf in dhcpv6_pd %}
+{%  if dhcpv6_pd_length %}
+    prefix ::/{{ dhcpv6_pd_length }} infinity;
+{%  endif %}
+{%  for intf in dhcpv6_pd_interfaces %}
     prefix-interface {{ intf.ifname }} {
 {%    if intf.sla_id %}
         sla-id {{ intf.sla_id }};