From 98c2c5e0585e0806099a353de207f392223eff9a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 22 Aug 2020 23:15:29 +0200
Subject: dhcpv6-pd: T2677: optimize CLI interface for PD configuration

The current CLI did not support multiple prefix-delegations per interface. Some
ISPs only send one /64 to a client per prefix-delegation request, but they
allow the customer to request multiple prefixes.

The 'dhcpv6-options prefix-delegation' node has been renamed and converted to a
tag node named 'dhcpv6-options pd'. The tag node specifies a PD request (>=0).

In the past the user needed to know what prefix will be assigned and required
to calculate the sla-len by himself. The 'sla-len' node was dropped and is now
calculated in the background from the 'dhcpv6-options pd 0 length' node.

It is no longer mandatory to supply the 'sla-id' node, if sla-id is not
specified it is 'guessed' by counting upwards.

Example configuration:
----------------------

  ethernet eth1 {
       address dhcpv6
       dhcpv6-options {
           pd 0 {
               length 56
               interface eth2 {
                   address 1
               }
           }
       }
   }

This will request a /56 assignment from the ISP and will delegate a /64 network
to interface eth2. VyOS will use the interface address ::1 on the delegate
interface (eth2) as its local address.
---
 data/templates/dhcp-client/ipv6.tmpl | 48 ++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'data/templates')

diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 9673f302b..e9285d86b 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -8,37 +8,43 @@ interface {{ ifname }} {
     information-only;
 {% endif %}
 {% if dhcpv6_options is not defined or dhcpv6_options.temporary is not defined %}
-    send ia-na 1; # non-temporary address
+    send ia-na 0; # non-temporary address
 {% endif %}
-{% if dhcpv6_options is defined and dhcpv6_options.prefix_delegation is defined %}
-    send ia-pd 2; # prefix delegation
+{% if dhcpv6_options is defined and dhcpv6_options.pd is defined %}
+{%   for pd in dhcpv6_options.pd %}
+    send ia-pd {{ pd }}; # prefix delegation #{{ pd }}
+{%   endfor %}
 {% endif %}
 };
 
 {% if dhcpv6_options is not defined or dhcpv6_options.temporary is not defined %}
-id-assoc na 1 {
-    # Identity association NA
+id-assoc na 0 {
+    # Identity association for non temporary address
 };
 {% endif %}
 
-{% if dhcpv6_options is defined and 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 %}
+{% if dhcpv6_options is defined and dhcpv6_options.pd is defined %}
+{%   for pd in dhcpv6_options.pd %}
+id-assoc pd {{ pd }} {
+{#   length got a default value #}
+    prefix ::/{{ dhcpv6_options.pd[pd].length }} infinity;
+{%     set sla_len = 64 - dhcpv6_options.pd[pd].length|int %}
+{%     set count = namespace(value=0) %}
+{%     for interface in dhcpv6_options.pd[pd].interface if dhcpv6_options.pd[pd].interface is defined %}
     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 %}
+        sla-len {{ sla_len }};
+{%       if dhcpv6_options.pd[pd].interface[interface].sla_id is defined and dhcpv6_options.pd[pd].interface[interface].sla_id is not none %}
+        sla-id {{ dhcpv6_options.pd[pd].interface[interface].sla_id }};
+{%       else %}
+        sla-id {{ count.value }};
+{%       endif %}
+{%       if dhcpv6_options.pd[pd].interface[interface].address is defined and dhcpv6_options.pd[pd].interface[interface].address is not none %}
+        ifid {{ dhcpv6_options.pd[pd].interface[interface].address }};
+{%       endif %}
     };
-{%   endfor %}
+{%      set count.value = count.value + 1 %}
+{%     endfor %}
 };
+{%   endfor %}
 {% endif %}
 
-- 
cgit v1.2.3