xml: isis: ospf: re-arrange include blocks

6 files changed, 27 insertions, 31 deletions

diff --git a/interface-definitions/include/bfd.xml.i b/interface-definitions/include/bfd.xml.i
new file mode 100644
index 000000000..2bc3664e1
--- /dev/null
+++ b/interface-definitions/include/bfd.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from bfd.xml.i -->
+<leafNode name="bfd">
+  <properties>
+    <help>Enable Bidirectional Forwarding Detection (BFD)</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/isis-redistribute-ipv4.xml.i b/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i
index 774086a81..df48b4d28 100644
--- a/interface-definitions/include/isis-redistribute-ipv4.xml.i
+++ b/interface-definitions/include/isis/isis-redistribute-ipv4.xml.i
@@ -1,4 +1,4 @@
-<!-- include start from isis-redistribute-ipv4.xml.i -->
+<!-- include start from isis/isis-redistribute-ipv4.xml.i -->
 <node name="level-1">
   <properties>
     <help>Redistribute into level-1</help>
diff --git a/interface-definitions/include/isis/passive.xml.i b/interface-definitions/include/isis/passive.xml.i
new file mode 100644
index 000000000..6d05f8cc7
--- /dev/null
+++ b/interface-definitions/include/isis/passive.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from isis/passive.xml.i -->
+<leafNode name="passive">
+  <properties>
+    <help>Configure passive mode for interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-interface-common.xml.i b/interface-definitions/include/ospf/ospf-interface-common.xml.i
index c0069ccb5..39e90482c 100644
--- a/interface-definitions/include/ospf/ospf-interface-common.xml.i
+++ b/interface-definitions/include/ospf/ospf-interface-common.xml.i
@@ -1,10 +1,5 @@
 <!-- include start from ospf/ospf-interface-common.xml.i -->
-<leafNode name="bfd">
-  <properties>
-    <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
-    <valueless/>
-  </properties>
-</leafNode>
+#include <include/bfd.xml.i>
 <leafNode name="cost">
   <properties>
     <help>Interface cost</help>
diff --git a/interface-definitions/protocols-isis.xml.in b/interface-definitions/protocols-isis.xml.in
index 5b26d6923..0afa8dcb1 100644
--- a/interface-definitions/protocols-isis.xml.in
+++ b/interface-definitions/protocols-isis.xml.in
@@ -489,7 +489,7 @@
                       <help>Border Gateway Protocol (BGP)</help>
                     </properties>
                     <children>
-                      #include <include/isis-redistribute-ipv4.xml.i>
+                      #include <include/isis/isis-redistribute-ipv4.xml.i>
                     </children>
                   </node>
                   <node name="connected">
@@ -497,7 +497,7 @@
                       <help>Redistribute connected routes into IS-IS</help>
                     </properties>
                     <children>
-                      #include <include/isis-redistribute-ipv4.xml.i>
+                      #include <include/isis/isis-redistribute-ipv4.xml.i>
                     </children>
                   </node>
                   <node name="kernel">
@@ -505,7 +505,7 @@
                       <help>Redistribute kernel routes into IS-IS</help>
                     </properties>
                     <children>
-                      #include <include/isis-redistribute-ipv4.xml.i>
+                      #include <include/isis/isis-redistribute-ipv4.xml.i>
                     </children>
                   </node>
                   <node name="ospf">
@@ -513,7 +513,7 @@
                       <help>Redistribute OSPF routes into IS-IS</help>
                     </properties>
                     <children>
-                      #include <include/isis-redistribute-ipv4.xml.i>
+                      #include <include/isis/isis-redistribute-ipv4.xml.i>
                     </children>
                   </node>
                   <node name="rip">
@@ -521,7 +521,7 @@
                       <help>Redistribute RIP routes into IS-IS</help>
                     </properties>
                     <children>
-                      #include <include/isis-redistribute-ipv4.xml.i>
+                      #include <include/isis/isis-redistribute-ipv4.xml.i>
                     </children>
                   </node>
                   <node name="static">
@@ -529,7 +529,7 @@
                       <help>Redistribute static routes into IS-IS</help>
                     </properties>
                     <children>
-                      #include <include/isis-redistribute-ipv4.xml.i>
+                      #include <include/isis/isis-redistribute-ipv4.xml.i>
                     </children>
                   </node>
                 </children>
@@ -637,12 +637,7 @@
               </completionHelp>
             </properties>
             <children>
-              <leafNode name="bfd">
-                <properties>
-                  <help>Enable BFD support</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/bfd.xml.i>
               <leafNode name="circuit-type">
                 <properties>
                   <help>Configure circuit type for interface</help>
@@ -721,12 +716,7 @@
                   </leafNode>
                 </children>
               </node>
-              <leafNode name="passive">
-                <properties>
-                  <help>Configure the passive mode for interface</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/isis/passive.xml.i>
               <node name="password">
                 <properties>
                   <help>Configure the authentication password for a circuit</help>
diff --git a/interface-definitions/protocols-ospfv3.xml.in b/interface-definitions/protocols-ospfv3.xml.in
index 06787b604..f4f403e93 100644
--- a/interface-definitions/protocols-ospfv3.xml.in
+++ b/interface-definitions/protocols-ospfv3.xml.in
@@ -163,12 +163,7 @@
                   <constraintErrorMessage>Must be broadcast or point-to-point</constraintErrorMessage>
                 </properties>
               </leafNode>
-              <leafNode name="passive">
-                <properties>
-                  <help>Disable forming of adjacency</help>
-                  <valueless/>
-                </properties>
-              </leafNode>
+              #include <include/isis/passive.xml.i>
             </children>
           </tagNode>
           <node name="parameters">