op-mode: ospfv3: T3335: re-use common vtysh_wrapper.sh wrapper

Instead of renaming the OSPFv3 commands for every individual XML invocation,
also re-use the common helper shell script. One source, one truth!

14 files changed, 79 insertions, 85 deletions

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
deleted file mode 100644
index 312ce2a4f..000000000
--- a/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- included start from ospfv3-adv-router-id-node-tag.xml.i -->
-<node name="node.tag">
-  <properties>
-    <help>Search by Advertising Router ID</help>
-    <completionHelp>
-      <list>&lt;x.x.x.x&gt;</list>
-    </completionHelp>
-  </properties>
-  <!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
-  <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
-  <children>
-    #include <include/ospfv3-detail.xml.i>
-    #include <include/ospfv3-dump.xml.i>
-    #include <include/ospfv3-internal.xml.i>
-  </children>
-</node>
-<!-- included end -->
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 76096fbc8..000000000
--- a/op-mode-definitions/include/ospfv3-detail.xml.i
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- included start from ospfv3-detail.xml.i -->
-<node name="detail">
-  <properties>
-    <help>Show detailed information</help>
-  </properties>
-  <!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
-  <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
-</node>
-<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-dump.xml.i b/op-mode-definitions/include/ospfv3-dump.xml.i
deleted file mode 100644
index 4271aec53..000000000
--- a/op-mode-definitions/include/ospfv3-dump.xml.i
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- included start from ospfv3-dump.xml.i -->
-<node name="dump">
-  <properties>
-    <help>Show dump of LSAs</help>
-  </properties>
-  <!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
-  <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
-</node>
-<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-internal.xml.i b/op-mode-definitions/include/ospfv3-internal.xml.i
deleted file mode 100644
index 8b45e86c1..000000000
--- a/op-mode-definitions/include/ospfv3-internal.xml.i
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- included start from ospfv3-internal.xml.i -->
-<node name="internal">
-  <properties>
-    <help>Show internal LSA information</help>
-  </properties>
-  <!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
-  <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
-</node>
-<!-- included end -->
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
deleted file mode 100644
index 24b549d28..000000000
--- a/op-mode-definitions/include/ospfv3-linkstate-id-node-tag.xml.i
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- included start from ospfv3-linkstate-id-node-tag.xml.i -->
-<node name="node.tag">
-  <properties>
-    <help>Search by Link state ID</help>
-    <completionHelp>
-      <list>&lt;x.x.x.x&gt;</list>
-    </completionHelp>
-  </properties>
-  <!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
-  <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
-  <children>
-    #include <include/ospfv3-detail.xml.i>
-    #include <include/ospfv3-dump.xml.i>
-    #include <include/ospfv3-internal.xml.i>
-    #include <include/ospfv3-self-originated.xml.i>
-  </children>
-</node>
-<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-self-originated.xml.i b/op-mode-definitions/include/ospfv3-self-originated.xml.i
deleted file mode 100644
index 180bca6f6..000000000
--- a/op-mode-definitions/include/ospfv3-self-originated.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- included start from ospfv3-self-originated.xml.i -->
-<node name="self-originated">
-  <properties>
-    <help>Show Self-originated LSAs</help>
-  </properties>
-  <!-- FRR uses ospf6 where we use ospfv3, thus alter the command -->
-  <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command>
-  <children>
-    #include <include/ospfv3-detail.xml.i>
-    #include <include/ospfv3-dump.xml.i>
-    #include <include/ospfv3-internal.xml.i>
-  </children>
-</node>
-<!-- included end -->
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
new file mode 100644
index 000000000..a1bd67a90
--- /dev/null
+++ b/op-mode-definitions/include/ospfv3/adv-router-id-node-tag.xml.i
@@ -0,0 +1,16 @@
+<!-- included start from ospfv3/adv-router-id-node-tag.xml.i -->
+<node name="node.tag">
+  <properties>
+    <help>Search by Advertising Router ID</help>
+    <completionHelp>
+      <list>&lt;x.x.x.x&gt;</list>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    #include <include/ospfv3/detail.xml.i>
+    #include <include/ospfv3/dump.xml.i>
+    #include <include/ospfv3/internal.xml.i>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-adv-router.xml.i b/op-mode-definitions/include/ospfv3/adv-router.xml.i
index d17538d4d..a14fc39db 100644
--- a/op-mode-definitions/include/ospfv3-adv-router.xml.i
+++ b/op-mode-definitions/include/ospfv3/adv-router.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ospfv3-adv-router.xml.i -->
+<!-- included start from ospfv3/adv-router.xml.i -->
 <tagNode name="adv-router">
   <properties>
     <help>Search by Advertising Router ID</help>
