From a086dc2c429aea9614ac7a9c735c6475c2d6da59 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 31 Aug 2021 12:22:36 +0200
Subject: vyos.ethtool: T3163: use long option names when calling the ethtool
 binray

This makes understanding the code easier what is "really" called without
opening the man page.
---
 op-mode-definitions/show-interfaces-ethernet.xml.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'op-mode-definitions/show-interfaces-ethernet.xml.in')

diff --git a/op-mode-definitions/show-interfaces-ethernet.xml.in b/op-mode-definitions/show-interfaces-ethernet.xml.in
index fc79f44bf..6d50d6e90 100644
--- a/op-mode-definitions/show-interfaces-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-ethernet.xml.in
@@ -23,19 +23,19 @@
                 <properties>
                   <help>Visually identify specified ethernet interface</help>
                 </properties>
-                <command>echo "Blinking interface $4 for 30 seconds."; /sbin/ethtool --identify "$4" 30</command>
+                <command>echo "Blinking interface $4 for 30 seconds."; ethtool --identify "$4" 30</command>
               </leafNode>
               <node name="physical">
                 <properties>
                   <help>Show physical device information for specified ethernet interface</help>
                 </properties>
-                <command>/sbin/ethtool "$4"; /sbin/ethtool -i "$4"</command>
+                <command>ethtool "$4"; ethtool --driver "$4"</command>
                 <children>
                   <leafNode name="offload">
                     <properties>
                       <help>Show physical device offloading capabilities</help>
                     </properties>
-                    <command>/sbin/ethtool -k "$4" | sed -e 1d -e '/fixed/d' -e 's/^\t*//g' -e 's/://' | column -t -s' '</command>
+                    <command>ethtool --show-features "$4" | sed -e 1d -e '/fixed/d' -e 's/^\t*//g' -e 's/://' | column -t -s' '</command>
                   </leafNode>
                 </children>
               </node>
@@ -43,13 +43,13 @@
                 <properties>
                   <help>Show physical device statistics for specified ethernet interface</help>
                 </properties>
-                <command>/sbin/ethtool -S "$4"</command>
+                <command>ethtool --statistics "$4"</command>
               </leafNode>
               <leafNode name="transceiver">
                 <properties>
                   <help>Show transceiver information from modules (e.g SFP+, QSFP)</help>
                 </properties>
-                <command>/sbin/ethtool -m "$4"</command>
+                <command>ethtool --module-info "$4"</command>
               </leafNode>
               <tagNode name="vif">
                 <properties>
-- 
cgit v1.2.3


From 8834c22dc3f5758c1d2364579acc428cfc0fe650 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 31 Aug 2021 22:00:27 +0200
Subject: op-mode: "show interfaces ethernet eth0 physical" should display
 ring-buffers

---
 op-mode-definitions/show-interfaces-ethernet.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'op-mode-definitions/show-interfaces-ethernet.xml.in')

diff --git a/op-mode-definitions/show-interfaces-ethernet.xml.in b/op-mode-definitions/show-interfaces-ethernet.xml.in
index 6d50d6e90..c42efd21f 100644
--- a/op-mode-definitions/show-interfaces-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-ethernet.xml.in
@@ -29,7 +29,7 @@
                 <properties>
                   <help>Show physical device information for specified ethernet interface</help>
                 </properties>
-                <command>ethtool "$4"; ethtool --driver "$4"</command>
+                <command>ethtool "$4"; ethtool --show-ring "$4"; ethtool --driver "$4"</command>
                 <children>
                   <leafNode name="offload">
                     <properties>
-- 
cgit v1.2.3


From bd2c79ebb8abbd844f4b0568110c7bcea0d8f4f1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 7 Sep 2021 11:26:42 +0200
Subject: op-mode: xml: improve "show interfaces <type>" help text

