From 9f2408d9d37620d921a09c9e899046e4c9c3e599 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 17 Feb 2024 21:40:58 +0100
Subject: op-mode: T5581: add "show ipv6 nht" command

This improves the implementation to support both IPv4 and IPv6

(cherry picked from commit e144e55d6360a92279167198928cbe24efd97f08)
---
 op-mode-definitions/include/show-nht.xml.i | 20 ++++++++++++++++++++
 op-mode-definitions/show-ip.xml.in         |  7 +------
 op-mode-definitions/show-ipv6.xml.in       |  1 +
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 op-mode-definitions/include/show-nht.xml.i

diff --git a/op-mode-definitions/include/show-nht.xml.i b/op-mode-definitions/include/show-nht.xml.i
new file mode 100644
index 000000000..55dacf3a4
--- /dev/null
+++ b/op-mode-definitions/include/show-nht.xml.i
@@ -0,0 +1,20 @@
+<!-- included start from show-nht.xml.i -->
+<node name="nht">
+  <properties>
+    <help>Show Nexthop tracking table</help>
+  </properties>
+  <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+  <children>
+    <tagNode name="vrf">
+      <properties>
+        <help>Specify the VRF</help>
+        <completionHelp>
+          <path>vrf name</path>
+          <list>all default</list>
+        </completionHelp>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+    </tagNode>
+  </children>
+</node>
+<!-- included end -->
diff --git a/op-mode-definitions/show-ip.xml.in b/op-mode-definitions/show-ip.xml.in
index 3caf1f1ea..bac4df05c 100644
--- a/op-mode-definitions/show-ip.xml.in
+++ b/op-mode-definitions/show-ip.xml.in
@@ -33,12 +33,7 @@
               </tagNode>
             </children>
           </node>
-          <leafNode name="nht">
-            <properties>
-              <help>Show IPv4 nexthop tracking table</help>
-            </properties>
-            <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
-          </leafNode>
+          #include <include/show-nht.xml.i>
         </children>
       </node>
     </children>
diff --git a/op-mode-definitions/show-ipv6.xml.in b/op-mode-definitions/show-ipv6.xml.in
index 66bc2485a..e10379ac2 100644
--- a/op-mode-definitions/show-ipv6.xml.in
+++ b/op-mode-definitions/show-ipv6.xml.in
@@ -28,6 +28,7 @@
             </properties>
             <command>vtysh -c "show ipv6 forwarding"</command>
           </node>
+          #include <include/show-nht.xml.i>
           <node name="ripng">
             <properties>
               <help>Show RIPNG protocol information</help>
-- 
cgit v1.2.3