From bd7cc746a9f6e7e18f2c73e4b66f4db24618c223 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 31 Jul 2023 21:02:16 +0200
Subject: op-mode: T3700: provide generic frr-detail XML building block

---
 op-mode-definitions/include/frr-detail.xml.i       |  8 ++++++
 op-mode-definitions/include/ospf/common.xml.i      |  7 +----
 .../include/ospfv3/adv-router-id-node-tag.xml.i    |  2 +-
 .../include/ospfv3/adv-router.xml.i                |  2 +-
 .../include/ospfv3/border-routers.xml.i            |  2 +-
 op-mode-definitions/include/ospfv3/database.xml.i  | 30 +++++++++++-----------
 op-mode-definitions/include/ospfv3/detail.xml.i    |  8 ------
 op-mode-definitions/include/ospfv3/interface.xml.i |  8 +++---
 .../include/ospfv3/linkstate-id-node-tag.xml.i     |  2 +-
 .../include/ospfv3/linkstate-id.xml.i              |  2 +-
 op-mode-definitions/include/ospfv3/linkstate.xml.i |  2 +-
 op-mode-definitions/include/ospfv3/neighbor.xml.i  |  2 +-
 op-mode-definitions/include/ospfv3/route.xml.i     | 12 ++++-----
 .../include/ospfv3/self-originated.xml.i           |  2 +-
 14 files changed, 42 insertions(+), 47 deletions(-)
 create mode 100644 op-mode-definitions/include/frr-detail.xml.i
 delete mode 100644 op-mode-definitions/include/ospfv3/detail.xml.i

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/frr-detail.xml.i b/op-mode-definitions/include/frr-detail.xml.i
new file mode 100644
index 000000000..4edf82eab
--- /dev/null
+++ b/op-mode-definitions/include/frr-detail.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from frr-detail.xml.i -->
+<leafNode name="detail">
+  <properties>
+    <help>Show detailed information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</leafNode>
+<!-- included end -->
diff --git a/op-mode-definitions/include/ospf/common.xml.i b/op-mode-definitions/include/ospf/common.xml.i
index c8341bd3e..684073cc5 100644
--- a/op-mode-definitions/include/ospf/common.xml.i
+++ b/op-mode-definitions/include/ospf/common.xml.i
@@ -524,12 +524,7 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
   <children>
-    <node name="detail">
-      <properties>
-        <help>Show detailed IPv4 OSPF neighbor information</help>
-      </properties>
-      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-    </node>
+    #include <include/frr-detail.xml.i>
   </children>
 </node>
 <tagNode name="neighbor">
diff --git a/op-mode-definitions/include/ospfv3/adv-router-id-node-tag.xml.i b/op-mode-definitions/include/ospfv3/adv-router-id-node-tag.xml.i
index a1bd67a90..806366444 100644
--- a/op-mode-definitions/include/ospfv3/adv-router-id-node-tag.xml.i
+++ b/op-mode-definitions/include/ospfv3/adv-router-id-node-tag.xml.i
@@ -8,7 +8,7 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
   <children>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
     #include <include/ospfv3/dump.xml.i>
     #include <include/ospfv3/internal.xml.i>
   </children>
diff --git a/op-mode-definitions/include/ospfv3/adv-router.xml.i b/op-mode-definitions/include/ospfv3/adv-router.xml.i
index a14fc39db..238242d11 100644
--- a/op-mode-definitions/include/ospfv3/adv-router.xml.i
+++ b/op-mode-definitions/include/ospfv3/adv-router.xml.i
@@ -7,7 +7,7 @@
     </completionHelp>
   </properties>
   <children>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
     #include <include/ospfv3/dump.xml.i>
     #include <include/ospfv3/internal.xml.i>
     #include <include/ospfv3/linkstate-id.xml.i>