---
 op-mode-definitions/show-interfaces-bonding.xml.in |  4 +-
 op-mode-definitions/show-interfaces-bridge.xml.in  |  4 +-
 op-mode-definitions/show-interfaces-dummy.xml.in   |  4 +-
 .../show-interfaces-ethernet.xml.in                |  4 +-
 op-mode-definitions/show-interfaces-input.xml.in   |  4 +-
 op-mode-definitions/show-interfaces-l2tpv3.xml.in  |  2 +-
 .../show-interfaces-loopback.xml.in                |  4 +-
 op-mode-definitions/show-interfaces-pppoe.xml.in   |  2 +-
 .../show-interfaces-pseudo-ethernet.xml.in         |  4 +-
 op-mode-definitions/show-interfaces-tunnel.xml.in  |  4 +-
 op-mode-definitions/show-interfaces-vti.xml.in     |  4 +-
 op-mode-definitions/show-interfaces-vxlan.xml.in   |  2 +-
 .../show-interfaces-wireguard.xml.in               |  4 +-
 .../show-interfaces-wireless.xml.in                | 82 ++++++++++++++++++++++
 op-mode-definitions/show-interfaces-wwan.xml.in    |  2 +-
 op-mode-definitions/wireless.xml.in                | 79 ---------------------
 16 files changed, 106 insertions(+), 103 deletions(-)
 create mode 100644 op-mode-definitions/show-interfaces-wireless.xml.in

(limited to 'op-mode-definitions/show-interfaces-ethernet.xml.in')

diff --git a/op-mode-definitions/show-interfaces-bonding.xml.in b/op-mode-definitions/show-interfaces-bonding.xml.in
index 08ce78296..c5f82b70e 100644
--- a/op-mode-definitions/show-interfaces-bonding.xml.in
+++ b/op-mode-definitions/show-interfaces-bonding.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="bonding">
             <properties>
-              <help>Show bonding interface information</help>
+              <help>Show specified Bonding interface information</help>
               <completionHelp>
                 <path>interfaces bonding</path>
               </completionHelp>
@@ -58,7 +58,7 @@
           </tagNode>
           <node name="bonding">
             <properties>
-              <help>Show bonding interface information</help>
+              <help>Show Bonding interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=bonding --action=show-brief</command>
             <children>
diff --git a/op-mode-definitions/show-interfaces-bridge.xml.in b/op-mode-definitions/show-interfaces-bridge.xml.in
index 85fde95b5..e1444bd84 100644
--- a/op-mode-definitions/show-interfaces-bridge.xml.in
+++ b/op-mode-definitions/show-interfaces-bridge.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="bridge">
             <properties>
-              <help>Show bridge interface information</help>
+              <help>Show specified Bridge interface information</help>
               <completionHelp>
                 <path>interfaces bridge</path>
               </completionHelp>
@@ -23,7 +23,7 @@
           </tagNode>
           <node name="bridge">
             <properties>
-              <help>Show bridge interface information</help>
+              <help>Show Bridge interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=bridge --action=show-brief</command>
             <children>
diff --git a/op-mode-definitions/show-interfaces-dummy.xml.in b/op-mode-definitions/show-interfaces-dummy.xml.in
index 7c24c6921..52d2cc7ee 100644
--- a/op-mode-definitions/show-interfaces-dummy.xml.in
+++ b/op-mode-definitions/show-interfaces-dummy.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="dummy">
             <properties>
-              <help>Show dummy interface information</help>
+              <help>Show specified Dummy interface information</help>
               <completionHelp>
                 <path>interfaces dummy</path>
               </completionHelp>
@@ -23,7 +23,7 @@
           </tagNode>
           <node name="dummy">
             <properties>
-              <help>Show dummy interface information</help>
+              <help>Show Dummy interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=dummy --action=show-brief</command>
             <children>
