Print the result of device_type().
If you ask for a dump with -p, and it's not in the list of things we're already grabbing, grab it at the end.
This commit is contained in:
@@ -13,7 +13,7 @@ use lib '/usr/local/netdisco';
|
|||||||
use SNMP::Info;
|
use SNMP::Info;
|
||||||
use Getopt::Long;
|
use Getopt::Long;
|
||||||
use strict;
|
use strict;
|
||||||
use vars qw/$Class $Dev $Comm $Ver @Dump/;
|
use vars qw/$Class $Dev $Comm $Ver @Dump %Dumped/;
|
||||||
|
|
||||||
# Default Values
|
# Default Values
|
||||||
$Class = '';
|
$Class = '';
|
||||||
@@ -51,6 +51,7 @@ my $dev = new $Class( 'AutoSpecify' => 0,
|
|||||||
) or die "\n";
|
) or die "\n";
|
||||||
|
|
||||||
print "Connected to $Dev.\n";
|
print "Connected to $Dev.\n";
|
||||||
|
print "It's a ", $dev->device_type(), ".\n";
|
||||||
|
|
||||||
my $layers = $dev->layers();
|
my $layers = $dev->layers();
|
||||||
|
|
||||||
@@ -83,6 +84,10 @@ foreach my $fn (@misc){
|
|||||||
test_fn($dev,$fn);
|
test_fn($dev,$fn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
foreach my $fn (@Dump) {
|
||||||
|
test_fn($dev,$fn) unless $Dumped{$fn};
|
||||||
|
}
|
||||||
|
|
||||||
#--------------------------------
|
#--------------------------------
|
||||||
sub test_global {
|
sub test_global {
|
||||||
my $dev = shift;
|
my $dev = shift;
|
||||||
@@ -137,6 +142,7 @@ sub test_fn {
|
|||||||
|
|
||||||
printf "%-20s %d rows.\n",$method, scalar(keys %$results);
|
printf "%-20s %d rows.\n",$method, scalar(keys %$results);
|
||||||
if (grep(/^$method$/,@Dump)) {
|
if (grep(/^$method$/,@Dump)) {
|
||||||
|
$Dumped{$method} = 1;
|
||||||
foreach my $iid (keys %$results){
|
foreach my $iid (keys %$results){
|
||||||
print " $iid : $results->{$iid}\n";
|
print " $iid : $results->{$iid}\n";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user