From 3ffb5ff16543576e73f23125e4590fa57b02f0b7 Mon Sep 17 00:00:00 2001
From: Cheeze_It <none@none.com>
Date: Sun, 19 Mar 2023 19:24:50 -0600
Subject: T5081: ISIS and OSPF syncronization with IGP-LDP sync

---
 op-mode-definitions/include/isis-common.xml.i | 26 +++++++++++++++++++++++++-
 op-mode-definitions/include/ospf-common.xml.i | 26 +++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/isis-common.xml.i b/op-mode-definitions/include/isis-common.xml.i
index 0e20861c7..53e85a7ef 100644
--- a/op-mode-definitions/include/isis-common.xml.i
+++ b/op-mode-definitions/include/isis-common.xml.i
@@ -54,6 +54,30 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
+<node name="mpls">
+  <properties>
+    <help>Show IS-IS MPLS specific information</help>
+  </properties>
+  <children>
+    <node name="ldp-sync">
+      <properties>
+        <help>Show IS-IS LDP-IGP synchronization information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="interface">
+          <properties>
+            <help>Show specific IS-IS LDP-IGP synchronization for an interface</help>
+            <completionHelp>
+              <script>${vyos_completion_dir}/list_interfaces</script>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+      </children>
+    </node>
+  </children>
+</node>
 <node name="mpls-te">
   <properties>
     <help>Show IS-IS MPLS traffic engineering information</help>
@@ -176,4 +200,4 @@
   </children>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
-<!-- included end -->
+<!-- included end -->
\ No newline at end of file
diff --git a/op-mode-definitions/include/ospf-common.xml.i b/op-mode-definitions/include/ospf-common.xml.i
index 098254f4e..7d9e541cf 100644
--- a/op-mode-definitions/include/ospf-common.xml.i
+++ b/op-mode-definitions/include/ospf-common.xml.i
@@ -517,6 +517,30 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
+<node name="mpls">
+  <properties>
+    <help>Show OSPF MPLS specific information</help>
+  </properties>
+  <children>
+    <node name="ldp-sync">
+      <properties>
+        <help>Show OSPF LDP-IGP synchronization information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="interface">
+          <properties>
+            <help>Show specific OSPF LDP-IGP synchronization for an interface</help>
+            <completionHelp>
+              <script>${vyos_completion_dir}/list_interfaces</script>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+      </children>
+    </node>
+  </children>
+</node>
 <node name="neighbor">
   <properties>
     <help>Show IPv4 OSPF neighbor information</help>
@@ -547,4 +571,4 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </leafNode>
-<!-- included end -->
+<!-- included end -->
\ No newline at end of file
-- 
cgit v1.2.3


From 9347bfa209626167f7f04856a81fc4ccab1aaccd Mon Sep 17 00:00:00 2001
From: Cheeze_It <none@none.com>
Date: Sun, 9 Apr 2023 17:38:36 -0600
Subject: T5081: ISIS and OSPF syncronization with IGP-LDP sync

---
 op-mode-definitions/include/isis-common.xml.i | 22 +++-------------------
 op-mode-definitions/include/ldp-sync.xml.i    | 19 +++++++++++++++++++
 op-mode-definitions/include/ospf-common.xml.i | 20 ++------------------
 3 files changed, 24 insertions(+), 37 deletions(-)
 create mode 100644 op-mode-definitions/include/ldp-sync.xml.i

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/isis-common.xml.i b/op-mode-definitions/include/isis-common.xml.i
index 53e85a7ef..b5b4f9b5d 100644
--- a/op-mode-definitions/include/isis-common.xml.i
+++ b/op-mode-definitions/include/isis-common.xml.i
@@ -56,31 +56,15 @@
 </tagNode>
 <node name="mpls">
   <properties>
-    <help>Show IS-IS MPLS specific information</help>
+    <help>Show MPLS information</help>
   </properties>
   <children>
-    <node name="ldp-sync">
-      <properties>
-        <help>Show IS-IS LDP-IGP synchronization information</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-      <children>
-        <tagNode name="interface">
-          <properties>
-            <help>Show specific IS-IS LDP-IGP synchronization for an interface</help>
-            <completionHelp>
-              <script>${vyos_completion_dir}/list_interfaces</script>
-            </completionHelp>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </tagNode>
-      </children>
-    </node>
+  #include <include/ldp-sync.xml.i>
   </children>
 </node>
 <node name="mpls-te">
   <properties>
-    <help>Show IS-IS MPLS traffic engineering information</help>
+    <help>Show MPLS traffic engineering information</help>
   </properties>
   <children>
     <leafNode name="router">
diff --git a/op-mode-definitions/include/ldp-sync.xml.i b/op-mode-definitions/include/ldp-sync.xml.i
new file mode 100644
index 000000000..b3be8f503
--- /dev/null
+++ b/op-mode-definitions/include/ldp-sync.xml.i
@@ -0,0 +1,19 @@
+<!-- included start from ldp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>Show LDP-IGP synchronization information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    <tagNode name="interface">
+      <properties>
+        <help>Show specific LDP-IGP synchronization for an interface</help>
+        <completionHelp>
+          <script>${vyos_completion_dir}/list_interfaces</script>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </tagNode>
+  </children>
+</node>
+<!-- included end -->
\ No newline at end of file
diff --git a/op-mode-definitions/include/ospf-common.xml.i b/op-mode-definitions/include/ospf-common.xml.i
index 7d9e541cf..d1a62b690 100644
--- a/op-mode-definitions/include/ospf-common.xml.i
+++ b/op-mode-definitions/include/ospf-common.xml.i
@@ -519,26 +519,10 @@
 </tagNode>
 <node name="mpls">
   <properties>
-    <help>Show OSPF MPLS specific information</help>
+    <help>Show MPLS information</help>
   </properties>
   <children>
-    <node name="ldp-sync">
-      <properties>
-        <help>Show OSPF LDP-IGP synchronization information</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-      <children>
-        <tagNode name="interface">
-          <properties>
-            <help>Show specific OSPF LDP-IGP synchronization for an interface</help>
-            <completionHelp>
-              <script>${vyos_completion_dir}/list_interfaces</script>
-            </completionHelp>
-          </properties>
-          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-        </tagNode>
-      </children>
-    </node>
+  #include <include/ldp-sync.xml.i>
   </children>
 </node>
 <node name="neighbor">
-- 
cgit v1.2.3