diff --git a/Netdisco/lib/App/Netdisco/Core/Discover.pm b/Netdisco/lib/App/Netdisco/Core/Discover.pm index a5a4938a..2e27ae4e 100644 --- a/Netdisco/lib/App/Netdisco/Core/Discover.pm +++ b/Netdisco/lib/App/Netdisco/Core/Discover.pm @@ -52,13 +52,8 @@ sub set_canonical_ip { my $old_ip = $device->ip; my $new_ip = $old_ip; - my $ospf_ip = $snmp->root_ip; my $revname = ipv4_from_hostname($snmp->name); - if ($ospf_ip) { - $new_ip = $ospf_ip; - } - if (setting('reverse_sysname') and $revname) { $new_ip = $revname; } diff --git a/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod b/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod index b074764c..2aa78483 100644 --- a/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod +++ b/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod @@ -36,6 +36,26 @@ but they are backwards compatible. =back +=head1 2.033000 + +=head2 General Notices + +The algorithm for selecting the canonical IP/name of a device has changed in +this release. No longer is the OSPF Router ID taken into account. The default +IP/name of a device will be either the IP specified for manual discovery, or +the IP reported to a neighbor port during automatic discovery. For the latter +you can often influence this through device configuration (LLDP advertise...). + +Via configuration there are two further settings. C tells +Netdisco to take the SNMP System Name and do a reverse DNS lookup for the +canonical IP. The new configuration setting C allows you to +set rules for picking the canonical interface from a device based on any of +its properties (model, vendor, OS, OS version, etc). + +Typical use would be either to leave Netdisco to use the discovered IP, or use +C to control the canonical IP/name for classes of device +based on model/vendor, etc. + =head1 2.032000 =head2 General Notices