diff --git a/op-mode-definitions/show-interfaces-ethernet.xml.in b/op-mode-definitions/show-interfaces-ethernet.xml.in
index c42efd21f..f8d1c9395 100644
--- a/op-mode-definitions/show-interfaces-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-ethernet.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="ethernet">
             <properties>
-              <help>Show ethernet interface information</help>
+              <help>Show specified Ethernet interface information</help>
               <completionHelp>
                 <path>interfaces ethernet</path>
               </completionHelp>
@@ -78,7 +78,7 @@
           </tagNode>
           <node name="ethernet">
             <properties>
-              <help>Show ethernet interface information</help>
+              <help>Show Ethernet interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=ethernet --action=show-brief</command>
             <children>
diff --git a/op-mode-definitions/show-interfaces-input.xml.in b/op-mode-definitions/show-interfaces-input.xml.in
index 15e8203e5..9ae3828c8 100644
--- a/op-mode-definitions/show-interfaces-input.xml.in
+++ b/op-mode-definitions/show-interfaces-input.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="input">
             <properties>
-              <help>Show input interface information</help>
+              <help>Show specified Input interface information</help>
               <completionHelp>
                 <path>interfaces input</path>
               </completionHelp>
@@ -23,7 +23,7 @@
           </tagNode>
           <node name="input">
             <properties>
-              <help>Show input interface information</help>
+              <help>Show Input (ifb) interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=input --action=show-brief</command>
             <children>
diff --git a/op-mode-definitions/show-interfaces-l2tpv3.xml.in b/op-mode-definitions/show-interfaces-l2tpv3.xml.in
index 60fee34a1..2a1d6a1c6 100644
--- a/op-mode-definitions/show-interfaces-l2tpv3.xml.in
+++ b/op-mode-definitions/show-interfaces-l2tpv3.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="l2tpv3">
             <properties>
-              <help>Show L2TPv3 interface information</help>
+              <help>Show specified L2TPv3 interface information</help>
               <completionHelp>
                 <path>interfaces l2tpv3</path>
               </completionHelp>
diff --git a/op-mode-definitions/show-interfaces-loopback.xml.in b/op-mode-definitions/show-interfaces-loopback.xml.in
index b30b57909..25a75ffff 100644
--- a/op-mode-definitions/show-interfaces-loopback.xml.in
+++ b/op-mode-definitions/show-interfaces-loopback.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="loopback">
             <properties>
-              <help>Show loopback interface information</help>
+              <help>Show specified Loopback interface information</help>
               <completionHelp>
                 <path>interfaces loopback</path>
               </completionHelp>
@@ -23,7 +23,7 @@
           </tagNode>
           <node name="loopback">
             <properties>
-              <help>Show loopback interface information</help>
+              <help>Show Loopback interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=loopback --action=show-brief</command>
             <children>
diff --git a/op-mode-definitions/show-interfaces-pppoe.xml.in b/op-mode-definitions/show-interfaces-pppoe.xml.in
index 18697a275..767836abf 100644
--- a/op-mode-definitions/show-interfaces-pppoe.xml.in
+++ b/op-mode-definitions/show-interfaces-pppoe.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="pppoe">
             <properties>
-              <help>Show PPPoE interface information</help>
+              <help>Show specified PPPoE interface information</help>
               <completionHelp>
                 <path>interfaces pppoe</path>
               </completionHelp>
diff --git a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in
index 195944745..2ae4b5a9e 100644
--- a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in
+++ b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="pseudo-ethernet">
             <properties>
-              <help>Show pseudo-ethernet/MACvlan interface information</help>
+              <help>Show specified Pseudo-Ethernet/MACvlan interface information</help>
               <completionHelp>
                 <path>interfaces pseudo-ethernet</path>
               </completionHelp>
@@ -23,7 +23,7 @@
           </tagNode>
           <node name="pseudo-ethernet">
             <properties>
-              <help>Show pseudo-ethernet/MACvlan interface information</help>
+              <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>
             <children>
