Merge pull request #3558 from vyos/mergify/bp/sagitta/pr-3510

T4576: Accel-ppp logging level configuration (backport #3510)

6 files changed, 47 insertions, 0 deletions

diff --git a/interface-definitions/include/accel-ppp/log.xml.i b/interface-definitions/include/accel-ppp/log.xml.i
new file mode 100644
index 000000000..96ce93ff9
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/log.xml.i
@@ -0,0 +1,42 @@
+<!-- include start from accel-ppp/log.xml.i -->
+<node name="log">
+  <properties>
+    <help>Server logging </help>
+  </properties>
+  <children>
+    <leafNode name="level">
+      <properties>
+        <help>Specifies log level</help>
+        <valueHelp>
+          <format>0</format>
+          <description>Turn off logging</description>
+        </valueHelp>
+        <valueHelp>
+          <format>1</format>
+          <description>Log only error messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>2</format>
+          <description>Log error and warning messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>3</format>
+          <description>Log error, warning and minimum information messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>4</format>
+          <description>Log error, warning and full information messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>5</format>
+          <description>Log all messages including debug messages</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-5"/>
+        </constraint>
+      </properties>
+      <defaultValue>3</defaultValue>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in
index 414c9a731..c7542f0d0 100644
--- a/interface-definitions/service_ipoe-server.xml.in
+++ b/interface-definitions/service_ipoe-server.xml.in
@@ -189,6 +189,7 @@
           #include <include/accel-ppp/snmp.xml.i>
           #include <include/generic-description.xml.i>
           #include <include/name-server-ipv4-ipv6.xml.i>
+          #include <include/accel-ppp/log.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index 5d357c2f9..81228938f 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -153,6 +153,7 @@
           #include <include/accel-ppp/wins-server.xml.i>
           #include <include/generic-description.xml.i>
           #include <include/name-server-ipv4-ipv6.xml.i>
+          #include <include/accel-ppp/log.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index 85a375db4..c00e82534 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -140,6 +140,7 @@
               #include <include/accel-ppp/wins-server.xml.i>
               #include <include/generic-description.xml.i>
               #include <include/name-server-ipv4-ipv6.xml.i>
+              #include <include/accel-ppp/log.xml.i>
             </children>
           </node>
         </children>
diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index a63633f57..8aec0cb1c 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -56,6 +56,7 @@
               #include <include/accel-ppp/wins-server.xml.i>
               #include <include/generic-description.xml.i>
               #include <include/name-server-ipv4-ipv6.xml.i>
+              #include <include/accel-ppp/log.xml.i>
             </children>
           </node>
         </children>
diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in
index d9ed1c040..5fd5c95ca 100644
--- a/interface-definitions/vpn_sstp.xml.in
+++ b/interface-definitions/vpn_sstp.xml.in
@@ -62,6 +62,7 @@
               <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage>
             </properties>
           </leafNode>
+          #include <include/accel-ppp/log.xml.i>
         </children>
       </node>
     </children>