From 1c91987c494f80f8fe80de1534638362c7bd978e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 10 Jan 2021 16:44:07 +0100
Subject: op-mode: T3178: add remaining "show ipv6 ospfv3 database" commands
 from vyatta-op-quagga

---
 .../include/ospfv3-adv-router-id-node-tag.xml.i    |   3 +-
 .../include/ospfv3-adv-router.xml.i                |   3 +
 .../include/ospfv3-linkstate-id-node-tag.xml.i     |  18 +++
 .../include/ospfv3-self-originated.xml.i           |   3 +-
 op-mode-definitions/show-ipv6-ospfv3.xml.in        | 156 ++++++++++++++++++++-
 5 files changed, 180 insertions(+), 3 deletions(-)
 create mode 100644 op-mode-definitions/include/ospfv3-linkstate-id-node-tag.xml.i

(limited to 'op-mode-definitions')

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 b6a64c52a..312ce2a4f 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
@@ -6,7 +6,8 @@
       <list>&lt;x.x.x.x&gt;</list>
     </completionHelp>
   </properties>
-  <command>vtysh -c "show ipv6 ospf6 database * $6 $7"</command>
+  <!-- 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>
diff --git a/op-mode-definitions/include/ospfv3-adv-router.xml.i b/op-mode-definitions/include/ospfv3-adv-router.xml.i
index 6330c0a72..d17538d4d 100644
--- a/op-mode-definitions/include/ospfv3-adv-router.xml.i
+++ b/op-mode-definitions/include/ospfv3-adv-router.xml.i
@@ -7,6 +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-linkstate-id.xml.i>
   </children>
 </tagNode>
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..24b549d28
--- /dev/null
+++ b/op-mode-definitions/include/ospfv3-linkstate-id-node-tag.xml.i
@@ -0,0 +1,18 @@
+<!-- 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
index 76054757b..180bca6f6 100644
--- a/op-mode-definitions/include/ospfv3-self-originated.xml.i
+++ b/op-mode-definitions/include/ospfv3-self-originated.xml.i
@@ -3,7 +3,8 @@
   <properties>
     <help>Show Self-originated LSAs</help>
   </properties>
-  <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated"</command>
+  <!-- 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>
diff --git a/op-mode-definitions/show-ipv6-ospfv3.xml.in b/op-mode-definitions/show-ipv6-ospfv3.xml.in
index bbae74c75..9227fdae1 100644
--- a/op-mode-definitions/show-ipv6-ospfv3.xml.in
+++ b/op-mode-definitions/show-ipv6-ospfv3.xml.in
@@ -63,7 +63,17 @@
                 </properties>
                 <command>vtysh -c "show ipv6 ospf6 database"</command>
                 <children>
-                  #include <include/ospfv3-adv-router.xml.i>
+                  <tagNode name="adv-router">
+                    <properties>
+                      <help>Search by Advertising Router ID</help>
+                      <completionHelp>
+                        <list>&lt;x.x.x.x&gt;</list>
+                      </completionHelp>
+                    </properties>
+                    <children>
+                      #include <include/ospfv3-linkstate-id.xml.i>
+                    </children>
+                  </tagNode>
                   <node name="any">
                     <properties>
                       <help>Search by Any Link state Type</help>
@@ -146,6 +156,150 @@
                   #include <include/ospfv3-internal.xml.i>
                   #include <include/ospfv3-linkstate-id.xml.i>
                   #include <include/ospfv3-self-originated.xml.i>
+                  <node name="group-membership">
+                    <properties>
+                      <help>Show Group-Membership 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-adv-router.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>
+                      #include <include/ospfv3-linkstate-id-node-tag.xml.i>
+                      #include <include/ospfv3-self-originated.xml.i>
+                    </children>
+                  </node>
+                  <node name="inter-prefix">
+                    <properties>
+                      <help>Show Inter-Area-Prefix 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-adv-router.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>
+                      #include <include/ospfv3-linkstate-id-node-tag.xml.i>
+                      #include <include/ospfv3-self-originated.xml.i>
+                    </children>
+                  </node>
+                  <node name="inter-router">
+                    <properties>
+                      <help>Show Inter-Area-Router 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-adv-router.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>
+                      #include <include/ospfv3-linkstate-id-node-tag.xml.i>
+                      #include <include/ospfv3-self-originated.xml.i>
+                    </children>
+                  </node>
+                  <node name="intra-prefix">
+                    <properties>
+                      <help>Show Intra-Area-Prefix 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-adv-router.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>
+                      #include <include/ospfv3-linkstate-id-node-tag.xml.i>
+                      #include <include/ospfv3-self-originated.xml.i>
+                    </children>
+                  </node>
+                  <node name="link">
+                    <properties>
+                      <help>Show Link 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-adv-router.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>
+                      #include <include/ospfv3-linkstate-id-node-tag.xml.i>
+                      #include <include/ospfv3-self-originated.xml.i>
+                    </children>
+                  </node>
+                  <node name="network">
+                    <properties>
+                      <help>Show Network 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-adv-router.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>
+                      #include <include/ospfv3-linkstate-id-node-tag.xml.i>
+                      #include <include/ospfv3-self-originated.xml.i>
+                    </children>
+                  </node>
+                  <node name="node.tag">
+                    <properties>
+                      <help>Show 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-adv-router.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>
+                      #include <include/ospfv3-linkstate-id-node-tag.xml.i>
+                      #include <include/ospfv3-self-originated.xml.i>
+                    </children>
+                  </node>
+                  <node name="router">
+                    <properties>
+                      <help>Show router 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-adv-router.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>
+                      #include <include/ospfv3-linkstate-id-node-tag.xml.i>
+                      #include <include/ospfv3-self-originated.xml.i>
+                    </children>
+                  </node>
+                  <node name="type-7">
+                    <properties>
+                      <help>Show Type-7 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-adv-router.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>
+                      #include <include/ospfv3-linkstate-id-node-tag.xml.i>
+                      #include <include/ospfv3-self-originated.xml.i>
+                    </children>
+                  </node>
                 </children>
               </node>
               <node name="interface">
-- 
cgit v1.2.3