Merge pull request #1351 from dmbaturin/genop

T2719: prototype of an op mode command runner based on type hints and introspection

7 files changed, 24 insertions, 18 deletions

diff --git a/op-mode-definitions/ipv4-route.xml.in b/op-mode-definitions/ipv4-route.xml.in
index 8f001d5bb..660b34496 100644
--- a/op-mode-definitions/ipv4-route.xml.in
+++ b/op-mode-definitions/ipv4-route.xml.in
@@ -39,7 +39,7 @@
                     <list>&lt;x.x.x.x&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>sudo ip neigh flush to "$5"</command>
+                <command>sudo ${vyos_op_scripts_dir}/neighbor.py reset --family inet --address "$5"</command>
               </tagNode>
               <tagNode name="interface">
                 <properties>
@@ -48,8 +48,14 @@
                     <script>${vyos_completion_dir}/list_interfaces.py</script>
                   </completionHelp>
                 </properties>
-                <command>sudo ip neigh flush dev "$5"</command>
+                <command>sudo ${vyos_op_scripts_dir}/neighbor.py reset --family inet --interface "$5"</command>
               </tagNode>
+              <node name="table">
+                <properties>
+                  <help>Flush the ARP cache completely</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/neighbor.py reset --family inet</command>
+              </node>
             </children>
           </node>
           <node name="route">
diff --git a/op-mode-definitions/ipv6-route.xml.in b/op-mode-definitions/ipv6-route.xml.in
index 4f8792f9f..d75caf308 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 show --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 show --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 show --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..8662549fc 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 show --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 show --family inet --interface "$4"</command>
           </tagNode>
         </children>
       </node>
diff --git a/op-mode-definitions/show-hardware.xml.in b/op-mode-definitions/show-hardware.xml.in
index 20fdd753d..ebd806ba5 100644
--- a/op-mode-definitions/show-hardware.xml.in
+++ b/op-mode-definitions/show-hardware.xml.in
@@ -9,21 +9,21 @@
         <children>
           <node name="cpu">
             <properties>
-              <help>Show CPU info</help>
+              <help>Show CPU informaion</help>
             </properties>
-            <command>lscpu</command>
+            <command>${vyos_op_scripts_dir}/cpu.py show</command>
             <children>
               <node name="detail">
                 <properties>
-                  <help> Show system CPU details</help>
+                  <help>Show system CPU details</help>
                 </properties>
                 <command>cat /proc/cpuinfo</command>
               </node>
               <node name="summary">
                 <properties>
-                  <help>Show system CPUs</help>
+                  <help>Show system CPUs summary</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/cpu_summary.py</command>
+                <command>${vyos_op_scripts_dir}/cpu.py show_summary</command>
               </node>
             </children>
           </node>
diff --git a/op-mode-definitions/show-ip.xml.in b/op-mode-definitions/show-ip.xml.in
index d342ac192..0751c50cb 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 show --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 show --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 show --family inet --state "$5"</command>
               </tagNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-system.xml.in b/op-mode-definitions/show-system.xml.in
index 68b473bc1..6f05d0c12 100644
--- a/op-mode-definitions/show-system.xml.in
+++ b/op-mode-definitions/show-system.xml.in
@@ -104,7 +104,7 @@
             <properties>
               <help>Show system memory usage</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_ram.py</command>
+            <command>${vyos_op_scripts_dir}/memory.py show</command>
             <children>
               <leafNode name="cache">
                 <properties>
diff --git a/op-mode-definitions/show-version.xml.in b/op-mode-definitions/show-version.xml.in
index 8b7cc7e58..d9c4738af 100644
--- a/op-mode-definitions/show-version.xml.in
+++ b/op-mode-definitions/show-version.xml.in
@@ -6,13 +6,13 @@
         <properties>
           <help>Show system version information</help>
         </properties>
-        <command>sudo ${vyos_op_scripts_dir}/show_version.py</command>
+        <command>sudo ${vyos_op_scripts_dir}/version.py show</command>
         <children>
           <leafNode name="funny">
             <properties>
               <help>Show system version and some fun stuff</help>
             </properties>
-            <command>sudo ${vyos_op_scripts_dir}/show_version.py --funny</command>
+            <command>sudo ${vyos_op_scripts_dir}/version.py show --funny</command>
           </leafNode>
           <leafNode name="all">
              <properties>