1 files changed, 15 insertions, 56 deletions
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index c4a913385..831d12694 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -39,18 +39,7 @@
             <help>Distribute default route for IPv4</help>
           </properties>
           <children>
-            <leafNode name="level-1">
-              <properties>
-                <help>Distribute default route into level-1</help>
-                <valueless/>
-              </properties>
-            </leafNode>
-            <leafNode name="level-2">
-              <properties>
-                <help>Distribute default route into level-2</help>
-                <valueless/>
-              </properties>
-            </leafNode>
+            #include <include/isis/default-information-level.xml.i>
           </children>
         </node>
         <node name="ipv6">
@@ -58,30 +47,7 @@
             <help>Distribute default route for IPv6</help>
           </properties>
           <children>
-            <leafNode name="level-1">
-              <properties>
-                <help>Distribute default route into level-1</help>
-                <completionHelp>
-                  <list>always</list>
-                </completionHelp>
-                <valueHelp>
-                  <format>always</format>
-                  <description>Always advertise default route</description>
-                </valueHelp>
-              </properties>
-            </leafNode>
-            <leafNode name="level-2">
-              <properties>
-                <help>Distribute default route into level-2</help>
-                <completionHelp>
-                  <list>always</list>
-                </completionHelp>
-                <valueHelp>
-                  <format>always</format>
-                  <description>Always advertise default route</description>
-                </valueHelp>
-              </properties>
-            </leafNode>
+            #include <include/isis/default-information-level.xml.i>
           </children>
         </node>
       </children>
@@ -102,7 +68,6 @@
         </valueHelp>
       </properties>
     </leafNode>
-<!--
     <leafNode name="md5">
       <properties>
         <help>MD5 authentication type</help>
@@ -112,7 +77,6 @@
         </valueHelp>
       </properties>
     </leafNode>
--->
   </children>
 </node>
 <leafNode name="dynamic-hostname">
@@ -144,6 +108,12 @@
     </constraint>
   </properties>
 </leafNode>
+<leafNode name="log-adjacency-changes">
+  <properties>
+    <help>Log adjacency state changes</help>
+    <valueless/>
+  </properties>
+</leafNode>
 <leafNode name="lsp-gen-interval">
   <properties>
     <help>Minimum interval between regenerating same LSP</help>
@@ -570,7 +540,7 @@
         <help>Delay used while in LONG_WAIT</help>
         <valueHelp>
           <format>u32:0-60000</format>
-          <description>Delay used while in LONG_WAIT state (in ms)</description>
+          <description>Delay used while in LONG_WAIT state in ms</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-60000"/>
@@ -582,7 +552,7 @@
         <help>Time with no received IGP events before considering IGP stable</help>
         <valueHelp>
           <format>u32:0-60000</format>
-          <description>Time with no received IGP events before considering IGP stable (in ms)</description>
+          <description>Time with no received IGP events before considering IGP stable in ms</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-60000"/>
@@ -594,7 +564,7 @@
         <help>Maximum duration needed to learn all the events related to a single failure</help>
         <valueHelp>
           <format>u32:0-60000</format>
-          <description>Maximum duration needed to learn all the events related to a single failure (in ms)</description>
+          <description>Maximum duration needed to learn all the events related to a single failure in ms</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-60000"/>
@@ -608,7 +578,7 @@
     <help>Minimum interval between SPF calculations</help>
     <valueHelp>
       <format>u32:1-120</format>
-      <description>Minimum interval between consecutive SPFs in seconds</description>
+      <description>Interval in seconds</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-120"/>
@@ -677,18 +647,7 @@
         </constraint>
       </properties>
     </leafNode>
-    <leafNode name="metric">
-      <properties>
-        <help>Set default metric for circuit</help>
-        <valueHelp>
-          <format>u32:0-16777215</format>
-          <description>Default metric value</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-16777215"/>
-        </constraint>
-      </properties>
-    </leafNode>
+    #include <include/isis/metric.xml.i>
     <node name="network">
       <properties>
         <help>Set network type</help>
@@ -733,10 +692,10 @@
     </leafNode>
     <leafNode name="psnp-interval">
       <properties>
-        <help>Set PSNP interval in seconds</help>
+        <help>Set PSNP interval</help>
         <valueHelp>
           <format>u32:0-127</format>
-          <description>Priority value</description>
+          <description>PSNP interval in seconds</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 0-127"/>