From 46b619469d5858c723d13ae8c6661eb38d8812d1 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Mon, 19 Dec 2022 12:25:40 -0600
Subject: interfaces: T4866: call interfaces.py in op-mode-definitions

---
 op-mode-definitions/openvpn.xml.in                          |  7 ++++---
 op-mode-definitions/show-interfaces-bonding.xml.in          | 12 ++++++------
 op-mode-definitions/show-interfaces-bridge.xml.in           |  8 ++++----
 op-mode-definitions/show-interfaces-dummy.xml.in            |  8 ++++----
 op-mode-definitions/show-interfaces-ethernet.xml.in         | 12 ++++++------
 op-mode-definitions/show-interfaces-geneve.xml.in           |  8 ++++----
 op-mode-definitions/show-interfaces-input.xml.in            |  8 ++++----
 op-mode-definitions/show-interfaces-l2tpv3.xml.in           |  8 ++++----
 op-mode-definitions/show-interfaces-loopback.xml.in         | 12 ++++++------
 op-mode-definitions/show-interfaces-pppoe.xml.in            |  6 +++---
 op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in  |  8 ++++----
 op-mode-definitions/show-interfaces-sstpc.xml.in            |  6 +++---
 op-mode-definitions/show-interfaces-tunnel.xml.in           |  8 ++++----
 op-mode-definitions/show-interfaces-virtual-ethernet.xml.in |  8 ++++----
 op-mode-definitions/show-interfaces-vti.xml.in              |  8 ++++----
 op-mode-definitions/show-interfaces-vxlan.xml.in            |  8 ++++----
 op-mode-definitions/show-interfaces-wireguard.xml.in        |  6 +++---
 op-mode-definitions/show-interfaces-wireless.xml.in         | 12 ++++++------
 op-mode-definitions/show-interfaces-wwan.xml.in             |  6 +++---
 op-mode-definitions/show-interfaces.xml.in                  |  6 +++---
 20 files changed, 83 insertions(+), 82 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/openvpn.xml.in b/op-mode-definitions/openvpn.xml.in
index aec09fa48..b2763da81 100644
--- a/op-mode-definitions/openvpn.xml.in
+++ b/op-mode-definitions/openvpn.xml.in
@@ -37,12 +37,13 @@
             <properties>
               <help>Show OpenVPN interface information</help>
             </properties>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=openvpn</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed OpenVPN interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=openvpn --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=openvpn</command>
               </leafNode>
             </children>
           </node>
@@ -53,7 +54,7 @@
                 <script>sudo ${vyos_completion_dir}/list_interfaces.py --type openvpn</script>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf=$4</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name=$4</command>
             <children>
               <tagNode name="user">
                 <properties>
@@ -94,7 +95,7 @@
                 <properties>
                   <help>Show summary of specified OpenVPN interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
diff --git a/op-mode-definitions/show-interfaces-bonding.xml.in b/op-mode-definitions/show-interfaces-bonding.xml.in
index c5f82b70e..6908153dd 100644
--- a/op-mode-definitions/show-interfaces-bonding.xml.in
+++ b/op-mode-definitions/show-interfaces-bonding.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces bonding</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified bonding interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
               <leafNode name="detail">
                 <properties>
@@ -38,13 +38,13 @@
                     <path>interfaces bonding ${COMP_WORDS[3]} vif</path>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4.$6"</command>
                 <children>
                   <leafNode name="brief">
                     <properties>
                       <help>Show summary of specified virtual network interface (vif) information</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6" --action=show-brief</command>
+                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4.$6"</command>
                   </leafNode>
                 </children>
               </tagNode>
@@ -60,13 +60,13 @@
             <properties>
               <help>Show Bonding interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=bonding --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=bonding</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed bonding interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=bonding --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=bonding</command>
               </leafNode>
               <leafNode name="slaves">
                 <properties>
diff --git a/op-mode-definitions/show-interfaces-bridge.xml.in b/op-mode-definitions/show-interfaces-bridge.xml.in
index e1444bd84..b950c3a17 100644
--- a/op-mode-definitions/show-interfaces-bridge.xml.in
+++ b/op-mode-definitions/show-interfaces-bridge.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces bridge</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified bridge interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show Bridge interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=bridge --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=bridge</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed bridge interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=bridge --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=bridge</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-dummy.xml.in b/op-mode-definitions/show-interfaces-dummy.xml.in
index 52d2cc7ee..398e00636 100644
--- a/op-mode-definitions/show-interfaces-dummy.xml.in
+++ b/op-mode-definitions/show-interfaces-dummy.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces dummy</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified dummy interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show Dummy interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=dummy --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=dummy</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed dummy interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=dummy --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=dummy</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-ethernet.xml.in b/op-mode-definitions/show-interfaces-ethernet.xml.in
index f8d1c9395..40d4adbb2 100644
--- a/op-mode-definitions/show-interfaces-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-ethernet.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces ethernet</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified ethernet interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
               <leafNode name="identify">
                 <properties>
