Merge pull request #1904 from Cheeze-It/current

T5081: ISIS and OSPF syncronization with IGP-LDP sync

4 files changed, 49 insertions, 2 deletions

diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 0e6f19480..983a085ec 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -152,6 +152,7 @@
     </constraint>
   </properties>
 </leafNode>
+#include <include/ldp-sync-protocol.xml.i>
 <leafNode name="net">
   <properties>
     <help>A Network Entity Title for this process (ISO only)</help>
@@ -172,7 +173,7 @@
 </leafNode>
 <node name="traffic-engineering">
   <properties>
-    <help>Show IS-IS neighbor adjacencies</help>
+    <help>IS-IS traffic engineering extensions</help>
   </properties>
   <children>
     <leafNode name="enable">
@@ -631,6 +632,7 @@
       </properties>
     </leafNode>
     #include <include/isis/metric.xml.i>
+    #include <include/ldp-sync-interface.xml.i>
     <node name="network">
       <properties>
         <help>Set network type</help>
diff --git a/interface-definitions/include/ldp-sync-interface.xml.i b/interface-definitions/include/ldp-sync-interface.xml.i
new file mode 100644
index 000000000..b24831bbe
--- /dev/null
+++ b/interface-definitions/include/ldp-sync-interface.xml.i
@@ -0,0 +1,22 @@
+<!-- include start from ldp-igp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>LDP-IGP synchronization configuration for interface</help>
+  </properties>
+  <children>
+    #include <include/generic-disable-node.xml.i>
+    <leafNode name="holddown">
+      <properties>
+        <help>Hold down timer for LDP-IGP cost restoration</help>
+        <valueHelp>
+          <format>u32:0-10000</format>
+          <description>Time to wait in seconds for LDP-IGP synchronization to occur before restoring interface cost</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-10000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/ldp-sync-protocol.xml.i b/interface-definitions/include/ldp-sync-protocol.xml.i
new file mode 100644
index 000000000..c82c811f6
--- /dev/null
+++ b/interface-definitions/include/ldp-sync-protocol.xml.i
@@ -0,0 +1,21 @@
+<!-- include start from ldp-igp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>Protocol wide LDP-IGP synchronization configuration</help>
+  </properties>
+  <children>
+    <leafNode name="holddown">
+      <properties>
+        <help>Protocol wide hold down timer for LDP-IGP cost restoration</help>
+        <valueHelp>
+          <format>u32:0-10000</format>
+          <description>Time to wait in seconds for LDP-IGP synchronization to occur before restoring interface cost</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-10000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index f39b9c5e3..425d3b01c 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -331,6 +331,7 @@
     </constraint>
   </properties>
 </leafNode>
+#include <include/ldp-sync-protocol.xml.i>
 <node name="distance">
   <properties>
     <help>Administrative distance</help>
@@ -385,6 +386,7 @@
     #include <include/ospf/authentication.xml.i>
     #include <include/ospf/intervals.xml.i>
     #include <include/ospf/interface-common.xml.i>
+    #include <include/ldp-sync-interface.xml.i>
     <leafNode name="bandwidth">
       <properties>
         <help>Interface bandwidth (Mbit/s)</help>
@@ -875,4 +877,4 @@
     </node>
   </children>
 </node>
-<!-- include end -->
+<!-- include end -->
\ No newline at end of file