From d5b58517f88358c686e6c8ea039a7a9a64d6c6ee Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 25 May 2020 21:02:35 +0200
Subject: dhcpv6-pd: pppoe: T2506: restructure CLI

Rename the CLI nodes for prefix delegation from "dhcpv6-options delegate
<interface>" to "dhcpv6-options prefix-delegation interface <interface>".

The change is required to add the possibility to request for specific prefix
sized via the CLI. That option was not possible with the old configuration
tree.
---
 interface-definitions/include/dhcpv6-options.xml.i | 85 +++++++++++++---------
 1 file changed, 52 insertions(+), 33 deletions(-)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index 2c5058d2c..98a87dba2 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -3,52 +3,71 @@
     <help>DHCPv6 options</help>
   </properties>
   <children>
-    <tagNode name="delegate">
+    <node name="prefix-delegation">
       <properties>
-        <help>Delegate IPv6 prefix from provider to this interface</help>
-        <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
-        </completionHelp>
+        <help>DHCPv6 Prefix Delegation Options</help>
       </properties>
       <children>
-        <leafNode name="interface-id">
+        <leafNode name="length">
           <properties>
-            <help>Interface address identifier</help>
+            <help>Request IPv6 prefix length from peer</help>
             <valueHelp>
-              <format>0-</format>
-              <description>Used to form IPv6 interface address (default: EUI-64)</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--non-negative"/>
-            </constraint>
-          </properties>
-        </leafNode>
-        <leafNode name="sla-id">
-          <properties>
-            <help>Interface site-Level aggregator (SLA)</help>
-            <valueHelp>
-              <format>0-128</format>
-              <description>Decimal integer which fits in the length of SLA IDs</description>
+              <format>32-64</format>
+              <description>Length of delegated prefix</description>
             </valueHelp>
             <constraint>
-              <validator name="numeric" argument="--range 0-128"/>
+              <validator name="numeric" argument="--range 32-64"/>
             </constraint>
           </properties>
         </leafNode>
-        <leafNode name="sla-len">
+        <tagNode name="interface">
           <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>
+            <help>Delegate IPv6 prefix from provider to this interface</help>
+            <completionHelp>
+              <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+            </completionHelp>
           </properties>
-        </leafNode>
+          <children>
+            <leafNode name="address">
+              <properties>
+                <help>Local interface address assigned to interface</help>
+                <valueHelp>
+                  <format>&gt;0</format>
+                  <description>Used to form IPv6 interface address (default: EUI-64)</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--non-negative"/>
+                </constraint>
+              </properties>
+            </leafNode>
+            <leafNode name="sla-id">
+              <properties>
+                <help>Interface site-Level aggregator (SLA)</help>
+                <valueHelp>
+                  <format>0-128</format>
+                  <description>Decimal integer which fits in the length of SLA IDs</description>
+                </valueHelp>
+                <constraint>
+                  <validator name="numeric" argument="--range 0-128"/>
+                </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>
-    </tagNode>
+    </node>
     <leafNode name="parameters-only">
       <properties>
         <help>Acquire only config parameters, no address</help>
-- 
cgit v1.2.3