From 5c07f2515eddcec135d86510c44114a20bd3f6e1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 26 May 2020 21:27:13 +0200
Subject: pppoe: adjust DHCPv6-pd syntax

---
 docs/interfaces/pppoe.rst | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'docs/interfaces')

diff --git a/docs/interfaces/pppoe.rst b/docs/interfaces/pppoe.rst
index 21af40f8..d58943b8 100644
--- a/docs/interfaces/pppoe.rst
+++ b/docs/interfaces/pppoe.rst
@@ -173,9 +173,17 @@ Prefix Delegation (DHCPv6-PD)
 VyOS 1.3 (equuleus) supports DHCPv6-PD. DHCPv6 Prefix Delegation is supported
 by most ISPs who provide native IPv6 for consumers on fixed networks.
 
-.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option delegate <prefix-interface> interfaces-id <id>
+.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option prefix-delegation length <length>
 
-   This statement specifies the interface id.  ID must be a decimal integer.
+   Some ISPs by default only delegate a /64 prefix. To request for a specific
+   prefix size use this option to request for a bigger delegation. This value
+   is in the range from 32 - 64 so you could request up to /32 down to a /64
+   delegation.
+
+.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option prefix-delegation interface <prefix-interface> address <local-addr>
+
+   This statement specifies the interface address used locally on the interfcae
+   where the prefix has been delegated to. ID must be a decimal integer.
    It will be combined with the delegated prefix and the sla-id to form a
    complete interface address. The default is to use the EUI-64 address of the
    interface.
@@ -185,7 +193,7 @@ by most ISPs who provide native IPv6 for consumers on fixed networks.
    Using `<id>` value 65535 will assign IPv6 address <prefix>::ffff to the
    interface.
 
-.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option delegate <prefix-interface> sla-id <id>
+.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option prefix-delegation interface <prefix-interface> sla-id <id>
 
    This statement specifies the identifier value of the site-level aggregator
    (SLA) on the interface. ID must be a decimal number greater then 0 which
@@ -194,7 +202,7 @@ by most ISPs who provide native IPv6 for consumers on fixed networks.
    the two values into a single IPv6 prefix, 2001:db8:ffff:1::/64, and will
    configure the prefix on the specified interface.
 
-.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option delegate <prefix-interface> sla-len <len>
+.. cfgcmd:: set interfaces pppoe <interface> dhcpv6-option prefix-delegation interface <prefix-interface> sla-len <len>
 
    This statement specifies the length of the SLA ID in bits. `<len>` must be a
    decimal number between 0 and 128. If the length is not specified by this
@@ -316,9 +324,9 @@ If you do not know the prefix size delegated to you, start with sla-len 0.
 
   set interfaces pppoe pppoe0 authentication user vyos
   set interfaces pppoe pppoe0 authentication password vyos
-  set interfaces pppoe pppoe0 dhcpv6-options delegate eth0 interface-id 65535
-  set interfaces pppoe pppoe0 dhcpv6-options delegate eth0 sla-id 0
-  set interfaces pppoe pppoe0 dhcpv6-options delegate eth0 sla-len 8
+  set interfaces pppoe pppoe0 dhcpv6-options prefix-delegation interface eth0 address 65535
+  set interfaces pppoe pppoe0 dhcpv6-options prefix-delegation interface eth0 sla-id 0
+  set interfaces pppoe pppoe0 dhcpv6-options prefix-delegation interface eth0 sla-len 8
   set interfaces pppoe pppoe0 ipv6 address autoconf
   set interfaces pppoe pppoe0 ipv6 enable
   set interfaces pppoe pppoe0 source-interface eth1
-- 
cgit v1.2.3