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

separate out is_*able last_* checks

Browse Source
This commit is contained in:
Oliver Gorwits
2017-05-22 22:01:50 +01:00
parent cf8589aba2
commit 3a0019296d
5 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/App/Netdisco/Backend/Worker/Poller/Arpnip.pm
View File

@@ -1,7 +1,7 @@
package App::Netdisco::Backend::Worker::Poller::Arpnip;
use App::Netdisco::Core::Arpnip 'do_arpnip';
use App::Netdisco::Util::Device 'is_arpnipable';
use App::Netdisco::Util::Device 'is_arpnipable_now';
use Role::Tiny;
use namespace::clean;
@@ -9,7 +9,7 @@ use namespace::clean;
with 'App::Netdisco::Backend::Worker::Poller::Common';
sub arpnip_action { \&do_arpnip }
sub arpnip_filter { \&is_arpnipable }
sub arpnip_filter { \&is_arpnipable_now }
sub arpnip_layer { 3 }
sub arpwalk { (shift)->_walk_body('arpnip', @_) }

4
lib/App/Netdisco/Backend/Worker/Poller/Device.pm
View File

@@ -3,7 +3,7 @@ package App::Netdisco::Backend::Worker::Poller::Device;
use Dancer qw/:moose :syntax :script/;
use App::Netdisco::Util::SNMP 'snmp_connect';
use App::Netdisco::Util::Device qw/get_device is_discoverable/;
use App::Netdisco::Util::Device qw/get_device is_discoverable_now/;
use App::Netdisco::Core::Discover ':all';
use App::Netdisco::Backend::Util ':all';
use App::Netdisco::JobQueue qw/jq_queued jq_insert/;
@@ -54,7 +54,7 @@ sub discover {
return job_done("discover skipped: $host is pseudo-device");
}
unless (is_discoverable($device->ip)) {
unless (is_discoverable_now($device->ip)) {
return job_defer("discover deferred: $host is not discoverable");
}

4
lib/App/Netdisco/Backend/Worker/Poller/Macsuck.pm
View File

@@ -1,7 +1,7 @@
package App::Netdisco::Backend::Worker::Poller::Macsuck;
use App::Netdisco::Core::Macsuck 'do_macsuck';
use App::Netdisco::Util::Device 'is_macsuckable';
use App::Netdisco::Util::Device 'is_macsuckable_now';
use Role::Tiny;
use namespace::clean;
@@ -9,7 +9,7 @@ use namespace::clean;
with 'App::Netdisco::Backend::Worker::Poller::Common';
sub macsuck_action { \&do_macsuck }
sub macsuck_filter { \&is_macsuckable }
sub macsuck_filter { \&is_macsuckable_now }
sub macsuck_layer { 2 }
sub macwalk { (shift)->_walk_body('macsuck', @_) }

6
lib/App/Netdisco/Backend/Worker/Poller/Nbtstat.pm
View File

@@ -5,7 +5,7 @@ use Dancer::Plugin::DBIC 'schema';
use App::Netdisco::Core::Nbtstat qw/nbtstat_resolve_async store_nbt/;
use App::Netdisco::Util::Node 'is_nbtstatable';
use App::Netdisco::Util::Device qw/get_device is_discoverable/;
use App::Netdisco::Util::Device qw/get_device is_macsuckable/;
use App::Netdisco::Backend::Util ':all';
use NetAddr::IP::Lite ':lower';
@@ -29,8 +29,8 @@ sub nbtstat {
or job_error("nbtstat failed: unable to interpret device parameter");
my $host = $device->ip;
unless (is_discoverable($device->ip)) {
return job_defer("nbtstat deferred: $host is not discoverable");
unless (is_macsuckable($device->ip)) {
return job_defer("nbtstat deferred: $host is not macsuckable");
}
# get list of nodes on device