@@ -58,13 +58,13 @@
                     <path>interfaces ethernet ${COMP_WORDS[3]} vif</path>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4.$6"</command>
                 <children>
                   <leafNode name="brief">
                     <properties>
                       <help>Show summary of specified virtual network interface (vif) information</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6" --action=show-brief</command>
+                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4.$6"</command>
                   </leafNode>
                 </children>
               </tagNode>
@@ -80,13 +80,13 @@
             <properties>
               <help>Show Ethernet interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=ethernet --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=ethernet</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed ethernet interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=ethernet --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=ethernet</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-geneve.xml.in b/op-mode-definitions/show-interfaces-geneve.xml.in
index a47933315..be3084af3 100644
--- a/op-mode-definitions/show-interfaces-geneve.xml.in
+++ b/op-mode-definitions/show-interfaces-geneve.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces geneve</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified GENEVE interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show GENEVE interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=geneve --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=geneve</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed GENEVE interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=geneve --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=geneve</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-input.xml.in b/op-mode-definitions/show-interfaces-input.xml.in
index 9ae3828c8..1f8505160 100644
--- a/op-mode-definitions/show-interfaces-input.xml.in
+++ b/op-mode-definitions/show-interfaces-input.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces input</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified input interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show Input (ifb) interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=input --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=input</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed input interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=input --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=input</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-l2tpv3.xml.in b/op-mode-definitions/show-interfaces-l2tpv3.xml.in
index 2a1d6a1c6..ff08b8266 100644
--- a/op-mode-definitions/show-interfaces-l2tpv3.xml.in
+++ b/op-mode-definitions/show-interfaces-l2tpv3.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces l2tpv3</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified L2TPv3 interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show L2TPv3 interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=l2tpv3 --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=l2tpv3</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed L2TPv3 interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=l2tpv3 --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=l2tpv3</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-loopback.xml.in b/op-mode-definitions/show-interfaces-loopback.xml.in
index 25a75ffff..9919bf32b 100644
--- a/op-mode-definitions/show-interfaces-loopback.xml.in
+++ b/op-mode-definitions/show-interfaces-loopback.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces loopback</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
-                  <help>Show summary of the specified dummy interface information</help>
+                  <help>Show summary of the specified Loopback interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show Loopback interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=loopback --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=loopback</command>
             <children>
               <leafNode name="detail">
                 <properties>
-                  <help>Show detailed dummy interface information</help>
+                  <help>Show detailed Loopback interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=dummy --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=loopback</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-pppoe.xml.in b/op-mode-definitions/show-interfaces-pppoe.xml.in
index 09608bc04..80bfd00ff 100644
--- a/op-mode-definitions/show-interfaces-pppoe.xml.in
+++ b/op-mode-definitions/show-interfaces-pppoe.xml.in
@@ -11,7 +11,7 @@
                 <path>interfaces pppoe</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="log">
                 <properties>
@@ -34,13 +34,13 @@
             <properties>
               <help>Show PPPoE interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=pppoe --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=pppoe</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed PPPoE interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=pppoe --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=pppoe</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in
index 2ae4b5a9e..0c00dbdd0 100644
--- a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces pseudo-ethernet</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified pseudo-ethernet/MACvlan interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show Pseudo-Ethernet/MACvlan interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=pseudo-ethernet --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=pseudo-ethernet</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed pseudo-ethernet/MACvlan interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=pseudo-ethernet --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=pseudo-ethernet</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-sstpc.xml.in b/op-mode-definitions/show-interfaces-sstpc.xml.in
index e66d3a0ac..c473f9822 100644
--- a/op-mode-definitions/show-interfaces-sstpc.xml.in
+++ b/op-mode-definitions/show-interfaces-sstpc.xml.in
@@ -11,7 +11,7 @@
                 <path>interfaces sstpc</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="log">
                 <properties>
@@ -34,13 +34,13 @@
             <properties>
               <help>Show SSTP client interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=sstpc --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=sstpc</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed SSTP client interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=sstpc --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=sstpc</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-tunnel.xml.in b/op-mode-definitions/show-interfaces-tunnel.xml.in
