From ba06bfed4fc84b699689932eeb3af9b9be0f5cd7 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 19 May 2020 21:27:43 +0200
Subject: dhcpv6-pd: T421: support ethernet based interfaces

Add support for prefix delegation when receiving the prefix via ethernet,
bridge, bond, wireless.
---
 interface-definitions/include/dhcpv6-options.xml.i | 46 ++++++++++++++++++
 interface-definitions/interfaces-pppoe.xml.in      | 54 +---------------------
 2 files changed, 47 insertions(+), 53 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index c55a5271f..2c5058d2c 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -3,6 +3,52 @@
     <help>DHCPv6 options</help>
   </properties>
   <children>
+    <tagNode name="delegate">
+      <properties>
+        <help>Delegate IPv6 prefix from provider to this interface</help>
+        <completionHelp>
+          <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+        </completionHelp>
+      </properties>
+      <children>
+        <leafNode name="interface-id">
+          <properties>
+            <help>Interface address identifier</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>
+            </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>
     <leafNode name="parameters-only">
       <properties>
         <help>Acquire only config parameters, no address</help>
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index 4337b6fc7..0092f9ce5 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -72,59 +72,7 @@
               </valueHelp>
             </properties>
           </leafNode>
-          <node name="dhcpv6-options">
-            <properties>
-              <help>DHCPv6 options</help>
-            </properties>
-            <children>
-              <tagNode name="delegate">
-                <properties>
-                  <help>Delegate IPv6 prefix from provider to this interface</help>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
-                  </completionHelp>
-                </properties>
-                <children>
-                  <leafNode name="interface-id">
-                    <properties>
-                      <help>Interface address identifier</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>
-                      </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>
-          </node>
+          #include <include/dhcpv6-options.xml.i>
           #include <include/interface-description.xml.i>
           #include <include/interface-disable.xml.i>
           #include <include/interface-vrf.xml.i>
-- 
cgit v1.2.3