Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-op into mendocino

17 files changed, 30 insertions, 5 deletions

diff --git a/templates/show/configuration/all/node.def b/templates/show/configuration/all/node.def
index 66de50f..3f93f48 100644
--- a/templates/show/configuration/all/node.def
+++ b/templates/show/configuration/all/node.def
@@ -1,7 +1,8 @@
 help: Show running configuration (including default values)
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; 
      then
-        cli-shell-api showCfg --show-show-defaults --show-active-only
+        cli-shell-api showCfg --show-show-defaults --show-active-only \
+          --show-hide-secrets
      else
         echo Must be an admin user to run this command.
      fi
diff --git a/templates/show/configuration/node.def b/templates/show/configuration/node.def
index bda1abc..34813a4 100644
--- a/templates/show/configuration/node.def
+++ b/templates/show/configuration/node.def
@@ -1,7 +1,7 @@
 help: Show running configuration
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; 
      then
-        cli-shell-api showCfg --show-active-only
+        cli-shell-api showCfg --show-active-only --show-hide-secrets
      else
         echo Must be an admin user to run this command.
      fi
diff --git a/templates/show/interfaces/ethernet/node.tag/physical/node.def b/templates/show/interfaces/ethernet/node.tag/physical/node.def
index 7723946..2c22191 100644
--- a/templates/show/interfaces/ethernet/node.tag/physical/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/physical/node.def
@@ -1,3 +1,3 @@
 help: Show physical device information for specified ethernet interface
 allowed: ""
-run: /usr/sbin/ethtool "$4"; /usr/sbin/ethtool -i "$4"
+run: /sbin/ethtool "$4"; /sbin/ethtool -i "$4"
diff --git a/templates/show/interfaces/ethernet/node.tag/statistics/node.def b/templates/show/interfaces/ethernet/node.tag/statistics/node.def
index 6dae4f3..db07bf1 100644
--- a/templates/show/interfaces/ethernet/node.tag/statistics/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/statistics/node.def
@@ -1,3 +1,3 @@
 help: Show physical device statistics for specified ethernet interface
 allowed: ""
-run: sudo /usr/sbin/ethtool -S "$4"
+run: sudo /sbin/ethtool -S "$4"
diff --git a/templates/show/snmp/community/node.def b/templates/show/snmp/community/node.def
new file mode 100644
index 0000000..48e7d1d
--- /dev/null
+++ b/templates/show/snmp/community/node.def
@@ -0,0 +1 @@
+help: Show status of SNMP community
diff --git a/templates/show/snmp/community/node.tag/host/node.def b/templates/show/snmp/community/node.tag/host/node.def
new file mode 100644
index 0000000..ac7e559
--- /dev/null
+++ b/templates/show/snmp/community/node.tag/host/node.def
@@ -0,0 +1,2 @@
+help: Show status of SNMP on remote host
+
diff --git a/templates/show/snmp/community/node.tag/host/node.tag/node.def b/templates/show/snmp/community/node.tag/host/node.tag/node.def
new file mode 100644
index 0000000..b20409d
--- /dev/null
+++ b/templates/show/snmp/community/node.tag/host/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show status of SNMP on specified host
+allowed: echo -n '<hostname> <x.x.x.x>'
+run: ${vyatta_bindir}/vyatta-show-snmp.pl --community $4 --host $6
diff --git a/templates/show/snmp/community/node.tag/node.def b/templates/show/snmp/community/node.tag/node.def
new file mode 100644
index 0000000..48aa6ad
--- /dev/null
+++ b/templates/show/snmp/community/node.tag/node.def
@@ -0,0 +1,3 @@
+help: Show status of specified SNMP community
+allowed: ${vyatta_bindir}/vyatta-show-snmp.pl --allowed
+run: ${vyatta_bindir}/vyatta-show-snmp.pl --community="$4"
diff --git a/templates/show/snmp/mib/ifmib/ifAlias/node.def b/templates/show/snmp/mib/ifmib/ifAlias/node.def
new file mode 100644
index 0000000..91a0aa0
--- /dev/null
+++ b/templates/show/snmp/mib/ifmib/ifAlias/node.def
@@ -0,0 +1,2 @@
+help: Show SNMP ifAlias for all interfaces
+run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifalias
diff --git a/templates/show/snmp/mib/ifmib/ifAlias/node.tag/node.def b/templates/show/snmp/mib/ifmib/ifAlias/node.tag/node.def
new file mode 100644
index 0000000..6c5b00a
--- /dev/null
+++ b/templates/show/snmp/mib/ifmib/ifAlias/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Show SNMP ifAlias for specified interface
+run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifalias $6
diff --git a/templates/show/snmp/mib/ifmib/ifDescr/node.def b/templates/show/snmp/mib/ifmib/ifDescr/node.def
new file mode 100644
index 0000000..6ec827d
--- /dev/null
+++ b/templates/show/snmp/mib/ifmib/ifDescr/node.def
@@ -0,0 +1,2 @@
+help: Show SNMP ifDescr for all interfaces
+run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifdescr
diff --git a/templates/show/snmp/mib/ifmib/ifDescr/node.tag/node.def b/templates/show/snmp/mib/ifmib/ifDescr/node.tag/node.def
new file mode 100644
index 0000000..95222de
--- /dev/null
+++ b/templates/show/snmp/mib/ifmib/ifDescr/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Show SNMP ifDescr for specified interface
+run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifdescr $6
diff --git a/templates/show/snmp/mib/ifmib/ifIndex/node.def b/templates/show/snmp/mib/ifmib/ifIndex/node.def
new file mode 100644
index 0000000..2955c1d
--- /dev/null
+++ b/templates/show/snmp/mib/ifmib/ifIndex/node.def
@@ -0,0 +1,2 @@
+help: Show SNMP ifIndex for all interfaces
+run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifindex
diff --git a/templates/show/snmp/mib/ifmib/ifIndex/node.tag/node.def b/templates/show/snmp/mib/ifmib/ifIndex/node.tag/node.def
new file mode 100644
index 0000000..f9159ac
--- /dev/null
+++ b/templates/show/snmp/mib/ifmib/ifIndex/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Show SNMP ifIndex for specified interface
+run: ${vyatta_bindir}/vyatta-show-snmp-ifmib --ifindex $6
diff --git a/templates/show/snmp/mib/ifmib/node.def b/templates/show/snmp/mib/ifmib/node.def
new file mode 100644
index 0000000..fa309ff
--- /dev/null
+++ b/templates/show/snmp/mib/ifmib/node.def
@@ -0,0 +1,2 @@
+help: Show SNMP interfaces MIB information
+run: ${vyatta_bindir}/vyatta-show-snmp-ifmib
diff --git a/templates/show/snmp/mib/node.def b/templates/show/snmp/mib/node.def
new file mode 100644
index 0000000..de4f01b
--- /dev/null
+++ b/templates/show/snmp/mib/node.def
@@ -0,0 +1 @@
+help: Show SNMP MIB information
diff --git a/templates/show/snmp/node.def b/templates/show/snmp/node.def
index ea8ca47..98f4366 100644
--- a/templates/show/snmp/node.def
+++ b/templates/show/snmp/node.def
@@ -1,2 +1,2 @@
-help: Show SNMP status
+help: Show status of SNMP on localhost
 run: ${vyatta_bindir}/vyatta-show-snmp.pl