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

Bug fixes to discovery; add root_ip handling.

Browse Source 
Squashed commit of the following:

commit cb6f125c73
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Apr 13 20:26:59 2013 +0100

    discover root_ip properly

commit 8228e73f5b
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Apr 13 19:47:23 2013 +0100

    better name for util package

commit 4546036f4f
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Apr 13 19:23:55 2013 +0100

    bug fixes in getting wireless info

commit 78554e5516
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Apr 13 19:07:44 2013 +0100

    refactor snmp_connect to handle versions and device classes

commit ca9edd114a
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Apr 13 15:23:52 2013 +0100

    rename discoverall to discovernew

commit 1b897e4aee
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Apr 13 14:51:06 2013 +0100

    change debug log tag for store_device

commit 8a5306e056
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Apr 13 14:50:10 2013 +0100

    rename Discover.pm to Device.pm

commit 3197e38819
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Sat Apr 13 14:48:31 2013 +0100

    allow netdisco-do to do all acton
This commit is contained in:
Oliver Gorwits
2013-04-14 10:51:55 +01:00
parent 211166fa67
commit 1324b431c4
13 changed files with 172 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/lib/App/Netdisco/Daemon/Queue.pm
View File

@@ -33,7 +33,7 @@ sub capacity_for {
debug "checking local capacity for action $action";
my $action_map = {
Poller => [qw/refresh discover discoverall discover_neighbors/],
Poller => [qw/refresh discover discovernew discover_neighbors/],
Interactive => [qw/location contact portcontrol portname vlan power/],
};

2
Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/Util.pm → Netdisco/lib/App/Netdisco/Daemon/Util.pm
View File

@@ -1,4 +1,4 @@
package App::Netdisco::Daemon::Worker::Interactive::Util;
package App::Netdisco::Daemon::Util;
# support utilities for Daemon Actions

4
Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/DeviceActions.pm
View File

@@ -1,8 +1,8 @@
package App::Netdisco::Daemon::Worker::Interactive::DeviceActions;
use App::Netdisco::Util::SNMP ':all';
use App::Netdisco::Util::SNMP 'snmp_connect_rw';
use App::Netdisco::Util::Device 'get_device';
use App::Netdisco::Daemon::Worker::Interactive::Util ':all';
use App::Netdisco::Daemon::Util ':all';
use Role::Tiny;
use namespace::clean;

4
Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
View File

@@ -1,8 +1,8 @@
package App::Netdisco::Daemon::Worker::Interactive::PortActions;
use App::Netdisco::Util::SNMP ':all';
use App::Netdisco::Util::Port ':all';
use App::Netdisco::Daemon::Worker::Interactive::Util ':all';
use App::Netdisco::Util::SNMP 'snmp_connect_rw';
use App::Netdisco::Daemon::Util ':all';
use Role::Tiny;
use namespace::clean;

2
Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm
View File

@@ -14,7 +14,7 @@ my $fqdn = hostfqdn || 'localhost';
my $role_map = {
(map {$_ => 'Poller'}
qw/refresh discover discoverall discover_neighbors/),
qw/refresh discover discovernew discover_neighbors/),
(map {$_ => 'Interactive'}
qw/location contact portcontrol portname vlan power/)
};

2
Netdisco/lib/App/Netdisco/Daemon/Worker/Poller.pm
View File

@@ -9,7 +9,7 @@ use Role::Tiny;
use namespace::clean;
# add dispatch methods for poller tasks
with 'App::Netdisco::Daemon::Worker::Poller::Discover';
with 'App::Netdisco::Daemon::Worker::Poller::Device';
sub worker_body {
my $self = shift;

6
Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Discover.pm → Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
View File

@@ -1,4 +1,4 @@
package App::Netdisco::Daemon::Worker::Poller::Discover;
package App::Netdisco::Daemon::Worker::Poller::Device;
use Dancer qw/:moose :syntax :script/;
use Dancer::Plugin::DBIC 'schema';
@@ -6,7 +6,7 @@ use Dancer::Plugin::DBIC 'schema';
use App::Netdisco::Util::SNMP 'snmp_connect';
use App::Netdisco::Util::Device 'get_device';
use App::Netdisco::Util::DiscoverAndStore ':all';
use App::Netdisco::Daemon::Worker::Interactive::Util ':all';
use App::Netdisco::Daemon::Util ':all';
use NetAddr::IP::Lite ':lower';
@@ -53,7 +53,7 @@ sub discover {
# run find_neighbors on all known devices, and run discover on any
# newly found devices.
sub discoverall {
sub discovernew {
my ($self, $job) = @_;
my $devices = schema('netdisco')->resultset('Device')->get_column('ip');

4
Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm
View File

@@ -11,10 +11,10 @@ use namespace::clean;
my $jobactions = {
map {$_ => undef} qw/
refresh
discovernew
/
# saveconfigs
# discoverall
# refresh
# macwalk
# arpwalk
# nbtwalk