xml: T5081: generate common holddown XML building block for IS-IS and OSPF

7 files changed, 39 insertions, 47 deletions

diff --git a/interface-definitions/include/isis/ldp-sync-holddown.xml.i b/interface-definitions/include/isis/ldp-sync-holddown.xml.i
new file mode 100644
index 000000000..15ac26f07
--- /dev/null
+++ b/interface-definitions/include/isis/ldp-sync-holddown.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from isis/ldp-sync-holddown.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>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/ldp-sync-interface.xml.i b/interface-definitions/include/isis/ldp-sync-interface.xml.i
new file mode 100644
index 000000000..222a35256
--- /dev/null
+++ b/interface-definitions/include/isis/ldp-sync-interface.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from isis/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>
+    #include <include/isis/ldp-sync-holddown.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/ldp-sync-protocol.xml.i b/interface-definitions/include/isis/ldp-sync-protocol.xml.i
new file mode 100644
index 000000000..b2e696a70
--- /dev/null
+++ b/interface-definitions/include/isis/ldp-sync-protocol.xml.i
@@ -0,0 +1,10 @@
+<!-- include start from isis/ldp-igp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>Protocol wide LDP-IGP synchronization configuration</help>
+  </properties>
+  <children>
+    #include <include/isis/ldp-sync-holddown.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 983a085ec..8103b5c5d 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -152,7 +152,7 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/ldp-sync-protocol.xml.i>
+#include <include/isis/ldp-sync-protocol.xml.i>
 <leafNode name="net">
   <properties>
     <help>A Network Entity Title for this process (ISO only)</help>
@@ -632,7 +632,7 @@
       </properties>
     </leafNode>
     #include <include/isis/metric.xml.i>
-    #include <include/ldp-sync-interface.xml.i>
+    #include <include/isis/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
deleted file mode 100644
index b24831bbe..000000000
--- a/interface-definitions/include/ldp-sync-interface.xml.i
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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
deleted file mode 100644
index c82c811f6..000000000
--- a/interface-definitions/include/ldp-sync-protocol.xml.i
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- 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 425d3b01c..e400119dd 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -331,7 +331,7 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/ldp-sync-protocol.xml.i>
+#include <include/isis/ldp-sync-protocol.xml.i>
 <node name="distance">
   <properties>
     <help>Administrative distance</help>
@@ -386,7 +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>
+    #include <include/isis/ldp-sync-interface.xml.i>
     <leafNode name="bandwidth">
       <properties>
         <help>Interface bandwidth (Mbit/s)</help>