From 3d0162557f9c2217d4a925e6c893863b1af55e58 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 23 Feb 2020 12:26:34 +0100
Subject: pppoe: T1318: migrate user-id and password nodes under an
 authentication node

---
 interface-definitions/interfaces-pppoe.xml.in | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'interface-definitions/interfaces-pppoe.xml.in')

diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index 8bae0e490..933d9edf1 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -26,6 +26,23 @@
               <constraintErrorMessage>Access concentrator name must be composed of uppper and lower case letters or numbers only</constraintErrorMessage>
             </properties>
           </leafNode>
+          <node name="authentication">
+            <properties>
+              <help>Authentication settings</help>
+            </properties>
+            <children>
+              <leafNode name="user">
+                <properties>
+                  <help>User name</help>
+                </properties>
+              </leafNode>
+              <leafNode name="password">
+                <properties>
+                  <help>Password</help>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
           <leafNode name="connect-on-demand">
             <properties>
               <help>Automatic establishment of PPPOE connection when traffic is sent</help>
@@ -143,11 +160,6 @@
               <constraintErrorMessage>Must be either 'auto' or 'none'</constraintErrorMessage>
             </properties>
           </leafNode>
-          <leafNode name="password">
-            <properties>
-              <help>Password for authenticating local machine to PPPoE server</help>
-            </properties>
-          </leafNode>
           <leafNode name="remote-address">
             <properties>
               <help>IPv4 address of remote end of the PPPoE link</help>
@@ -169,11 +181,6 @@
               <constraintErrorMessage>Service name must be composed of uppper and lower case letters or numbers only</constraintErrorMessage>
             </properties>
           </leafNode>
-          <leafNode name="user-id">
-            <properties>
-              <help>Authentication name supplied to PPPoE server</help>
-            </properties>
-          </leafNode>
         </children>
       </tagNode>
     </children>
-- 
cgit v1.2.3