From 87ccd1b8242b7b58897c33b30a43a2f42fc43e39 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Wed, 26 May 2021 21:44:26 +0300
Subject: ospfv3: T3581: Fix op-mode for linkstate

---
 op-mode-definitions/include/ospfv3-detail.xml.i |  2 +-
 op-mode-definitions/show-ipv6-ospfv3.xml.in     | 30 +++++++++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/include/ospfv3-detail.xml.i b/op-mode-definitions/include/ospfv3-detail.xml.i
index 76096fbc8..d5e3b373d 100644
--- a/op-mode-definitions/include/ospfv3-detail.xml.i
+++ b/op-mode-definitions/include/ospfv3-detail.xml.i
@@ -4,6 +4,6 @@
     <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>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
 <!-- included end -->
diff --git a/op-mode-definitions/show-ipv6-ospfv3.xml.in b/op-mode-definitions/show-ipv6-ospfv3.xml.in
index 9227fdae1..7a6d12eaa 100644
--- a/op-mode-definitions/show-ipv6-ospfv3.xml.in
+++ b/op-mode-definitions/show-ipv6-ospfv3.xml.in
@@ -381,18 +381,34 @@
                 </properties>
                 <children>
                   #include <include/ospfv3-detail.xml.i>
-                  <node name="network">
+                  <tagNode name="network">
                     <properties>
-                      <help>Show linkstate Network information</help>
+                      <help>Show linkstate Network information (Router ID)</help>
+                      <completionHelp>
+                        <list>&lt;x.x.x.x&gt;</list>
+                      </completionHelp>
                     </properties>
-                    <command>vtysh -c "show ipv6 ospf6 linkstate network"</command>
-                  </node>
-                  <node name="router">
+                    <children>
+                      <tagNode name="link-state-id">
+                        <properties>
+                          <help>Specify Link state ID as IPv4 address notation</help>
+                          <completionHelp>
+                            <list>&lt;x.x.x.x&gt;</list>
+                          </completionHelp>
+                        </properties>
+                        <command>vtysh -c "show ipv6 ospf6 linkstate network $6 $8"</command>
+                      </tagNode>
+                    </children>
+                  </tagNode>
+                  <tagNode name="router">
                     <properties>
                       <help>Show linkstate Router information</help>
+                      <completionHelp>
+                        <list>&lt;x.x.x.x&gt;</list>
+                      </completionHelp>
                     </properties>
-                    <command>vtysh -c "show ipv6 ospf6 linkstate router"</command>
-                  </node>
+                    <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+                  </tagNode>
                 </children>
               </node>
               <node name="neighbor">
-- 
cgit v1.2.3