Merge pull request #1985 from c-po/t2778-syslog

syslog: T2778: T2769: refactoring and VRF support

5 files changed, 21 insertions, 20 deletions

diff --git a/interface-definitions/include/snmp/protocol.xml.i b/interface-definitions/include/protocol-tcp-udp.xml.i
index d7e6752ad..d7e6752ad 100644
--- a/interface-definitions/include/snmp/protocol.xml.i
+++ b/interface-definitions/include/protocol-tcp-udp.xml.i
diff --git a/interface-definitions/include/syslog-facility.xml.i b/interface-definitions/include/syslog-facility.xml.i
index 57067ece2..e6138a122 100644
--- a/interface-definitions/include/syslog-facility.xml.i
+++ b/interface-definitions/include/syslog-facility.xml.i
@@ -3,10 +3,10 @@
   <properties>
     <help>Facility for logging</help>
     <completionHelp>
-      <list>auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all</list>
+      <list>auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all</list>
     </completionHelp>
     <constraint>
-      <regex>(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)</regex>
+      <regex>(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)</regex>
     </constraint>
     <constraintErrorMessage>Invalid facility type</constraintErrorMessage>
     <valueHelp>
@@ -50,14 +50,6 @@
       <description>USENET subsystem</description>
     </valueHelp>
     <valueHelp>
-      <format>protocols</format>
-      <description>depricated will be set to local7</description>
-    </valueHelp>
-    <valueHelp>
-      <format>security</format>
-      <description>depricated will be set to auth</description>
-    </valueHelp>
-    <valueHelp>
       <format>syslog</format>
       <description>Authentication and authorization</description>
     </valueHelp>
@@ -109,10 +101,6 @@
         <completionHelp>
           <list>emerg alert crit err warning notice info debug all</list>
         </completionHelp>
-        <constraint>
-          <regex>(emerg|alert|crit|err|warning|notice|info|debug|all)</regex>
-        </constraint>
-        <constraintErrorMessage>Invalid loglevel</constraintErrorMessage>
         <valueHelp>
           <format>emerg</format>
           <description>Emergency messages</description>
@@ -149,7 +137,12 @@
           <format>all</format>
           <description>Log everything</description>
         </valueHelp>
+        <constraint>
+          <regex>(emerg|alert|crit|err|warning|notice|info|debug|all)</regex>
+        </constraint>
+        <constraintErrorMessage>Invalid loglevel</constraintErrorMessage>
       </properties>
+      <defaultValue>err</defaultValue>
     </leafNode>
   </children>
 </tagNode>
diff --git a/interface-definitions/include/version/system-version.xml.i b/interface-definitions/include/version/system-version.xml.i
index b7650c782..73df8bd8e 100644
--- a/interface-definitions/include/version/system-version.xml.i
+++ b/interface-definitions/include/version/system-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/system-version.xml.i -->
-<syntaxVersion component='system' version='25'></syntaxVersion>
+<syntaxVersion component='system' version='26'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in
index 559e09388..6527cabd6 100644
--- a/interface-definitions/snmp.xml.in
+++ b/interface-definitions/snmp.xml.in
@@ -143,7 +143,7 @@
               <multi/>
             </properties>
           </leafNode>
-          #include <include/snmp/protocol.xml.i>
+          #include <include/protocol-tcp-udp.xml.i>
           <leafNode name="smux-peer">
             <properties>
               <help>Register a subtree for SMUX-based processing</help>
@@ -327,7 +327,7 @@
                       #include <include/snmp/privacy-type.xml.i>
                     </children>
                   </node>
-                  #include <include/snmp/protocol.xml.i>
+                  #include <include/protocol-tcp-udp.xml.i>
                   <leafNode name="type">
                     <properties>
                       <help>Specifies the type of notification between inform and trap</help>
diff --git a/interface-definitions/system-syslog.xml.in b/interface-definitions/system-syslog.xml.in
index 4a2adfd5f..cd5c514a8 100644
--- a/interface-definitions/system-syslog.xml.in
+++ b/interface-definitions/system-syslog.xml.in
@@ -50,6 +50,10 @@
             </properties>
             <children>
               #include <include/port-number.xml.i>
+              <leafNode name="port">
+                <defaultValue>514</defaultValue>
+              </leafNode>
+              #include <include/protocol-tcp-udp.xml.i>
               #include <include/syslog-facility.xml.i>
               <node name="format">
                 <properties>
@@ -79,11 +83,12 @@
                 <children>
                   <leafNode name="interval">
                     <properties>
-                      <help>time interval how often a mark message is being sent in seconds (default: 1200)</help>
+                      <help>time interval how often a mark message is being sent in seconds</help>
                       <constraint>
                         <validator name="numeric" argument="--positive"/>
                       </constraint>
                     </properties>
+                    <defaultValue>1200</defaultValue>
                   </leafNode>
                 </children>
               </node>
@@ -111,21 +116,23 @@
                 <children>
                   <leafNode name="file">
                     <properties>
-                      <help>Number of saved files (default is 5)</help>
+                      <help>Number of saved files</help>
                       <constraint>
                         <regex>[0-9]+</regex>
                       </constraint>
                       <constraintErrorMessage>illegal characters in number of files</constraintErrorMessage>
                     </properties>
+                    <defaultValue>5</defaultValue>
                   </leafNode>
                   <leafNode name="size">
                     <properties>
-                      <help>Size of log files (in kbytes, default is 256)</help>
+                      <help>Size of log files in kbytes</help>
                       <constraint>
                         <regex>[0-9]+</regex>
                       </constraint>
                       <constraintErrorMessage>illegal characters in size</constraintErrorMessage>
                     </properties>
+                    <defaultValue>256</defaultValue>
                   </leafNode>
                 </children>
               </node>
@@ -140,6 +147,7 @@
               #include <include/syslog-facility.xml.i>
             </children>
           </node>
+          #include <include/interface/vrf.xml.i>
         </children>
       </node>
     </children>