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

remove OSPF from canonical IP selection; add release notes

Browse Source
This commit is contained in:
Oliver Gorwits
2015-04-28 08:14:47 +01:00
parent c0d81cf1ef
commit 05dc8ff32f
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Netdisco/lib/App/Netdisco/Core/Discover.pm
View File

@@ -52,13 +52,8 @@ sub set_canonical_ip {
my $old_ip = $device->ip; my $old_ip = $device->ip;
my $new_ip = $old_ip; my $new_ip = $old_ip;
my $ospf_ip = $snmp->root_ip;
my $revname = ipv4_from_hostname($snmp->name); my $revname = ipv4_from_hostname($snmp->name);
if ($ospf_ip) {
$new_ip = $ospf_ip;
}
if (setting('reverse_sysname') and $revname) { if (setting('reverse_sysname') and $revname) {
$new_ip = $revname; $new_ip = $revname;
} }

20
Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod
View File

@@ -36,6 +36,26 @@ but they are backwards compatible.
=back =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<reverse_sysname> tells
Netdisco to take the SNMP System Name and do a reverse DNS lookup for the
canonical IP. The new configuration setting C<device_identity> 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<device_identity> to control the canonical IP/name for classes of device
based on model/vendor, etc.
=head1 2.032000 =head1 2.032000
=head2 General Notices =head2 General Notices