diff --git a/op-mode-definitions/include/ospfv3/border-routers.xml.i b/op-mode-definitions/include/ospfv3/border-routers.xml.i
index b6fac6785..e8827a2c4 100644
--- a/op-mode-definitions/include/ospfv3/border-routers.xml.i
+++ b/op-mode-definitions/include/ospfv3/border-routers.xml.i
@@ -5,7 +5,7 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
   <children>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
   </children>
 </node>
 <tagNode name="border-routers">
diff --git a/op-mode-definitions/include/ospfv3/database.xml.i b/op-mode-definitions/include/ospfv3/database.xml.i
index e98f9e35b..fdc45f184 100644
--- a/op-mode-definitions/include/ospfv3/database.xml.i
+++ b/op-mode-definitions/include/ospfv3/database.xml.i
@@ -29,7 +29,7 @@
             </completionHelp>
           </properties>
           <children>
-            #include <include/ospfv3/detail.xml.i>
+            #include <include/frr-detail.xml.i>
             #include <include/ospfv3/dump.xml.i>
             #include <include/ospfv3/internal.xml.i>
           </children>
@@ -45,7 +45,7 @@
       </properties>
       <command>vtysh -c "show ipv6 ospf6 database * $6"</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/adv-router-id-node-tag.xml.i>
@@ -67,12 +67,12 @@
           </properties>
           <command>vtysh -c "show ipv6 ospf6 database as-external * $7"</command>
           <children>
-            #include <include/ospfv3/detail.xml.i>
+            #include <include/frr-detail.xml.i>
             #include <include/ospfv3/dump.xml.i>
             #include <include/ospfv3/internal.xml.i>
           </children>
         </tagNode>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
@@ -87,14 +87,14 @@
         </completionHelp>
       </properties>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/self-originated.xml.i>
         #include <include/ospfv3/adv-router-id-node-tag.xml.i>
       </children>
     </tagNode>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
     #include <include/ospfv3/internal.xml.i>
     #include <include/ospfv3/linkstate-id.xml.i>
     #include <include/ospfv3/self-originated.xml.i>
@@ -105,7 +105,7 @@
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         #include <include/ospfv3/adv-router.xml.i>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
@@ -120,7 +120,7 @@
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         #include <include/ospfv3/adv-router.xml.i>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
@@ -135,7 +135,7 @@
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         #include <include/ospfv3/adv-router.xml.i>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
@@ -150,7 +150,7 @@
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         #include <include/ospfv3/adv-router.xml.i>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
@@ -165,7 +165,7 @@
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         #include <include/ospfv3/adv-router.xml.i>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
@@ -180,7 +180,7 @@
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         #include <include/ospfv3/adv-router.xml.i>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
@@ -195,7 +195,7 @@
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         #include <include/ospfv3/adv-router.xml.i>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
@@ -210,7 +210,7 @@
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         #include <include/ospfv3/adv-router.xml.i>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
@@ -225,7 +225,7 @@
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
         #include <include/ospfv3/adv-router.xml.i>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         #include <include/ospfv3/dump.xml.i>
         #include <include/ospfv3/internal.xml.i>
         #include <include/ospfv3/linkstate-id.xml.i>
diff --git a/op-mode-definitions/include/ospfv3/detail.xml.i b/op-mode-definitions/include/ospfv3/detail.xml.i
deleted file mode 100644
index 4e3c91268..000000000
--- a/op-mode-definitions/include/ospfv3/detail.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- included start from ospfv3/detail.xml.i -->
-<node name="detail">
-  <properties>
-    <help>Show detailed information</help>
-  </properties>
-  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-</node>
-<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3/interface.xml.i b/op-mode-definitions/include/ospfv3/interface.xml.i
index 7a0b8ea48..45d5dbd45 100644
--- a/op-mode-definitions/include/ospfv3/interface.xml.i
+++ b/op-mode-definitions/include/ospfv3/interface.xml.i
@@ -11,7 +11,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
       </children>
     </node>
     <tagNode name="prefix">
@@ -23,7 +23,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         <node name="match">
           <properties>
             <help>Matched interface prefix information</help>
@@ -49,7 +49,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
       </children>
     </node>
     <tagNode name="prefix">