index 51b25efd9..4af90b813 100644
--- a/op-mode-definitions/show-interfaces-tunnel.xml.in
+++ b/op-mode-definitions/show-interfaces-tunnel.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces tunnel</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified tunnel interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show Tunnel interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=tunnel --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=tunnel</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed tunnel interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=tunnel --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=tunnel</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in b/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in
index c70f1e3d1..2aa71c687 100644
--- a/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-virtual-ethernet.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces virtual-ethernet</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified virtual-ethernet interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show virtual-ethernet interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=virtual-ethernet --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=virtual-ethernet</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed virtual-ethernet interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=virtual-ethernet --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=virtual-ethernet</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-vti.xml.in b/op-mode-definitions/show-interfaces-vti.xml.in
index b436b8414..195e1d5da 100644
--- a/op-mode-definitions/show-interfaces-vti.xml.in
+++ b/op-mode-definitions/show-interfaces-vti.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces vti</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified vti interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show VTI interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=vti --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=vti</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed vti interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=vti --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=vti</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-vxlan.xml.in b/op-mode-definitions/show-interfaces-vxlan.xml.in
index 1befd428c..a1d01a6af 100644
--- a/op-mode-definitions/show-interfaces-vxlan.xml.in
+++ b/op-mode-definitions/show-interfaces-vxlan.xml.in
@@ -11,13 +11,13 @@
                 <path>interfaces vxlan</path>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified VXLAN interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -25,13 +25,13 @@
             <properties>
               <help>Show VXLAN interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=vxlan --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=vxlan</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed VXLAN interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=vxlan --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=vxlan</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-wireguard.xml.in b/op-mode-definitions/show-interfaces-wireguard.xml.in
index c9b754dcd..55879cfff 100644
--- a/op-mode-definitions/show-interfaces-wireguard.xml.in
+++ b/op-mode-definitions/show-interfaces-wireguard.xml.in
@@ -11,7 +11,7 @@
                 <script>${vyos_completion_dir}/list_interfaces.py --type wireguard</script>
               </completionHelp>
             </properties>
-	        <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+	        <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="allowed-ips">
                 <properties>
@@ -49,13 +49,13 @@
             <properties>
               <help>Show WireGuard interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=wireguard</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed Wireguard interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=wireguard</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces-wireless.xml.in b/op-mode-definitions/show-interfaces-wireless.xml.in
index 4a37417aa..7ae2c8ce4 100644
--- a/op-mode-definitions/show-interfaces-wireless.xml.in
+++ b/op-mode-definitions/show-interfaces-wireless.xml.in
@@ -8,13 +8,13 @@
             <properties>
               <help>Show Wireless (WLAN) interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireless --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=wireless</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed wireless interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireless --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=wireless</command>
               </leafNode>
               <leafNode name="info">
                 <properties>
@@ -31,13 +31,13 @@
                 <script>${vyos_completion_dir}/list_interfaces.py --type wireless</script>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified wireless interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4"</command>
               </leafNode>
               <node name="scan">
                 <properties>
@@ -63,13 +63,13 @@
                 <properties>
                   <help>Show specified virtual network interface (vif) information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6"</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4.$6"</command>
                 <children>
                   <leafNode name="brief">
                     <properties>
                       <help>Show summary of specified virtual network interface (vif) information</help>
                     </properties>
-                    <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6" --action=show-brief</command>
+                    <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_name="$4.$6"</command>
                   </leafNode>
                 </children>
               </tagNode>
diff --git a/op-mode-definitions/show-interfaces-wwan.xml.in b/op-mode-definitions/show-interfaces-wwan.xml.in
index 3cd29b38a..8ac5933a2 100644
--- a/op-mode-definitions/show-interfaces-wwan.xml.in
+++ b/op-mode-definitions/show-interfaces-wwan.xml.in
@@ -12,7 +12,7 @@
                 <script>cd /sys/class/net; ls -d wwan*</script>
               </completionHelp>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show --intf_name="$4"</command>
             <children>
               <leafNode name="capabilities">
                 <properties>
@@ -86,13 +86,13 @@
             <properties>
               <help>Show Wireless Modem (WWAN) interface information</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wirelessmodem --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_summary --intf_type=wirelessmodem</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed Wireless Modem (WWAN( interface information</help>
                 </properties>
-                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wirelessmodem --action=show</command>
+                <command>${vyos_op_scripts_dir}/interfaces.py show --intf_type=wirelessmodem</command>
               </leafNode>
             </children>
           </node>
diff --git a/op-mode-definitions/show-interfaces.xml.in b/op-mode-definitions/show-interfaces.xml.in
index 39b0f0a2c..dc61a6f5c 100644
--- a/op-mode-definitions/show-interfaces.xml.in
+++ b/op-mode-definitions/show-interfaces.xml.in
@@ -6,19 +6,19 @@
         <properties>
           <help>Show network interface information</help>
         </properties>
-        <command>${vyos_op_scripts_dir}/show_interfaces.py --action=show-brief</command>
+        <command>${vyos_op_scripts_dir}/interfaces.py show_summary</command>
         <children>
           <leafNode name="counters">
             <properties>
               <help>Show network interface counters</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --action=show-count</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show_counters</command>
           </leafNode>
           <leafNode name="detail">
             <properties>
               <help>Show detailed information of all interfaces</help>
             </properties>
-            <command>${vyos_op_scripts_dir}/show_interfaces.py --action=show</command>
+            <command>${vyos_op_scripts_dir}/interfaces.py show</command>
           </leafNode>
         </children>
       </node>
-- 
cgit v1.2.3