- Fix bug 776: need "clear interface" command to clear counters

- Fix bug 1095: Enhancement Request: "Show interface brief" command
- Change default to "brief" if multiple interfaces can be shown
- Add "detail" for nodes defaulting to brief
- Add "brief" for nodes defaulting to detail
- Fix vif completions that wasn't working
- Remove ethtool can on vlans since it doesn't work

17 files changed, 38 insertions, 0 deletions

diff --git a/templates/clear/interfaces/bridge/counters/node.def b/templates/clear/interfaces/bridge/counters/node.def
new file mode 100644
index 0000000..ad13229
--- /dev/null
+++ b/templates/clear/interfaces/bridge/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear all bridge interface counters
+run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf-type=$3
diff --git a/templates/clear/interfaces/bridge/node.def b/templates/clear/interfaces/bridge/node.def
new file mode 100644
index 0000000..a89b724
--- /dev/null
+++ b/templates/clear/interfaces/bridge/node.def
@@ -0,0 +1 @@
+help: Clear bridge interface information
diff --git a/templates/clear/interfaces/bridge/node.tag/counters/node.def b/templates/clear/interfaces/bridge/node.tag/counters/node.def
new file mode 100644
index 0000000..985e9ab
--- /dev/null
+++ b/templates/clear/interfaces/bridge/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear interface counters for a given interface
+run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf=$4
diff --git a/templates/clear/interfaces/bridge/node.tag/node.def b/templates/clear/interfaces/bridge/node.tag/node.def
new file mode 100644
index 0000000..4b6256e
--- /dev/null
+++ b/templates/clear/interfaces/bridge/node.tag/node.def
@@ -0,0 +1,4 @@
+help: Clear interface information for a given interface
+allowed: local -a array ;
+	 array=( /sys/class/net/br* ) ;
+	 echo  -n ${array[@]##*/}
diff --git a/templates/clear/interfaces/counters/node.def b/templates/clear/interfaces/counters/node.def
new file mode 100644
index 0000000..252251a
--- /dev/null
+++ b/templates/clear/interfaces/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear interface counters for all interfaces
+run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear
diff --git a/templates/clear/interfaces/ethernet/counters/node.def b/templates/clear/interfaces/ethernet/counters/node.def
new file mode 100644
index 0000000..e05e218
--- /dev/null
+++ b/templates/clear/interfaces/ethernet/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear all Ethernet interface counters
+run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf-type=$3
diff --git a/templates/clear/interfaces/ethernet/node.def b/templates/clear/interfaces/ethernet/node.def
new file mode 100644
index 0000000..3e6f0dc
--- /dev/null
+++ b/templates/clear/interfaces/ethernet/node.def
@@ -0,0 +1 @@
+help: Clear Ethernet interface information
diff --git a/templates/clear/interfaces/ethernet/node.tag/counters/node.def b/templates/clear/interfaces/ethernet/node.tag/counters/node.def
new file mode 100644
index 0000000..985e9ab
--- /dev/null
+++ b/templates/clear/interfaces/ethernet/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear interface counters for a given interface
+run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf=$4
diff --git a/templates/clear/interfaces/ethernet/node.tag/node.def b/templates/clear/interfaces/ethernet/node.tag/node.def
new file mode 100644
index 0000000..4f39ebf
--- /dev/null
+++ b/templates/clear/interfaces/ethernet/node.tag/node.def
@@ -0,0 +1,4 @@
+help: Clear interface information for a given interface
+allowed: local -a array ;
+	 array=( /sys/class/net/eth* ) ;
+	 echo  -n ${array[@]##*/}
diff --git a/templates/clear/interfaces/loopback/counters/node.def b/templates/clear/interfaces/loopback/counters/node.def
new file mode 100644
index 0000000..5ebcd3d
--- /dev/null
+++ b/templates/clear/interfaces/loopback/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear all loopback interface counters
+run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf-type=$3
diff --git a/templates/clear/interfaces/loopback/node.def b/templates/clear/interfaces/loopback/node.def
new file mode 100644
index 0000000..eb3221f
--- /dev/null
+++ b/templates/clear/interfaces/loopback/node.def
@@ -0,0 +1 @@
+help: Clear loopback interface information
diff --git a/templates/clear/interfaces/loopback/node.tag/counters/node.def b/templates/clear/interfaces/loopback/node.tag/counters/node.def
new file mode 100644
index 0000000..985e9ab
--- /dev/null
+++ b/templates/clear/interfaces/loopback/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear interface counters for a given interface
+run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf=$4
diff --git a/templates/clear/interfaces/loopback/node.tag/node.def b/templates/clear/interfaces/loopback/node.tag/node.def
new file mode 100644
index 0000000..cfefa98
--- /dev/null
+++ b/templates/clear/interfaces/loopback/node.tag/node.def
@@ -0,0 +1,4 @@
+help: Clear interface counters for a given interface
+allowed: local -a array ;
+	 array=( /sys/class/net/lo* ) ;
+	 echo  -n ${array[@]##*/}
diff --git a/templates/clear/interfaces/tunnel/counters/node.def b/templates/clear/interfaces/tunnel/counters/node.def
new file mode 100644
index 0000000..c856a04
--- /dev/null
+++ b/templates/clear/interfaces/tunnel/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear all tunnel interface counters
+run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf-type=$3
diff --git a/templates/clear/interfaces/tunnel/node.def b/templates/clear/interfaces/tunnel/node.def
new file mode 100644
index 0000000..c704813
--- /dev/null
+++ b/templates/clear/interfaces/tunnel/node.def
@@ -0,0 +1 @@
+help: Clear tunnel interface information
diff --git a/templates/clear/interfaces/tunnel/node.tag/counters/node.def b/templates/clear/interfaces/tunnel/node.tag/counters/node.def
new file mode 100644
index 0000000..985e9ab
--- /dev/null
+++ b/templates/clear/interfaces/tunnel/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear interface counters for a given interface
+run: sudo ${vyatta_bindir}/vyatta-show-interfaces.pl --action=clear --intf=$4
diff --git a/templates/clear/interfaces/tunnel/node.tag/node.def b/templates/clear/interfaces/tunnel/node.tag/node.def
new file mode 100644
index 0000000..cf85a2c
--- /dev/null
+++ b/templates/clear/interfaces/tunnel/node.tag/node.def
@@ -0,0 +1,4 @@
+help: Clear interface information for a given interface
+allowed: local -a array ;
+	 array=( /sys/class/net/tun* ) ;
+	 echo  -n ${array[@]##*/}