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

26 files changed, 280 insertions, 25 deletions

diff --git a/Makefile.am b/Makefile.am
index caf9460..fe214da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,7 @@ bin_SCRIPTS     += scripts/show-dhcp-leases.pl
 bin_SCRIPTS     += scripts/vyatta-boot-image.pl
 bin_SCRIPTS	+= scripts/vyatta-sudo
 bin_SCRIPTS	+= scripts/vyatta-show-snmp.pl
+bin_SCRIPTS	+= scripts/vyatta-show-snmp-ifmib
 bin_SCRIPTS	+= scripts/rename-image.pl
 bin_SCRIPTS	+= scripts/show-image-storage.pl
 bin_SCRIPTS	+= scripts/vyatta-remote-copy.pl
diff --git a/debian/changelog b/debian/changelog
index dd7648e..d97f31b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+vyatta-op (0.13.91) unstable; urgency=low
+
+  [ Stephen Hemminger ]
+  * Change pci id parsing
+
+  [ An-Cheng Huang ]
+  * match pre-mendocino "show configuration"
+
+ -- An-Cheng Huang <ancheng@vyatta.com>  Wed, 10 Nov 2010 11:43:21 -0800
+
+vyatta-op (0.13.90) unstable; urgency=low
+
+  * Add commands to show if-mib mappings for interface
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Tue, 09 Nov 2010 18:40:56 -0800
+
+vyatta-op (0.13.89) unstable; urgency=low
+
+  * Fix path to ethtool
+  * Fix lookup of community string
+  * Enhance show snmp command
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Tue, 09 Nov 2010 16:27:02 -0800
+
+vyatta-op (0.13.88) unstable; urgency=low
+
+  [ Daniil Baturin ]
+  * Fixed yesno error messages when run with no "-y" argument and with
+    empty prompt.
+
+  [ Stig Thormodsrud ]
+
+ -- Stig Thormodsrud <stig@vyatta.com>  Fri, 05 Nov 2010 14:03:43 -0700
+
 vyatta-op (0.13.87) unstable; urgency=low
 
   [ Stephen Hemminger ]
diff --git a/debian/linda b/debian/linda
deleted file mode 100644
index 0381d9d..0000000
--- a/debian/linda
+++ /dev/null
@@ -1 +0,0 @@
-Tag: file-in-opt
diff --git a/debian/rules b/debian/rules
index 4a5a50e..6edbcd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,6 @@ install: build
 	$(MAKE) DESTDIR=$(PKGDIR) install
 
 	install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE)
