From 812a4fc3f3063741da0fa01cbbbf17dead66a664 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@vyos.io>
Date: Thu, 9 Jun 2022 09:16:53 -0400
Subject: T2719: prototype of an op mode command runner based on type hints and
 introspection

---
 op-mode-definitions/ipv6-route.xml.in | 6 +++---
 op-mode-definitions/show-arp.xml.in   | 4 ++--
 op-mode-definitions/show-ip.xml.in    | 6 +++---
 3 files changed, 8 insertions(+), 8 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 4f8792f9f..50f34dd56 100644
--- a/op-mode-definitions/ipv6-route.xml.in
+++ b/op-mode-definitions/ipv6-route.xml.in
@@ -20,7 +20,7 @@
             <properties>
               <help>Show IPv6 neighbor (NDP) table</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_neigh.py --family inet6</command>
+            <command>${vyos_op_scripts_dir}/neighbor.py --family inet6</command>
             <children>
               <tagNode name="interface">
                 <properties>
@@ -29,7 +29,7 @@
                     <script>${vyos_completion_dir}/list_interfaces.py -b</script>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_neigh.py --family inet6 --interface "$5"</command>
+                <command>${vyos_op_scripts_dir}/neighbor.py --family inet6 --interface "$5"</command>
               </tagNode>
               <tagNode name="state">
                 <properties>
@@ -38,7 +38,7 @@
                     <list>reachable stale failed permanent</list>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_neigh.py --family inet6 --state "$5"</command>
+                <command>${vyos_op_scripts_dir}/neighbor.py --family inet6 --state "$5"</command>
               </tagNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-arp.xml.in b/op-mode-definitions/show-arp.xml.in
index 58cc6e45e..11ac6a252 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>${vyos_op_scripts_dir}/show_neigh.py --family inet</command>
+        <command>${vyos_op_scripts_dir}/neighbor.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>${vyos_op_scripts_dir}/show_neigh.py --family inet --interface "$4"</command>
+            <command>${vyos_op_scripts_dir}/neighbor.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 d342ac192..1903aca05 100644
--- a/op-mode-definitions/show-ip.xml.in
+++ b/op-mode-definitions/show-ip.xml.in
@@ -11,7 +11,7 @@
             <properties>
               <help>Show IPv4 neighbor (ARP) table</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_neigh.py --family inet</command>
+            <command>${vyos_op_scripts_dir}/neighbor.py --family inet</command>
             <children>
               <tagNode name="interface">
                 <properties>
@@ -20,7 +20,7 @@
                     <script>${vyos_completion_dir}/list_interfaces.py -b</script>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_neigh.py --family inet --interface "$5"</command>
+                <command>${vyos_op_scripts_dir}/neighbor.py --family inet --interface "$5"</command>
               </tagNode>
               <tagNode name="state">
                 <properties>
@@ -29,7 +29,7 @@
                     <list>reachable stale failed permanent</list>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_neigh.py --family inet --state "$5"</command>
+                <command>${vyos_op_scripts_dir}/neighbor.py --family inet --state "$5"</command>
               </tagNode>
             </children>
           </node>
-- 
cgit v1.2.3