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

do not run discover parts if properties failed to complete

Browse Source
This commit is contained in:
Oliver Gorwits
2017-10-07 13:21:13 +01:00
parent b52aaaf1a1
commit 58d0fbddda
9 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ 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");
@@ -59,7 +60,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
} # ALIAS
}
return true if $new_ip eq $old_ip;
return if $new_ip eq $old_ip;
schema('netdisco')->txn_do(sub {
# delete target device with the same vendor and serial number

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

@@ -12,6 +12,7 @@ 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");

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

@@ -34,6 +34,7 @@ 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");
@@ -60,8 +61,6 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
subaction => 'with-nodes',
});
}
return true;
});
=head2 store_neighbors( $device )

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

@@ -11,6 +11,7 @@ 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");

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

@@ -106,6 +106,7 @@ register_worker({ phase => 'early', 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");

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

@@ -11,6 +11,7 @@ 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");

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

@@ -11,11 +11,12 @@ 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 $ssidlist = $snmp->i_ssidlist;
return true unless scalar keys %$ssidlist;
return unless scalar keys %$ssidlist;
my $interfaces = $snmp->interfaces;
my $ssidbcast = $snmp->i_ssidbcast;

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

@@ -12,28 +12,26 @@ register_worker({ phase => 'main' }, sub {
# if requested, and the device has not yet been
# arpniped/macsucked, queue those jobs now
if ($device->in_storage
and $job->subaction and $job->subaction eq 'with-nodes') {
if (!defined $device->last_macsuck and $device->has_layer(2)) {
jq_insert({
device => $device->ip,
action => 'macsuck',
username => $job->username,
userip => $job->userip,
});
}
return unless $device->in_storage
and $job->subaction and $job->subaction eq 'with-nodes';
if (!defined $device->last_arpnip and $device->has_layer(3)) {
jq_insert({
device => $device->ip,
action => 'arpnip',
username => $job->username,
userip => $job->userip,
});
}
if (!defined $device->last_macsuck and $device->has_layer(2)) {
jq_insert({
device => $device->ip,
action => 'macsuck',
username => $job->username,
userip => $job->userip,
});
}
return true;
if (!defined $device->last_arpnip and $device->has_layer(3)) {
jq_insert({
device => $device->ip,
action => 'arpnip',
username => $job->username,
userip => $job->userip,
});
}
});
true;

4
lib/App/Netdisco/Worker/Plugin/Macsuck/WirelessNodes.pm
View File

@@ -18,7 +18,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
my $now = 'to_timestamp('. (join '.', gettimeofday) .')';
my $cd11_txrate = $snmp->cd11_txrate;
return true unless $cd11_txrate and scalar keys %$cd11_txrate;
return unless $cd11_txrate and scalar keys %$cd11_txrate;
if (setting('store_wireless_clients')) {
debug sprintf ' [%s] macsuck - gathering wireless client info',
@@ -77,8 +77,6 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
});
});
}
return true;
});
true;