-	install -D --mode=0644 debian/linda $(PKGDIR)/usr/share/linda/overrides/$(PACKAGE)
 
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/scripts/vyatta-identify-interface.pl b/scripts/vyatta-identify-interface.pl
index 0170b68..1cfdb36 100755
--- a/scripts/vyatta-identify-interface.pl
+++ b/scripts/vyatta-identify-interface.pl
@@ -41,7 +41,7 @@ if ($cpid == 0) {
   # child
   print "Interface $intf should be blinking now.\n";
   print "Press Enter to stop...\n";
-  exec("/usr/sbin/ethtool -p $intf");
+  exec("/sbin/ethtool -p $intf");
   # not reachable
   exit 0;
 } else {
diff --git a/scripts/vyatta-show-interfaces b/scripts/vyatta-show-interfaces
index b49dbf7..1b0a156 100755
--- a/scripts/vyatta-show-interfaces
+++ b/scripts/vyatta-show-interfaces
@@ -106,7 +106,7 @@ _show_itf_stats ()
 _show_itf_physical ()
 {
     for eth ; do
-        sudo /usr/sbin/ethtool $eth
+        /sbin/ethtool $eth
         echo
     done
 }
diff --git a/scripts/vyatta-show-snmp-ifmib b/scripts/vyatta-show-snmp-ifmib
new file mode 100644
index 0000000..8fb1004
--- /dev/null
+++ b/scripts/vyatta-show-snmp-ifmib
@@ -0,0 +1,138 @@
+#! /usr/bin/perl
+
+# **** License ****
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# This code was originally developed by Vyatta, Inc.
+# Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.
+# All Rights Reserved.
+#
+# Author: Stephen Hemminger
+# Date: Novemember 2010
+# Description: Script for show snmp ifmib
+#
+# **** End License ****
+
+use strict;
+use warnings;
+use Getopt::Long;
+use POSIX qw(strtol);
+
+# This is used to show values corresponding to to results IF-MIB.
+my %interfaces;
+
+sub show_ifindex {
+    foreach my $ifname (@_) {
+        my $info    = $interfaces{$ifname};
+        my $ifindex = $info->{'ifIndex'};
+        printf "%s: ifIndex = %d\n", $ifname, $ifindex;
+    }
+}
+
+sub show_ifalias {
+    foreach my $ifname (@_) {
+        my $info    = $interfaces{$ifname};
+        my $ifalias = $info->{'ifAlias'};
+        printf "%s: ifAlias = %s\n", $ifname,
+          defined($ifalias) ? $ifalias : $ifname;
+    }
+}
+
+sub read_sysfs {
+    my $filename = shift;
+
+    open( my $f, '<', $filename )
+      or return;    # not a PCI device
+
+    my $val = <$f>;
+    close $f;
+
+    return strtol($val);
+}
+
+# Imitate code in net-snmp to lookup PC
+# TODO - move to common code extension (and handle USB?)
+sub pci_info {
+    my $ifname    = shift;
+    my $vendor_id = read_sysfs("/sys/class/net/$ifname/device/vendor");
+    my $device_id = read_sysfs("/sys/class/net/$ifname/device/device");
+
+    return unless ( defined($vendor_id) && defined($device_id) );
+
+    my $cmd = sprintf("lspci -m -d %04x:%04x", $vendor_id, $device_id);
+    open( my $pci, '-|', $cmd )
+      or die "Can't run $cmd";
+    my $info = <$pci>;
+    close $pci;
+
+    return unless $info;
+
+    # extract vendor and device description from output
+    $info =~ /^\S+ "[^"]*" "([^"]*)" "([^"]*)"/;
+
+    return "$1 $2";
+}
+
+sub show_ifdescr {
+    foreach my $ifname (@_) {
+        my $ifdescr = pci_info($ifname);
+
+        printf "%s: ifDescr = %s\n", $ifname,
+		defined($ifdescr) ? $ifdescr : $ifname;
+    }
+}
+
+sub show_all {
+    foreach my $ifname (@_) {
+        my $info    = $interfaces{$ifname};
+        my $ifindex = $info->{'ifIndex'};
+        my $ifalias = $info->{'ifAlias'};
+        my $ifdescr = pci_info($ifname);
+
+        printf "%s: ifIndex = %d\n", $ifname, $ifindex;
+
+        my $pad = sprintf( "%-*s", length($ifname) + 1, " " );
+        printf "%s ifAlias = %s\n", $pad, $ifalias if ($ifalias);
+        printf "%s ifDescr = %s\n", $pad, $ifdescr if ($ifdescr);
+    }
+}
+
+my $show = \&show_all;
+
+GetOptions(
+    "ifindex" => sub { $show = \&show_ifindex },
+    "ifalias" => sub { $show = \&show_ifalias },
+    "ifdescr" => sub { $show = \&show_ifdescr },
+) or die "Unknown option\n";
+
+# List of all interfaces that currently exist on system
+# includes interfaces that may be outside Vyatta CLI because
+# they still show up in SNMP
+open( my $ip, '-|', 'ip li' )
+  or die "Can't run ip command\n";
+
+my $ifname;
+while (<$ip>) {
+    if (/^(\d+): ([^:]*): /) {
+        $ifname = $2;
+        $interfaces{$ifname} = { 'ifIndex' => $1 };
+    }
+    elsif (/^ +alias (.*)$/) {
+        $interfaces{$ifname}->{'ifAlias'} = $1;
+    }
+}
+close $ip;
+
+if (@ARGV) {
+    $show->(@ARGV);
+}
+else {
+    $show->( sort keys %interfaces );
+}
diff --git a/scripts/vyatta-show-snmp.pl b/scripts/vyatta-show-snmp.pl
index 9c8e814..2346a6c 100755
--- a/scripts/vyatta-show-snmp.pl
+++ b/scripts/vyatta-show-snmp.pl
@@ -22,25 +22,84 @@
 #
 use strict;
 use warnings;