diff --git a/op-mode-definitions/show-interfaces-tunnel.xml.in b/op-mode-definitions/show-interfaces-tunnel.xml.in
index 416de0299..51b25efd9 100644
--- a/op-mode-definitions/show-interfaces-tunnel.xml.in
+++ b/op-mode-definitions/show-interfaces-tunnel.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="tunnel">
             <properties>
-              <help>Show tunnel interface information</help>
+              <help>Show specified Tunnel interface information</help>
               <completionHelp>
                 <path>interfaces tunnel</path>
               </completionHelp>
@@ -23,7 +23,7 @@
           </tagNode>
           <node name="tunnel">
             <properties>
-              <help>Show tunnel interface information</help>
+              <help>Show Tunnel interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=tunnel --action=show-brief</command>
             <children>
diff --git a/op-mode-definitions/show-interfaces-vti.xml.in b/op-mode-definitions/show-interfaces-vti.xml.in
index f51be2d19..b436b8414 100644
--- a/op-mode-definitions/show-interfaces-vti.xml.in
+++ b/op-mode-definitions/show-interfaces-vti.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="vti">
             <properties>
-              <help>Show vti interface information</help>
+              <help>Show specified VTI interface information</help>
               <completionHelp>
                 <path>interfaces vti</path>
               </completionHelp>
@@ -23,7 +23,7 @@
           </tagNode>
           <node name="vti">
             <properties>
-              <help>Show vti interface information</help>
+              <help>Show VTI interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=vti --action=show-brief</command>
             <children>
diff --git a/op-mode-definitions/show-interfaces-vxlan.xml.in b/op-mode-definitions/show-interfaces-vxlan.xml.in
index 4e3cb93cd..1befd428c 100644
--- a/op-mode-definitions/show-interfaces-vxlan.xml.in
+++ b/op-mode-definitions/show-interfaces-vxlan.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="vxlan">
             <properties>
-              <help>Show VXLAN interface information</help>
+              <help>Show specified VXLAN interface information</help>
               <completionHelp>
                 <path>interfaces vxlan</path>
               </completionHelp>
diff --git a/op-mode-definitions/show-interfaces-wireguard.xml.in b/op-mode-definitions/show-interfaces-wireguard.xml.in
index 863357ef7..c9b754dcd 100644
--- a/op-mode-definitions/show-interfaces-wireguard.xml.in
+++ b/op-mode-definitions/show-interfaces-wireguard.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="wireguard">
             <properties>
-              <help>Show Wireguard interface information</help>
+              <help>Show specified WireGuard interface information</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py --type wireguard</script>
               </completionHelp>
@@ -47,7 +47,7 @@
           </tagNode>
           <node name="wireguard">
             <properties>
-              <help>Show Wireguard interface information</help>
+              <help>Show WireGuard interface information</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireguard --action=show-brief</command>
             <children>
