syslog: T2769: xml: provide common facility building block

2 files changed, 163 insertions, 792 deletions

diff --git a/interface-definitions/include/syslog-facility.xml.i b/interface-definitions/include/syslog-facility.xml.i
new file mode 100644
index 000000000..57067ece2
--- /dev/null
+++ b/interface-definitions/include/syslog-facility.xml.i
@@ -0,0 +1,156 @@
+<!-- include start from syslog-facility.xml.i -->
+<tagNode name="facility">
+  <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>
+    </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>
+    </constraint>
+    <constraintErrorMessage>Invalid facility type</constraintErrorMessage>
+    <valueHelp>
+      <format>all</format>
+      <description>All facilities excluding "mark"</description>
+    </valueHelp>
+    <valueHelp>
+      <format>auth</format>
+      <description>Authentication and authorization</description>
+    </valueHelp>
+    <valueHelp>
+      <format>authpriv</format>
+      <description>Non-system authorization</description>
+    </valueHelp>
+    <valueHelp>
+      <format>cron</format>
+      <description>Cron daemon</description>
+    </valueHelp>
+    <valueHelp>
+      <format>daemon</format>
+      <description>System daemons</description>
+    </valueHelp>
+    <valueHelp>
+      <format>kern</format>
+      <description>Kernel</description>
+    </valueHelp>
+    <valueHelp>
+      <format>lpr</format>
+      <description>Line printer spooler</description>
+    </valueHelp>
+    <valueHelp>
+      <format>mail</format>
+      <description>Mail subsystem</description>
+    </valueHelp>
+    <valueHelp>
+      <format>mark</format>
+      <description>Timestamp</description>
+    </valueHelp>
+    <valueHelp>
+      <format>news</format>
+      <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>
+    <valueHelp>
+      <format>user</format>
+      <description>Application processes</description>
+    </valueHelp>
+    <valueHelp>
+      <format>uucp</format>
+      <description>UUCP subsystem</description>
+    </valueHelp>
+    <valueHelp>
+      <format>local0</format>
+      <description>Local facility 0</description>
+    </valueHelp>
+    <valueHelp>
+      <format>local1</format>
+      <description>Local facility 1</description>
+    </valueHelp>
+    <valueHelp>
+      <format>local2</format>
+      <description>Local facility 2</description>
+    </valueHelp>
+    <valueHelp>
+      <format>local3</format>
+      <description>Local facility 3</description>
+    </valueHelp>
+    <valueHelp>
+      <format>local4</format>
+      <description>Local facility 4</description>
+    </valueHelp>
+    <valueHelp>
+      <format>local5</format>
+      <description>Local facility 5</description>
+    </valueHelp>
+    <valueHelp>
+      <format>local6</format>
+      <description>Local facility 6</description>
+    </valueHelp>
+    <valueHelp>
+      <format>local7</format>
+      <description>Local facility 7</description>
+    </valueHelp>
+  </properties>
+  <children>
+    <leafNode name="level">
+      <properties>
+        <help>Logging level</help>
+        <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>
+        </valueHelp>
+        <valueHelp>
+          <format>alert</format>
+          <description>Urgent messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>crit</format>
+          <description>Critical messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>err</format>
+          <description>Error messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>warning</format>
+          <description>Warning messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>notice</format>
+          <description>Messages for further investigation</description>
+        </valueHelp>
+        <valueHelp>
+          <format>info</format>
+          <description>Informational messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>debug</format>
+          <description>Debug messages</description>
+        </valueHelp>
+        <valueHelp>
+          <format>all</format>
+          <description>Log everything</description>
+        </valueHelp>
+      </properties>
+    </leafNode>
+  </children>
+</tagNode>
+<!-- include end -->
diff --git a/interface-definitions/system-syslog.xml.in b/interface-definitions/system-syslog.xml.in
index fbba9ae9e..6c5f43090 100644
--- a/interface-definitions/system-syslog.xml.in
+++ b/interface-definitions/system-syslog.xml.in
@@ -21,160 +21,7 @@
               <constraintErrorMessage>illegal characters in user</constraintErrorMessage>
             </properties>
             <children>
