Squashed commit of the following: commit3fe8f383a7Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 11 17:07:42 2019 +0000 add debug lines and tested commit3249739e42Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 11 16:54:11 2019 +0000 change config name to get_credentials commite78558397aAuthor: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 11 16:51:11 2019 +0000 separate out generic device auth to DeviceAuth module commit249f05165fAuthor: Oliver Gorwits <oliver@cpan.org> Date: Wed Mar 6 18:43:31 2019 +0000 release 2.040007 commite3af64df77Author: Oliver Gorwits <oliver@cpan.org> Date: Wed Mar 6 18:42:47 2019 +0000 #521-redux fix wifi date search commit48857ae300Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 4 12:03:31 2019 +0000 release 2.040006 commite09dab5362Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 4 11:39:12 2019 +0000 #527 update List::MoreUtils version requirement commit6e7de3fff3Author: Oliver Gorwits <oliver@cpan.org> Date: Mon Mar 4 09:59:41 2019 +0000 release 2.040005 commit0c98318a45Author: Oliver Gorwits <oliver@spike.local> Date: Mon Mar 4 09:57:18 2019 +0000 #526 fix discover syntax bug commite9efc45182Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 14:56:48 2019 +0000 release 2.040004 commit6cdfd80d10Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 14:34:00 2019 +0000 allow undiscovered neighbors report to use discover_{waps,phones} setting commitac381e0802Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 14:13:20 2019 +0000 #506 was a red herring commitb83e614c85Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 13:00:36 2019 +0000 make discover_{phones,waps} work with LLDP capabilities as well commit189d234b55Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:47:38 2019 +0000 check discover_no_type and friends earlier on in neighbors list build commit9c956466f3Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:32:07 2019 +0000 also update default config for new discover_phones and discover_waps settings commit09d29954d2Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:26:50 2019 +0000 #512 fix regression in phone/wap discovery exclusion commit2bae91f1b6Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 12:01:34 2019 +0000 rename match_devicetype() to match_to_setting() commit57cb6ddb70Author: Oliver Gorwits <oliver@cpan.org> Date: Sun Mar 3 09:19:39 2019 +0000 fix for over-eager fix to #506 commitef560fb59aAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 22:41:40 2019 +0000 #506 relax device renumber so it works for an alias commit7a8bcb094eAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 22:23:39 2019 +0000 #521 Search Node Date Range not working commita643820a62Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 21:54:27 2019 +0000 #428 Port-Channels not showing in netmap commit5ba5bcd295Merge:e7aacddba1f95028Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 20:04:11 2019 +0000 Merge branch 'master' of github.com:netdisco/netdisco commite7aacddbc6Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 20:01:05 2019 +0000 #498 Map with VLAN filter omits unconnected devices commita1f95028caAuthor: nick n <39005454+inphobia@users.noreply.github.com> Date: Sat Mar 2 19:54:22 2019 +0100 catch up with changes noticed that rc-sshcollector-core received updates to changes, add them here as well. didn't mention #499 & #522 commitce1b847ceaAuthor: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 18:47:44 2019 +0000 fix bug showing no nodes when only one matches in netmap commit78e30a7926Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 16:28:15 2019 +0000 #500 filtering in device/ports on native vlan duplicates entries commit9952f0c6c7Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 15:02:12 2019 +0000 #499 netdisco-do renumber reports wrong ip (inphobia) commitca3fd8f466Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 15:00:18 2019 +0000 #505 device renumber should update device port properties and device skips commit1265bc8470Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 14:52:21 2019 +0000 #520 catch slave ports defined without a master commitd4c7579c10Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 14:47:49 2019 +0000 #522 TypeAhead.pm can reference empty data (inphobia) commit77decc23b7Author: Oliver Gorwits <oliver@cpan.org> Date: Sat Mar 2 14:45:37 2019 +0000 #514 inconsistent results in ip inventory (inphobia) commit3f211650b8Author: nick n <39005454+inphobia@users.noreply.github.com> Date: Fri Mar 1 12:34:42 2019 +0100 last pieces for db schema upgrade last piece of #510
131 lines
4.3 KiB
Perl
131 lines
4.3 KiB
Perl
package App::Netdisco::Worker::Plugin::Discover::PortProperties;
|
|
|
|
use Dancer ':syntax';
|
|
use App::Netdisco::Worker::Plugin;
|
|
use aliased 'App::Netdisco::Worker::Status';
|
|
|
|
use App::Netdisco::Transport::SNMP ();
|
|
use Dancer::Plugin::DBIC 'schema';
|
|
|
|
use Encode;
|
|
use App::Netdisco::Util::Device 'match_to_setting';
|
|
|
|
register_worker({ phase => 'main', driver => 'snmp' }, sub {
|
|
my ($job, $workerconf) = @_;
|
|
|
|
my $device = $job->device;
|
|
return unless $device->in_storage;
|
|
my $snmp = App::Netdisco::Transport::SNMP->reader_for($device)
|
|
or return Status->defer("discover failed: could not SNMP connect to $device");
|
|
|
|
my $interfaces = $snmp->interfaces || {};
|
|
my %properties = ();
|
|
|
|
# cache the device ports to save hitting the database for many single rows
|
|
my $device_ports = vars->{'device_ports'}
|
|
|| { map {($_->port => $_)} $device->ports->all };
|
|
|
|
my $raw_speed = $snmp->i_speed_raw || {};
|
|
|
|
foreach my $idx (keys %$raw_speed) {
|
|
my $port = $interfaces->{$idx} or next;
|
|
if (!defined $device_ports->{$port}) {
|
|
debug sprintf ' [%s] properties/speed - local port %s already skipped, ignoring',
|
|
$device->ip, $port;
|
|
next;
|
|
}
|
|
|
|
$properties{ $port }->{raw_speed} = $raw_speed->{$idx};
|
|
}
|
|
|
|
my $err_cause = $snmp->i_err_disable_cause || {};
|
|
|
|
foreach my $idx (keys %$err_cause) {
|
|
my $port = $interfaces->{$idx} or next;
|
|
if (!defined $device_ports->{$port}) {
|
|
debug sprintf ' [%s] properties/errdis - local port %s already skipped, ignoring',
|
|
$device->ip, $port;
|
|
next;
|
|
}
|
|
|
|
$properties{ $port }->{error_disable_cause} = $err_cause->{$idx};
|
|
}
|
|
|
|
my $faststart = $snmp->i_faststart_enabled || {};
|
|
|
|
foreach my $idx (keys %$faststart) {
|
|
my $port = $interfaces->{$idx} or next;
|
|
if (!defined $device_ports->{$port}) {
|
|
debug sprintf ' [%s] properties/faststart - local port %s already skipped, ignoring',
|
|
$device->ip, $port;
|
|
next;
|
|
}
|
|
|
|
$properties{ $port }->{faststart} = $faststart->{$idx};
|
|
}
|
|
|
|
my $c_if = $snmp->c_if || {};
|
|
my $c_cap = $snmp->c_cap || {};
|
|
my $c_platform = $snmp->c_platform || {};
|
|
|
|
my $rem_media_cap = $snmp->lldp_media_cap || {};
|
|
my $rem_vendor = $snmp->lldp_rem_vendor || {};
|
|
my $rem_model = $snmp->lldp_rem_model || {};
|
|
my $rem_os_ver = $snmp->lldp_rem_sw_rev || {};
|
|
my $rem_serial = $snmp->lldp_rem_serial || {};
|
|
|
|
foreach my $idx (keys %$c_if) {
|
|
my $port = $interfaces->{ $c_if->{$idx} } or next;
|
|
if (!defined $device_ports->{$port}) {
|
|
debug sprintf ' [%s] properties/lldpcap - local port %s already skipped, ignoring',
|
|
$device->ip, $port;
|
|
next;
|
|
}
|
|
|
|
my $remote_cap = $c_cap->{$idx} || [];
|
|
my $remote_type = Encode::decode('UTF-8', $c_platform->{$idx} || '');
|
|
|
|
$properties{ $port }->{remote_is_wap} = 'true'
|
|
if scalar grep {match_to_setting($_, 'wap_capabilities')} @$remote_cap
|
|
or match_to_setting($remote_type, 'wap_platforms');
|
|
|
|
$properties{ $port }->{remote_is_phone} = 'true'
|
|
if scalar grep {match_to_setting($_, 'phone_capabilities')} @$remote_cap
|
|
or match_to_setting($remote_type, 'phone_platforms');
|
|
|
|
next unless scalar grep {defined && m/^inventory$/} @{ $rem_media_cap->{$idx} };
|
|
|
|
$properties{ $port }->{remote_vendor} = $rem_vendor->{ $idx };
|
|
$properties{ $port }->{remote_model} = $rem_model->{ $idx };
|
|
$properties{ $port }->{remote_os_ver} = $rem_os_ver->{ $idx };
|
|
$properties{ $port }->{remote_serial} = $rem_serial->{ $idx };
|
|
}
|
|
|
|
foreach my $idx (keys %$interfaces) {
|
|
my $port = $interfaces->{$idx} or next;
|
|
if (!defined $device_ports->{$port}) {
|
|
debug sprintf ' [%s] properties/ifindex - local port %s already skipped, ignoring',
|
|
$device->ip, $port;
|
|
next;
|
|
}
|
|
|
|
$properties{ $port }->{ifindex} = $idx;
|
|
}
|
|
|
|
return Status->info(" [$device] no port properties to record")
|
|
unless scalar keys %properties;
|
|
|
|
schema('netdisco')->txn_do(sub {
|
|
my $gone = $device->properties_ports->delete;
|
|
debug sprintf ' [%s] properties - removed %d ports with properties',
|
|
$device->ip, $gone;
|
|
$device->properties_ports->populate(
|
|
[map {{ port => $_, %{ $properties{$_} } }} keys %properties] );
|
|
|
|
return Status->info(sprintf ' [%s] properties - added %d new port properties',
|
|
$device->ip, scalar keys %properties);
|
|
});
|
|
});
|
|
|
|
true;
|