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

change noop to info, and some fixes

Browse Source
This commit is contained in:
Oliver Gorwits
2017-11-25 12:29:08 +00:00
parent de594c647f
commit 26b4bdb907
16 changed files with 54 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/Worker/Plugin/Arpnip/Subnets.pm
View File

@@ -24,7 +24,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
my $now = 'to_timestamp('. (join '.', gettimeofday) .')';
store_subnet($_, $now) for @subnets;
return Status->noop(sprintf ' [%s] arpnip - processed %s Subnet entries',
return Status->info(sprintf ' [%s] arpnip - processed %s Subnet entries',
$device->ip, scalar @subnets);
});

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

@@ -76,7 +76,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
schema('netdisco')->resultset('Admin')
->find({job => $job->id})->update({device => $new_ip});
return Status->noop(sprintf ' [%s] device - changed IP to %s (%s)',
return Status->info(sprintf ' [%s] device - changed IP to %s (%s)',
$old_ip, $device->ip, ($device->dns || ''));
});
});

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

@@ -41,7 +41,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
});
});
return Status->noop(
return Status->info(
sprintf ' [%s] modules - 0 chassis components (added one pseudo for chassis)',
$device->ip);
}
@@ -87,7 +87,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
$device->ip, $gone;
$device->modules->populate(\@modules);
return Status->noop(sprintf ' [%s] modules - added %d new chassis modules',
return Status->info(sprintf ' [%s] modules - added %d new chassis modules',
$device->ip, scalar @modules);
});
});

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

@@ -67,6 +67,9 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
($remote_id ? (device_key => $remote_id) : ()),
});
}
return Status->info(sprintf ' [%s] neigh - processed %s neighbors',
$device->ip, scalar @to_discover);
});
=head2 store_neighbors( $device )

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

@@ -19,7 +19,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
my $p_status = $snmp->peth_power_status;
if (!defined $p_watts) {
return Status->noop(sprintf ' [%s] power - 0 power modules', $device->ip);
return Status->info(sprintf ' [%s] power - 0 power modules', $device->ip);
}
# build device module power info suitable for DBIC
@@ -73,7 +73,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
$device->ip, $gone;
$device->powered_ports->populate(\@portpower);
return Status->noop(sprintf ' [%s] power - added %d new PoE capable ports',
return Status->info(sprintf ' [%s] power - added %d new PoE capable ports',
$device->ip, scalar @portpower);
});
});

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

@@ -237,7 +237,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
$device->update_or_insert(undef, {for => 'update'});
$device->ports->populate([values %interfaces]);
return Status->noop(sprintf ' [%s] interfaces - added %d new interfaces',
return Status->info(sprintf ' [%s] interfaces - added %d new interfaces',
$device->ip, scalar values %interfaces);
});
});

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

@@ -87,7 +87,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
$device->ip, $gone;
$device->port_vlans->populate(\@portvlans);
return Status->noop(sprintf ' [%s] vlans - added %d new port VLANs',
return Status->info(sprintf ' [%s] vlans - added %d new port VLANs',
$device->ip, scalar @portvlans);
});
});

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

@@ -77,7 +77,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
$device->ip, $gone;
$device->wireless_ports->populate(\@channels);
return Status->noop(sprintf ' [%s] wireless - added %d new wireless channels',
return Status->info(sprintf ' [%s] wireless - added %d new wireless channels',
$device->ip, scalar @channels);
});
});

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

@@ -33,6 +33,8 @@ register_worker({ phase => 'main' }, sub {
userip => $job->userip,
});
}
return Status->info("Queued macsuck and arpnip for $device.");
});
true;

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

@@ -20,14 +20,8 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
my $cd11_txrate = $snmp->cd11_txrate;
return unless $cd11_txrate and scalar keys %$cd11_txrate;
if (setting('store_wireless_clients')) {
debug sprintf ' [%s] macsuck - gathering wireless client info',
$device->ip;
}
else {
return Status->noop(sprintf ' [%s] macsuck - dot11 info available but skipped due to config',
$device->ip);
}
return Status->info(sprintf ' [%s] macsuck - dot11 info available but skipped due to config',
$device->ip) unless setting('store_wireless_clients');
my $cd11_rateset = $snmp->cd11_rateset();
my $cd11_uptime = $snmp->cd11_uptime();
@@ -77,6 +71,9 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
});
});
}
return Status->info(sprintf ' [%s] macsuck - processed %s wireless nodes',
$device->ip, scalar keys %{ $cd11_txrate });
});
true;

4
lib/App/Netdisco/Worker/Plugin/Vlan/Core.pm
View File

@@ -1,4 +1,4 @@
package App::Netdisco::Worker::Plugin::Vlan::Native;
package App::Netdisco::Worker::Plugin::Vlan::Core;
use Dancer ':syntax';
use App::Netdisco::Worker::Plugin;
@@ -18,7 +18,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
vars->{'iid'} = get_iid($snmp, vars->{'port'})
or return Status->error("Failed to get port ID for [$pn] from $device");
return Status->noop("Vlan set can continue.");
return Status->info("Vlan set can continue.");
});
register_worker({ phase => 'main', driver => 'snmp' }, sub {