-              <tagNode name="facility">
-                <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>
-                  </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>
-                  </constraint>
-                  <constraintErrorMessage>Invalid facility type</constraintErrorMessage>
-                  <valueHelp>
-                    <format>all</format>
-                    <description>All facilities excluding "mark"</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>auth</format>
-                    <description>Authentication and authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>authpriv</format>
-                    <description>Non-system authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>cron</format>
-                    <description>Cron daemon</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>daemon</format>
-                    <description>System daemons</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>kern</format>
-                    <description>Kernel</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>lpr</format>
-                    <description>Line printer spooler</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mail</format>
-                    <description>Mail subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mark</format>
-                    <description>Timestamp</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>news</format>
-                    <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>
-                  <valueHelp>
-                    <format>user</format>
-                    <description>Application processes</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>uucp</format>
-                    <description>UUCP subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local0</format>
-                    <description>Local facility 0</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local1</format>
-                    <description>Local facility 1</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local2</format>
-                    <description>Local facility 2</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local3</format>
-                    <description>Local facility 3</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local4</format>
-                    <description>Local facility 4</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local5</format>
-                    <description>Local facility 5</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local6</format>
-                    <description>Local facility 6</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local7</format>
-                    <description>Local facility 7</description>
-                  </valueHelp>
-                </properties>
-                <children>
-                  <leafNode name="level">
-                    <properties>
-                      <help>Logging level</help>
-                      <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>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>alert</format>
-                        <description>Urgent messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>crit</format>
-                        <description>Critical messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>err</format>
-                        <description>Error messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>warning</format>
-                        <description>Warning messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>notice</format>
-                        <description>Messages for further investigation</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>info</format>
-                        <description>Informational messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>debug</format>
-                        <description>Debug messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>all</format>
-                        <description>Log everything</description>
-                      </valueHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
+              #include <include/syslog-facility.xml.i>
             </children>
           </tagNode>
           <tagNode name="host">
@@ -196,180 +43,7 @@
             </properties>
             <children>
               #include <include/port-number.xml.i>
-              <tagNode name="facility">
-                <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>
-                  </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>
-                  </constraint>
-                  <constraintErrorMessage>Invalid facility type</constraintErrorMessage>
-                  <valueHelp>
-                    <format>all</format>
-                    <description>All facilities excluding "mark"</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>auth</format>
-                    <description>Authentication and authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>authpriv</format>
-                    <description>Non-system authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>cron</format>
-                    <description>Cron daemon</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>daemon</format>
-                    <description>System daemons</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>kern</format>
-                    <description>Kernel</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>lpr</format>
-                    <description>Line printer spooler</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mail</format>
-                    <description>Mail subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mark</format>
-                    <description>Timestamp</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>news</format>
-                    <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>
-                  <valueHelp>
-                    <format>user</format>
-                    <description>Application processes</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>uucp</format>
-                    <description>UUCP subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local0</format>
-                    <description>Local facility 0</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local1</format>
-                    <description>Local facility 1</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local2</format>
-                    <description>Local facility 2</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local3</format>
-                    <description>Local facility 3</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local4</format>
-                    <description>Local facility 4</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local5</format>
-                    <description>Local facility 5</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local6</format>
-                    <description>Local facility 6</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local7</format>
-                    <description>Local facility 7</description>
-                  </valueHelp>
-                </properties>
-                <children>
-                  <leafNode name="protocol">
-                    <properties>
-                      <help>syslog communication protocol</help>
-                      <valueHelp>
-                        <format>udp</format>
-                        <description>send log messages to remote syslog server over udp</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>tcp</format>
-                        <description>send log messages to remote syslog server over tcp</description>
-                      </valueHelp>
-                      <completionHelp>
-                        <list>udp tcp</list>
-                      </completionHelp>
-                      <constraint>
-                        <regex>(udp|tcp)</regex>
-                      </constraint>
-                      <constraintErrorMessage>invalid protocol name</constraintErrorMessage>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="level">
-                    <properties>
-                      <help>Logging level</help>
-                      <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>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>alert</format>
-                        <description>Urgent messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>crit</format>
-                        <description>Critical messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>err</format>
-                        <description>Error messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>warning</format>
-                        <description>Warning messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>notice</format>
-                        <description>Messages for further investigation</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>info</format>
-                        <description>Informational messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>debug</format>
-                        <description>Debug messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>all</format>
-                        <description>Log everything</description>
-                      </valueHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
+              #include <include/syslog-facility.xml.i>
               <node name="format">
                 <properties>
                   <help>Logging format</help>
@@ -390,160 +64,7 @@
               <help>Logging to system standard location</help>
             </properties>
             <children>
-              <tagNode name="facility">
-                <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>
-                  </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>
-                  </constraint>
-                  <constraintErrorMessage>Invalid facility type</constraintErrorMessage>
-                  <valueHelp>
-                    <format>all</format>
-                    <description>All facilities excluding "mark"</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>auth</format>
-                    <description>Authentication and authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>authpriv</format>
-                    <description>Non-system authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>cron</format>
-                    <description>Cron daemon</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>daemon</format>
-                    <description>System daemons</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>kern</format>
-                    <description>Kernel</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>lpr</format>
-                    <description>Line printer spooler</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mail</format>
-                    <description>Mail subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mark</format>
-                    <description>Timestamp</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>news</format>
-                    <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>
-                  <valueHelp>
-                    <format>user</format>
-                    <description>Application processes</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>uucp</format>
-                    <description>UUCP subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local0</format>
-                    <description>Local facility 0</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local1</format>
-                    <description>Local facility 1</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local2</format>
-                    <description>Local facility 2</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local3</format>
-                    <description>Local facility 3</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local4</format>
-                    <description>Local facility 4</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local5</format>
-                    <description>Local facility 5</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local6</format>
-                    <description>Local facility 6</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local7</format>
-                    <description>Local facility 7</description>
-                  </valueHelp>
-                </properties>
-                <children>
-                  <leafNode name="level">
-                    <properties>
-                      <help>Logging level</help>
-                      <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>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>alert</format>
-                        <description>Urgent messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>crit</format>
-                        <description>Critical messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>err</format>
-                        <description>Error messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>warning</format>
-                        <description>Warning messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>notice</format>
-                        <description>Messages for further investigation</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>info</format>
-                        <description>Informational messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>debug</format>
-                        <description>Debug messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>all</format>
-                        <description>Log everything</description>
-                      </valueHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
+              #include <include/syslog-facility.xml.i>
               <node name="marker">
                 <properties>
                   <help>mark messages sent to syslog</help>