@@ -7,10 +7,10 @@
     </completionHelp>
   </properties>
   <children>
-    #include <include/ospfv3-detail.xml.i>
-    #include <include/ospfv3-dump.xml.i>
-    #include <include/ospfv3-internal.xml.i>
-    #include <include/ospfv3-linkstate-id.xml.i>
+    #include <include/ospfv3/detail.xml.i>
+    #include <include/ospfv3/dump.xml.i>
+    #include <include/ospfv3/internal.xml.i>
+    #include <include/ospfv3/linkstate-id.xml.i>
   </children>
 </tagNode>
 <!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3/detail.xml.i b/op-mode-definitions/include/ospfv3/detail.xml.i
new file mode 100644
index 000000000..4e3c91268
--- /dev/null
+++ b/op-mode-definitions/include/ospfv3/detail.xml.i
@@ -0,0 +1,8 @@
+<!-- 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/dump.xml.i b/op-mode-definitions/include/ospfv3/dump.xml.i
new file mode 100644
index 000000000..55e10a5ee
--- /dev/null
+++ b/op-mode-definitions/include/ospfv3/dump.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from ospfv3/dump.xml.i -->
+<node name="dump">
+  <properties>
+    <help>Show dump of LSAs</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3/internal.xml.i b/op-mode-definitions/include/ospfv3/internal.xml.i
new file mode 100644
index 000000000..ac7c61e6f
--- /dev/null
+++ b/op-mode-definitions/include/ospfv3/internal.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from ospfv3/internal.xml.i -->
+<node name="internal">
+  <properties>
+    <help>Show internal LSA information</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+</node>
+<!-- included end -->
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
new file mode 100644
index 000000000..ee3863b35
--- /dev/null
+++ b/op-mode-definitions/include/ospfv3/linkstate-id-node-tag.xml.i
@@ -0,0 +1,17 @@
+<!-- included start from ospfv3/linkstate-id-node-tag.xml.i -->
+<node name="node.tag">
+  <properties>
+    <help>Search by Link state ID</help>
+    <completionHelp>
+      <list>&lt;x.x.x.x&gt;</list>
+    </completionHelp>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    #include <include/ospfv3/detail.xml.i>
+    #include <include/ospfv3/dump.xml.i>
+    #include <include/ospfv3/internal.xml.i>
+    #include <include/ospfv3/self-originated.xml.i>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3-linkstate-id.xml.i b/op-mode-definitions/include/ospfv3/linkstate-id.xml.i
index eab5916f1..9ead17c20 100644
--- a/op-mode-definitions/include/ospfv3-linkstate-id.xml.i
+++ b/op-mode-definitions/include/ospfv3/linkstate-id.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ospfv3-linkstate-id.xml.i -->
+<!-- included start from ospfv3/linkstate-id.xml.i -->
 <tagNode name="linkstate-id">
   <properties>
     <help>Search by Link state ID</help>
@@ -7,9 +7,9 @@
     </completionHelp>
   </properties>
   <children>
-    #include <include/ospfv3-detail.xml.i>
-    #include <include/ospfv3-dump.xml.i>
-    #include <include/ospfv3-internal.xml.i>
+    #include <include/ospfv3/detail.xml.i>
+    #include <include/ospfv3/dump.xml.i>
+    #include <include/ospfv3/internal.xml.i>
   </children>
 </tagNode>
 <!-- included end -->
diff --git a/op-mode-definitions/include/ospfv3/self-originated.xml.i b/op-mode-definitions/include/ospfv3/self-originated.xml.i
new file mode 100644
index 000000000..734f3f8ad
--- /dev/null
+++ b/op-mode-definitions/include/ospfv3/self-originated.xml.i
@@ -0,0 +1,13 @@
+<!-- included start from ospfv3/self-originated.xml.i -->
+<node name="self-originated">
+  <properties>
+    <help>Show Self-originated LSAs</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    #include <include/ospfv3/detail.xml.i>
+    #include <include/ospfv3/dump.xml.i>
+    #include <include/ospfv3/internal.xml.i>
+  </children>
+</node>
+<!-- included end -->