Merge pull request #341 from thomas-mangin/T2223

op_mode: T2223: convert vyatta-show-interfaces.pl to show_interfaces.py

4 files changed, 13 insertions, 13 deletions

diff --git a/op-mode-definitions/openvpn.xml b/op-mode-definitions/openvpn.xml
index d7c4fc101..53c0157c6 100644
--- a/op-mode-definitions/openvpn.xml
+++ b/op-mode-definitions/openvpn.xml
@@ -87,7 +87,7 @@
                 <properties>
                   <help>Show detailed OpenVPN interface information</help>
                 </properties>
-                <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=openvpn --action=show</command>
+                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=openvpn --action=show</command>
               </leafNode>
             </children>
           </node>
@@ -98,13 +98,13 @@
                 <script>sudo ${vyos_completion_dir}/list_interfaces.py --type openvpn</script>
               </completionHelp>
             </properties>
-            <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4</command>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf=$4</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of specified OpenVPN interface information</help>
                 </properties>
-                <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
               </leafNode>
             </children>
           </tagNode>
diff --git a/op-mode-definitions/show-interfaces-pppoe.xml b/op-mode-definitions/show-interfaces-pppoe.xml
index 591ec8f5b..e68d05da9 100644
--- a/op-mode-definitions/show-interfaces-pppoe.xml
+++ b/op-mode-definitions/show-interfaces-pppoe.xml
@@ -11,7 +11,7 @@
                 <script>${vyos_completion_dir}/list_pppoe_peers.sh</script>
               </completionHelp>
             </properties>
-            <command>${vyatta_bindir}/vyatta-show-interfaces.pl pppoe --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py pppoe --intf="$4"</command>
             <children>
               <node name="log">
                 <properties>
diff --git a/op-mode-definitions/show-interfaces-wirelessmodem.xml b/op-mode-definitions/show-interfaces-wirelessmodem.xml
index 681f54f3d..c17efbc4e 100644
--- a/op-mode-definitions/show-interfaces-wirelessmodem.xml
+++ b/op-mode-definitions/show-interfaces-wirelessmodem.xml
@@ -11,7 +11,7 @@
                 <script>${vyos_completion_dir}/list_wlm_peers.sh</script>
               </completionHelp>
             </properties>
-            <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
             <children>
               <node name="log">
                 <properties>
diff --git a/op-mode-definitions/wireless.xml b/op-mode-definitions/wireless.xml
index c3c6dee59..a3a9d1f55 100644
--- a/op-mode-definitions/wireless.xml
+++ b/op-mode-definitions/wireless.xml
@@ -13,7 +13,7 @@
                 <properties>
                   <help>Clear all wireless interface counters</help>
                 </properties>
-                <command>sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf-type="$3"</command>
+                <command>sudo ${vyos_op_scripts_dir}/show_interfaces.py --action=clear --intf-type="$3"</command>
               </leafNode>
             </children>
           </node>
@@ -29,7 +29,7 @@
                 <properties>
                   <help>Clear all wireless interface counters</help>
                 </properties>
-                <command>sudo ${vyatta_bindir}/sudo-users/vyatta-show-interfaces.pl --action=clear --intf="$4"</command>
+                <command>sudo ${vyos_op_scripts_dir}/show_interfaces.py --action=clear --intf="$4"</command>
               </leafNode>
             </children>
           </tagNode>
@@ -45,13 +45,13 @@
             <properties>
               <help>Show wireless interface information</help>
             </properties>
-            <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=wireless --action=show-brief</command>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireless --action=show-brief</command>
             <children>
               <leafNode name="detail">
                 <properties>
                   <help>Show detailed wireless interface information</help>
                 </properties>
-                <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf-type=wireless --action=show</command>
+                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireless --action=show</command>
               </leafNode>
               <leafNode name="info">
                 <properties>
@@ -68,13 +68,13 @@
                 <script>${vyos_completion_dir}/list_interfaces.py --type wireless</script>
               </completionHelp>
             </properties>
-            <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4"</command>
+            <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4"</command>
             <children>
               <leafNode name="brief">
                 <properties>
                   <help>Show summary of the specified wireless interface information</help>
                 </properties>
-                <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief</command>
+                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
               </leafNode>
               <node name="scan">
                 <properties>
@@ -100,13 +100,13 @@
                 <properties>
                   <help>Show specified virtual network interface (vif) information</help>
                 </properties>
-                <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4.$6"</command>
+                <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6"</command>
                 <children>
                   <leafNode name="brief">
                     <properties>
                       <help>Show summary of specified virtual network interface (vif) information</help>
                     </properties>
-                    <command>${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4.$6" --action=show-brief</command>
+                    <command>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6" --action=show-brief</command>
                   </leafNode>
                 </children>
               </tagNode>