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

bug fixes after testing on a real network

Browse Source
This commit is contained in:
Oliver Gorwits
2017-11-13 22:08:02 +00:00
parent 840b6b4069
commit 1502ec1966
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/App/Netdisco/Worker/Plugin/Discover/CanonicalIP.pm
View File

@@ -46,7 +46,8 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
if (check_acl_only($device, $key) if (check_acl_only($device, $key)
and check_acl_only($alias, $map->{$key})) { and check_acl_only($alias, $map->{$key})) {
if ($snmp->snmp_connect_ip( $alias->alias )) { # if ($snmp->snmp_connect_ip( $alias->alias )) { FIXME
if (App::Netdisco::Transport::SNMP->reader_for( $alias->alias )) {
$new_ip = $alias->alias; $new_ip = $alias->alias;
last ALIAS; last ALIAS;
} }

3
lib/App/Netdisco/Worker/Plugin/Discover/Entities.pm
View File

@@ -60,8 +60,9 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
my $e_fru = $snmp->e_fru; my $e_fru = $snmp->e_fru;
# build device modules list for DBIC # build device modules list for DBIC
my @modules; my (@modules, %seen_idx);
foreach my $entry (keys %$e_index) { foreach my $entry (keys %$e_index) {
next if $seen_idx{$entry}++;
push @modules, { push @modules, {
index => $e_index->{$entry}, index => $e_index->{$entry},
type => $e_type->{$entry}, type => $e_type->{$entry},

1
lib/App/Netdisco/Worker/Plugin/Discover/WithNodes.pm
View File

@@ -4,6 +4,7 @@ use Dancer ':syntax';
use App::Netdisco::Worker::Plugin; use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status'; use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::JobQueue 'jq_insert';
use Dancer::Plugin::DBIC 'schema'; use Dancer::Plugin::DBIC 'schema';
register_worker({ phase => 'main' }, sub { register_worker({ phase => 'main' }, sub {