@@ -61,7 +61,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
         <node name="match">
           <properties>
             <help>Matched interface prefix information</help>
diff --git a/op-mode-definitions/include/ospfv3/linkstate-id-node-tag.xml.i b/op-mode-definitions/include/ospfv3/linkstate-id-node-tag.xml.i
index ee3863b35..66674e754 100644
--- a/op-mode-definitions/include/ospfv3/linkstate-id-node-tag.xml.i
+++ b/op-mode-definitions/include/ospfv3/linkstate-id-node-tag.xml.i
@@ -8,7 +8,7 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
   <children>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
     #include <include/ospfv3/dump.xml.i>
     #include <include/ospfv3/internal.xml.i>
     #include <include/ospfv3/self-originated.xml.i>
diff --git a/op-mode-definitions/include/ospfv3/linkstate-id.xml.i b/op-mode-definitions/include/ospfv3/linkstate-id.xml.i
index 9ead17c20..aa226c988 100644
--- a/op-mode-definitions/include/ospfv3/linkstate-id.xml.i
+++ b/op-mode-definitions/include/ospfv3/linkstate-id.xml.i
@@ -7,7 +7,7 @@
     </completionHelp>
   </properties>
   <children>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
     #include <include/ospfv3/dump.xml.i>
     #include <include/ospfv3/internal.xml.i>
   </children>
diff --git a/op-mode-definitions/include/ospfv3/linkstate.xml.i b/op-mode-definitions/include/ospfv3/linkstate.xml.i
index 78ef3efa1..030dc7923 100644
--- a/op-mode-definitions/include/ospfv3/linkstate.xml.i
+++ b/op-mode-definitions/include/ospfv3/linkstate.xml.i
@@ -4,7 +4,7 @@
     <help>Show OSPFv3 linkstate routing information</help>
   </properties>
   <children>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
     <tagNode name="network">
       <properties>
         <help>Show linkstate Network information</help>
diff --git a/op-mode-definitions/include/ospfv3/neighbor.xml.i b/op-mode-definitions/include/ospfv3/neighbor.xml.i
index 37859f815..b736270be 100644
--- a/op-mode-definitions/include/ospfv3/neighbor.xml.i
+++ b/op-mode-definitions/include/ospfv3/neighbor.xml.i
@@ -5,7 +5,7 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
   <children>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
     <node name="drchoice">
       <properties>
         <help>Show neighbor DR choice information</help>
diff --git a/op-mode-definitions/include/ospfv3/route.xml.i b/op-mode-definitions/include/ospfv3/route.xml.i
index 9271c9c3a..a5b97cd05 100644
--- a/op-mode-definitions/include/ospfv3/route.xml.i
+++ b/op-mode-definitions/include/ospfv3/route.xml.i
@@ -11,7 +11,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
       </children>
     </node>
     <node name="external-2">
@@ -20,7 +20,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
       </children>
     </node>
     <node name="inter-area">
@@ -29,7 +29,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
       </children>
     </node>
     <node name="intra-area">
@@ -38,10 +38,10 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
       </children>
     </node>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
     <node name="summary">
       <properties>
         <help>Show route table summary</help>
@@ -71,7 +71,7 @@
       </properties>
       <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
       <children>
-        #include <include/ospfv3/detail.xml.i>
+        #include <include/frr-detail.xml.i>
       </children>
     </node>
   </children>
diff --git a/op-mode-definitions/include/ospfv3/self-originated.xml.i b/op-mode-definitions/include/ospfv3/self-originated.xml.i
index 734f3f8ad..7549ccb2c 100644
--- a/op-mode-definitions/include/ospfv3/self-originated.xml.i
+++ b/op-mode-definitions/include/ospfv3/self-originated.xml.i
@@ -5,7 +5,7 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
   <children>
-    #include <include/ospfv3/detail.xml.i>
+    #include <include/frr-detail.xml.i>
     #include <include/ospfv3/dump.xml.i>
     #include <include/ospfv3/internal.xml.i>
   </children>
-- 
cgit v1.2.3