From d832973d0db901ca9ce6b42b3b8eb527208926c3 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 21 Aug 2021 11:35:53 +0200
Subject: pppoe: T1318: bump priority by 1 so we can source from
 pseudo-ethernet interfaces

(cherry picked from commit 081e0334c00887c373fafde761cca960667be21b)
---
 interface-definitions/interfaces-pppoe.xml.in | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index 4792e4b94..198a53c90 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -5,7 +5,7 @@
       <tagNode name="pppoe" owner="${vyos_conf_scripts_dir}/interfaces-pppoe.py">
         <properties>
           <help>Point-to-Point Protocol over Ethernet (PPPoE)</help>
-          <priority>321</priority>
+          <priority>322</priority>
           <constraint>
             <regex>^pppoe[0-9]+$</regex>
           </constraint>
@@ -52,9 +52,13 @@
             <properties>
               <help>Delay before disconnecting idle session (in seconds)</help>
               <valueHelp>
-                <format>n</format>
+                <format>u32:0-86400</format>
                 <description>Idle timeout in seconds</description>
               </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-86400"/>
+              </constraint>
+              <constraintErrorMessage>Timeout must be in range 0 to 86400</constraintErrorMessage>
             </properties>
           </leafNode>
           <node name="ip">
@@ -80,14 +84,7 @@
               </node>
             </children>
           </node>
-          <leafNode name="source-interface">
-            <properties>
-              <help>Physical Interface used for this PPPoE session</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
-              </completionHelp>
-            </properties>
-          </leafNode>
+          #include <include/source-interface.xml.i>
           <leafNode name="local-address">
             <properties>
               <help>IPv4 address of local end of the PPPoE link</help>
-- 
cgit v1.2.3