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

Do not attempt Canonical IP change to non-discoverable IP [skip ci]

Browse Source
This commit is contained in:
Oliver Gorwits
2018-02-01 15:32:35 +00:00
parent 3efaebdae1
commit 1f1af381fb
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Changes
View File

@@ -4,6 +4,10 @@
* #332 Autodiscovery via BGP and OSPF peers * #332 Autodiscovery via BGP and OSPF peers
[ENHANCEMENTS]
* Do not attempt Canonical IP change to non-discoverable IP
2.038034 - 2018-01-31 2.038034 - 2018-01-31
[NEW FEATURES] [NEW FEATURES]

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

@@ -7,6 +7,7 @@ use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::SNMP (); use App::Netdisco::Transport::SNMP ();
use App::Netdisco::Util::Permission 'check_acl_only'; use App::Netdisco::Util::Permission 'check_acl_only';
use App::Netdisco::Util::DNS 'ipv4_from_hostname'; use App::Netdisco::Util::DNS 'ipv4_from_hostname';
use App::Netdisco::Util::Device 'is_discoverable';
use Dancer::Plugin::DBIC 'schema'; use Dancer::Plugin::DBIC 'schema';
register_worker({ phase => 'main', driver => 'snmp' }, sub { register_worker({ phase => 'main', driver => 'snmp' }, sub {
@@ -46,6 +47,12 @@ 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 (not is_discoverable( $alias->alias )) {
debug sprintf ' [%s] device - cannot renumber to %s - not discoverable',
$old_ip, $alias->alias;
next;
}
if (App::Netdisco::Transport::SNMP->test_connection( $alias->alias )) { if (App::Netdisco::Transport::SNMP->test_connection( $alias->alias )) {
$new_ip = $alias->alias; $new_ip = $alias->alias;
last ALIAS; last ALIAS;