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.
---
 interface-definitions/include/dhcpv6-options.xml.i | 40 ++++++++++------------
 1 file changed, 18 insertions(+), 22 deletions(-)

(limited to 'interface-definitions/include/dhcpv6-options.xml.i')

diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index 98a87dba2..5d088b83d 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -1,11 +1,24 @@
 <node name="dhcpv6-options">
   <properties>
-    <help>DHCPv6 options</help>
+    <help>DHCPv6 client settings/options</help>
   </properties>
   <children>
-    <node name="prefix-delegation">
+    <leafNode name="parameters-only">
+      <properties>
+        <help>Acquire only config parameters, no address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <tagNode name="pd">
       <properties>
-        <help>DHCPv6 Prefix Delegation Options</help>
+        <help>DHCPv6 prefix delegation interface statement</help>
+        <valueHelp>
+          <format>instance number</format>
+          <description>Prefix delegation instance (>= 0)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--non-negative"/>
+        </constraint>
       </properties>
       <children>
         <leafNode name="length">
@@ -19,6 +32,7 @@
               <validator name="numeric" argument="--range 32-64"/>
             </constraint>
           </properties>
+          <defaultValue>64</defaultValue>
         </leafNode>
         <tagNode name="interface">
           <properties>
@@ -52,28 +66,10 @@
                 </constraint>
               </properties>
             </leafNode>
-            <leafNode name="sla-len">
-              <properties>
-                <help>Site-Level aggregator (SLA) length</help>
-                <valueHelp>
-                  <format>0-128</format>
-                  <description>Length of delegated prefix</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-128"/>
-                </constraint>
-              </properties>
-            </leafNode>
           </children>
         </tagNode>
       </children>
-    </node>
-    <leafNode name="parameters-only">
-      <properties>
-        <help>Acquire only config parameters, no address</help>
-        <valueless/>
-      </properties>
-    </leafNode>
+    </tagNode>
     <leafNode name="temporary">
       <properties>
         <help>IPv6 "temporary" address</help>
-- 
cgit v1.2.3


From a574a01ab5c02aeb90c6d099dce482c1bf8be096 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 23 Aug 2020 00:16:45 +0200
Subject: dhcpv6-pd: T2677: add support for rapid-commit option

When rapid-commit is specified, dhcp6c will include a rapid-commit option in
solicit messages and wait for an immediate reply instead of advertisements.
---
 data/templates/dhcp-client/ipv6.tmpl               | 3 +++
 interface-definitions/include/dhcpv6-options.xml.i | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'interface-definitions/include/dhcpv6-options.xml.i')

diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 85841fe94..68f668117 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -11,6 +11,9 @@ interface {{ ifname }} {
 {%   if dhcpv6_options is not defined or dhcpv6_options.temporary is not defined %}
     send ia-na 0; # non-temporary address
 {%   endif %}
+{%   if dhcpv6_options is defined and dhcpv6_options.rapid_commit is defined %}
+    send rapid-commit; # wait for immediate reply instead of advertisements
+{%   endif %}
 {% endif %}
 {% if dhcpv6_options is defined and dhcpv6_options.pd is defined %}
 {%   for pd in dhcpv6_options.pd %}
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index 5d088b83d..b0a806806 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -70,9 +70,15 @@
         </tagNode>
       </children>
     </tagNode>
+    <leafNode name="rapid-commit">
+      <properties>
+        <help>Wait for immediate reply instead of advertisements</help>
+        <valueless/>
+      </properties>
+    </leafNode>
     <leafNode name="temporary">
       <properties>
-        <help>IPv6 "temporary" address</help>
+        <help>IPv6 temporary address</help>
         <valueless/>
       </properties>
     </leafNode>
-- 
cgit v1.2.3