+use Getopt::Long;
+use NetAddr::IP;
 
-sub get_community {
-    my $snmpcfg = '/etc/snmp/snmpd.conf';
+my $SNMPDCFG   = '/etc/snmp/snmpd.conf';
+my $SNMPSTATUS = '/usr/bin/snmpstatus';
+
+# generate list of communities in configuration file
+sub read_config {
+    my %community;
+
+    open( my $cfg, '<', $SNMPDCFG )
+      or die "Can't open $SNMPDCFG : $!\n";
 
-    open (my $cfg, '<', $snmpcfg)
-	or return;
-    my $community;
     while (<$cfg>) {
-	next unless m/^r[ow]community (\w+)$/;
-	$community = $1;
-	last;
+        chomp;
+        s/#.*$//;
+        my @cols = split;
+        next
+          unless ( $#cols > 0
+            && ( $cols[0] eq 'rocommunity' || $cols[0] eq 'rwcommunity' ) );
+
+        my $addr = ( $#cols > 1 ) ? $cols[2] : "0.0.0.0/0";
+        $community{ $cols[1] } = NetAddr::IP->new($addr);
     }
     close $cfg;
-    return $community;
+
+    return \%community;
+}
+
+# expand list of available communities for allowed: tag
+sub show_all {
+    my $community = read_config();
+
+    print join( ' ', keys( %{$community} ) ), "\n";
+    exit 0;
 }
 
-my $community = get_community();
-die "No SNMP communities configured\n"
-    unless $community;
+# check status of any accessible community on localhost
+sub status_any {
+    my $cref      = read_config();
+    my %community = %{$cref};
+    my $localhost = new NetAddr::IP('localhost');
+
+    die "No SNMP community's configured\n"
+      unless scalar(%community);
+
+    foreach my $c ( keys %community ) {
+        my $addr = $community{$c};
+        status( $c, $localhost->addr() ) if ( $addr->contains($localhost) );
+    }
+    die "No SNMP community's accessible from ", $localhost->addr(), "\n";
+}
+
+# check status of one community
+sub status {
+    my ( $community, $host ) = @_;
+    $host = 'localhost' unless defined($host);
+
+    print "Status of SNMP community $community on $host\n";
+    exec $SNMPSTATUS, '-v1', '-c', $community, $host;
+    die "Can't exec $SNMPSTATUS : $!";
+}
+
+sub usage {
+    print "usage: $0 [--community=name [--host=hostname]]\n";
+    print "       $0 --allowed\n";
+    exit 1;
+}
+
+my ( $host, $community, $allowed );
+
+GetOptions(
+    "host=s"      => \$host,
+    "community=s" => \$community,
+    "allowed"     => \$allowed,
+) or usage();
+
+show_all() if ($allowed);
+status( $community, $host ) if ( defined($community) );
+status_any();
 
-exec 'snmpstatus', '-c', $community, '-v', '1', 'localhost'
-    or die "Can't exec snmpstatus: $!";
diff --git a/scripts/yesno b/scripts/yesno
index 9955286..3e10e09 100755
--- a/scripts/yesno
+++ b/scripts/yesno
@@ -2,7 +2,7 @@
 # Usage: yesno prompt...
 
 default=
-if [ $1 == "-y" ]
+if [ "$1" = "-y" ]
 then default='y'; shift
 fi
 
@@ -14,7 +14,7 @@ fi
 while true
 do
     read -p "$prompt" || exit 1
-    if [ -z "$REPLY" -a ! -z $default ]
+    if [ -z "$REPLY" -a ! -z "$default" ]
     then REPLY=$default
     fi
     case "$REPLY" in
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