From 67b342a2c59035a5282f92e3b3d77f698dc8887c Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@vyos.io>
Date: Thu, 2 Jun 2022 09:20:37 -0400
Subject: T4446: use a unified neighbor display script

---
 op-mode-definitions/ipv6-route.xml.in | 30 ++++++++++++++++++++++++------
 op-mode-definitions/show-arp.xml.in   |  4 ++--
 op-mode-definitions/show-ip.xml.in    | 24 ++++++++++++++++++++++--
 op-mode-definitions/show-ipv6.xml.in  |  2 +-
 4 files changed, 49 insertions(+), 11 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/ipv6-route.xml.in b/op-mode-definitions/ipv6-route.xml.in
index 5f20444d4..4f8792f9f 100644
--- a/op-mode-definitions/ipv6-route.xml.in
+++ b/op-mode-definitions/ipv6-route.xml.in
@@ -7,7 +7,7 @@
     <children>
       <node name="ipv6">
         <properties>
-          <help>Show IPv6 routing information</help>
+          <help>Show IPv6 networking information</help>
         </properties>
         <children>
           <leafNode name="groups">
@@ -16,14 +16,32 @@
             </properties>
             <command>netstat -gn6</command>
           </leafNode>
-
-          <leafNode name="neighbors">
+          <node name="neighbors">
             <properties>
-              <help>Show IPv6 Neighbor Discovery (ND) information</help>
+              <help>Show IPv6 neighbor (NDP) table</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_neigh.py --family inet6</command>
-          </leafNode>
-
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Show IPv6 neighbor table for specified interface</help>
+                  <completionHelp>
+                    <script>${vyos_completion_dir}/list_interfaces.py -b</script>
+                  </completionHelp>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_neigh.py --family inet6 --interface "$5"</command>
+              </tagNode>
+              <tagNode name="state">
+                <properties>
+                  <help>Show IPv6 neighbors with specified state</help>
+                  <completionHelp>
+                    <list>reachable stale failed permanent</list>
+                  </completionHelp>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_neigh.py --family inet6 --state "$5"</command>
+              </tagNode>
+            </children>
+          </node>
         </children>
       </node>
     </children>
diff --git a/op-mode-definitions/show-arp.xml.in b/op-mode-definitions/show-arp.xml.in
index 12e7d3aa2..58cc6e45e 100644
--- a/op-mode-definitions/show-arp.xml.in
+++ b/op-mode-definitions/show-arp.xml.in
@@ -6,7 +6,7 @@
         <properties>
           <help>Show Address Resolution Protocol (ARP) information</help>
         </properties>
-        <command>/usr/sbin/arp -e -n</command>
+        <command>${vyos_op_scripts_dir}/show_neigh.py --family inet</command>
         <children>
           <tagNode name="interface">
             <properties>
@@ -15,7 +15,7 @@
                 <script>${vyos_completion_dir}/list_interfaces.py -b</script>
               </completionHelp>
             </properties>
-            <command>/usr/sbin/arp -e -n -i "$4"</command>
+            <command>${vyos_op_scripts_dir}/show_neigh.py --family inet --interface "$4"</command>
           </tagNode>
         </children>
       </node>
diff --git a/op-mode-definitions/show-ip.xml.in b/op-mode-definitions/show-ip.xml.in
index 91564440d..d342ac192 100644
--- a/op-mode-definitions/show-ip.xml.in
+++ b/op-mode-definitions/show-ip.xml.in
@@ -4,14 +4,34 @@
     <children>
       <node name="ip">
         <properties>
-          <help>Show IPv4 routing information</help>
+          <help>Show IPv4 networking information</help>
         </properties>
         <children>
           <node name="neighbors">
             <properties>
-              <help>Show IPv4 Neighbor Discovery (ND) information</help>
+              <help>Show IPv4 neighbor (ARP) table</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_neigh.py --family inet</command>
+            <children>
+              <tagNode name="interface">
+                <properties>
+                  <help>Show IPv4 neighbor table for specified interface</help>
+                  <completionHelp>
+                    <script>${vyos_completion_dir}/list_interfaces.py -b</script>
+                  </completionHelp>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_neigh.py --family inet --interface "$5"</command>
+              </tagNode>
+              <tagNode name="state">
+                <properties>
+                  <help>Show IPv4 neighbors with specified state</help>
+                  <completionHelp>
+                    <list>reachable stale failed permanent</list>
+                  </completionHelp>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_neigh.py --family inet --state "$5"</command>
+              </tagNode>
+            </children>
           </node>
         </children>
       </node>
diff --git a/op-mode-definitions/show-ipv6.xml.in b/op-mode-definitions/show-ipv6.xml.in
index a59c8df0c..66bc2485a 100644
--- a/op-mode-definitions/show-ipv6.xml.in
+++ b/op-mode-definitions/show-ipv6.xml.in
@@ -4,7 +4,7 @@
     <children>
       <node name="ipv6">
         <properties>
-          <help>Show IPv6 routing information</help>
+          <help>Show IPv6 networking information</help>
         </properties>
         <children>
           <node name="access-list">
-- 
cgit v1.2.3