135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accept host names to netdisco-do show

Browse Source
This commit is contained in:
Oliver Gorwits
2014-09-03 11:11:15 +00:00
parent b89988cd69
commit d32024a782
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -3,6 +3,7 @@
[ENHANCEMENTS] [ENHANCEMENTS]
* [#123] Allow devices with no LLDP/CDP to be found as Nodes * [#123] Allow devices with no LLDP/CDP to be found as Nodes
* Accept host names to netdisco-do show
[BUG FIXES] [BUG FIXES]

12
Netdisco/bin/netdisco-do
View File

@@ -113,7 +113,17 @@ unless ($action) {
} }
use App::Netdisco::Util::SNMP (); use App::Netdisco::Util::SNMP ();
use App::Netdisco::Util::Device 'get_device';
use NetAddr::IP::Lite ':lower';
use Scalar::Util 'blessed';
sub show { sub show {
my $ip = NetAddr::IP::Lite->new($device)
or return ('error', "Bad host or IP: $device");
my $dev = get_device($ip->addr);
unless (blessed $dev and $dev->in_storage) {
return ('error', "Don't know device: $device");
}
$extra ||= 'interfaces'; my $class = undef; $extra ||= 'interfaces'; my $class = undef;
($class, $extra) = split(/::([^:]+)$/, $extra); ($class, $extra) = split(/::([^:]+)$/, $extra);
if ($class and $extra) { if ($class and $extra) {
@@ -123,7 +133,7 @@ unless ($action) {
$extra = $class; $extra = $class;
undef $class; undef $class;
} }
my $i = App::Netdisco::Util::SNMP::snmp_connect($device, $class); my $i = App::Netdisco::Util::SNMP::snmp_connect($dev, $class);
Data::Printer::p($i->$extra); Data::Printer::p($i->$extra);
return ('done', "Showed $extra response from $device."); return ('done', "Showed $extra response from $device.");
} }