@@ -559,10 +80,10 @@
                   </leafNode>
                 </children>
               </node>
-              <leafNode name ="preserve-fqdn">
+              <leafNode name="preserve-fqdn">
                 <properties>
                   <help>uses FQDN for logging</help>
-                  <valueless />
+                  <valueless/>
                 </properties>
               </leafNode>
             </children>
@@ -601,160 +122,7 @@
                   </leafNode>
                 </children>
               </node>
-              <tagNode name="facility">
-                <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>
-                  </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>
-                  </constraint>
-                  <constraintErrorMessage>Invalid facility type</constraintErrorMessage>
-                  <valueHelp>
-                    <format>all</format>
-                    <description>All facilities excluding "mark"</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>auth</format>
-                    <description>Authentication and authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>authpriv</format>
-                    <description>Non-system authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>cron</format>
-                    <description>Cron daemon</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>daemon</format>
-                    <description>System daemons</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>kern</format>
-                    <description>Kernel</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>lpr</format>
-                    <description>Line printer spooler</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mail</format>
-                    <description>Mail subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mark</format>
-                    <description>Timestamp</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>news</format>
-                    <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>
-                  <valueHelp>
-                    <format>user</format>
-                    <description>Application processes</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>uucp</format>
-                    <description>UUCP subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local0</format>
-                    <description>Local facility 0</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local1</format>
-                    <description>Local facility 1</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local2</format>
-                    <description>Local facility 2</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local3</format>
-                    <description>Local facility 3</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local4</format>
-                    <description>Local facility 4</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local5</format>
-                    <description>Local facility 5</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local6</format>
-                    <description>Local facility 6</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local7</format>
-                    <description>Local facility 7</description>
-                  </valueHelp>
-                </properties>
-                <children>
-                  <leafNode name="level">
-                    <properties>
-                      <help>Logging level</help>
-                      <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>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>alert</format>
-                        <description>Urgent messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>crit</format>
-                        <description>Critical messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>err</format>
-                        <description>Error messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>warning</format>
-                        <description>Warning messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>notice</format>
-                        <description>Messages for further investigation</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>info</format>
-                        <description>Informational messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>debug</format>
-                        <description>Debug messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>all</format>
-                        <description>Log everything</description>
-                      </valueHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
+              #include <include/syslog-facility.xml.i>
             </children>
           </tagNode>
           <node name="console">
@@ -762,160 +130,7 @@
               <help>logging to serial console</help>
             </properties>
             <children>
-              <tagNode name="facility">
-                <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>
-                  </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>
-                  </constraint>
-                  <constraintErrorMessage>Invalid facility type</constraintErrorMessage>
-                  <valueHelp>
-                    <format>all</format>
-                    <description>All facilities excluding "mark"</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>auth</format>
-                    <description>Authentication and authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>authpriv</format>
-                    <description>Non-system authorization</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>cron</format>
-                    <description>Cron daemon</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>daemon</format>
-                    <description>System daemons</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>kern</format>
-                    <description>Kernel</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>lpr</format>
-                    <description>Line printer spooler</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mail</format>
-                    <description>Mail subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>mark</format>
-                    <description>Timestamp</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>news</format>
-                    <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>
-                  <valueHelp>
-                    <format>user</format>
-                    <description>Application processes</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>uucp</format>
-                    <description>UUCP subsystem</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local0</format>
-                    <description>Local facility 0</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local1</format>
-                    <description>Local facility 1</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local2</format>
-                    <description>Local facility 2</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local3</format>
-                    <description>Local facility 3</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local4</format>
-                    <description>Local facility 4</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local5</format>
-                    <description>Local facility 5</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local6</format>
-                    <description>Local facility 6</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>local7</format>
-                    <description>Local facility 7</description>
-                  </valueHelp>
-                </properties>
-                <children>
-                  <leafNode name="level">
-                    <properties>
-                      <help>Logging level</help>
-                      <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>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>alert</format>
-                        <description>Urgent messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>crit</format>
-                        <description>Critical messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>err</format>
-                        <description>Error messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>warning</format>
-                        <description>Warning messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>notice</format>
-                        <description>Messages for further investigation</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>info</format>
-                        <description>Informational messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>debug</format>
-                        <description>Debug messages</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>all</format>
-                        <description>Log everything</description>
-                      </valueHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
+              #include <include/syslog-facility.xml.i>
             </children>
           </node>
         </children>