diff --git a/op-mode-definitions/show-interfaces-wireless.xml.in b/op-mode-definitions/show-interfaces-wireless.xml.in
new file mode 100644
index 000000000..4a37417aa
--- /dev/null
+++ b/op-mode-definitions/show-interfaces-wireless.xml.in
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="show">
+    <children>
+      <node name="interfaces">
+        <children>
+          <node name="wireless">
+            <properties>
+              <help>Show Wireless (WLAN) interface information</help>
+            </properties>
+            <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>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireless --action=show</command>
+              </leafNode>
+              <leafNode name="info">
+                <properties>
+                  <help>Show wireless interface configuration</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_wireless.py --brief</command>
+              </leafNode>
+            </children>
+          </node>
+          <tagNode name="wireless">
+            <properties>
+              <help>Show specified wireless interface information</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py --type wireless</script>
+              </completionHelp>
+            </properties>
+            <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>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
+              </leafNode>
+              <node name="scan">
+                <properties>
+                  <help>Show summary of the specified wireless interface information</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/show_wireless.py --scan "$4"</command>
+                <children>
+                  <leafNode name="detail">
+                    <properties>
+                      <help>Show detailed scan results</help>
+                    </properties>
+                    <command>sudo /sbin/iw dev "$4" scan ap-force</command>
+                  </leafNode>
+                </children>
+              </node>
+              <leafNode name="stations">
+                <properties>
+                  <help>Show specified Wireless interface information</help>
+                </properties>
+                <command>${vyos_op_scripts_dir}/show_wireless.py --stations "$4"</command>
+              </leafNode>
+              <tagNode name="vif">
+                <properties>
+                  <help>Show specified virtual network interface (vif) information</help>
+                </properties>
+                <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>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6" --action=show-brief</command>
+                  </leafNode>
+                </children>
+              </tagNode>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/show-interfaces-wwan.xml.in b/op-mode-definitions/show-interfaces-wwan.xml.in
index 7e5f49ba6..3cd29b38a 100644
--- a/op-mode-definitions/show-interfaces-wwan.xml.in
+++ b/op-mode-definitions/show-interfaces-wwan.xml.in
@@ -6,7 +6,7 @@
         <children>
           <tagNode name="wwan">
             <properties>
-              <help>Show Wireless Wire Area Network (WWAN) interface information</help>
+              <help>Show specified Wireless Wire Area Network (WWAN) interface information</help>
               <completionHelp>
                 <path>interfaces wwan</path>
                 <script>cd /sys/class/net; ls -d wwan*</script>
diff --git a/op-mode-definitions/wireless.xml.in b/op-mode-definitions/wireless.xml.in
index a3a9d1f55..5d9db1544 100644
--- a/op-mode-definitions/wireless.xml.in
+++ b/op-mode-definitions/wireless.xml.in
@@ -37,83 +37,4 @@
       </node>
     </children>
   </node>
-  <node name="show">
-    <children>
-      <node name="interfaces">
-        <children>
-          <node name="wireless">
-            <properties>
-              <help>Show wireless interface information</help>
-            </properties>
-            <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>${vyos_op_scripts_dir}/show_interfaces.py --intf-type=wireless --action=show</command>
-              </leafNode>
-              <leafNode name="info">
-                <properties>
-                  <help>Show wireless interface configuration</help>
-                </properties>
-                <command>${vyos_op_scripts_dir}/show_wireless.py --brief</command>
-              </leafNode>
-            </children>
-          </node>
-          <tagNode name="wireless">
-            <properties>
-              <help>Show specified wireless interface information</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces.py --type wireless</script>
-              </completionHelp>
-            </properties>
-            <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>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4" --action=show-brief</command>
-              </leafNode>
-              <node name="scan">
-                <properties>
-                  <help>Show summary of the specified wireless interface information</help>
-                </properties>
-                <command>sudo ${vyos_op_scripts_dir}/show_wireless.py --scan "$4"</command>
-                <children>
-                  <leafNode name="detail">
-                    <properties>
-                      <help>Show detailed scan results</help>
-                    </properties>
-                    <command>sudo /sbin/iw dev "$4" scan ap-force</command>
-                  </leafNode>
-                </children>
-              </node>
-              <leafNode name="stations">
-                <properties>
-                  <help>Show specified wireless interface information</help>
-                </properties>
-                <command>${vyos_op_scripts_dir}/show_wireless.py --stations "$4"</command>
-              </leafNode>
-              <tagNode name="vif">
-                <properties>
-                  <help>Show specified virtual network interface (vif) information</help>
-                </properties>
-                <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>${vyos_op_scripts_dir}/show_interfaces.py --intf="$4.$6" --action=show-brief</command>
-                  </leafNode>
-                </children>
-              </tagNode>
-            </children>
-          </tagNode>
-        </children>
-      </node>
-    </children>
-  </node>
 </interfaceDefinition>
-- 
cgit v1.2.3