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

make device_auth have driver setting for snmp entries

Browse Source
This commit is contained in:
Oliver Gorwits
2017-10-08 18:40:02 +01:00
parent 460c0c0ee9
commit dfeb9d9ddc
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/App/Netdisco/Util/SNMP.pm
View File

@@ -80,6 +80,12 @@ sub fixup_device_auth {
community => $_, community => $_,
}} @{setting('community_rw') || []}; }} @{setting('community_rw') || []};
foreach my $stanza (@new_stanzas) {
$stanza->{driver} ||= 'snmp'
if exists $stanza->{community}
or exists $stanza->{user};
}
return @new_stanzas; return @new_stanzas;
} }
@@ -109,20 +115,26 @@ sub get_communities {
if ($device->in_storage and $stored_tag) { if ($device->in_storage and $stored_tag) {
foreach my $stanza (@$config) { foreach my $stanza (@$config) {
if ($stanza->{tag} and $stored_tag eq $stanza->{tag}) { if ($stanza->{tag} and $stored_tag eq $stanza->{tag}) {
push @communities, $stanza; push @communities, {%$stanza, only => [$device->ip]};
last; last;
} }
} }
} }
# try last-known-good v2 read # try last-known-good v2 read
push @communities, {read => 1, community => $device->snmp_comm} push @communities, {
if defined $device->snmp_comm and $mode eq 'read'; read => 1, write => 0, driver => 'snmp',
only => [$device->ip],
community => $device->snmp_comm,
} if defined $device->snmp_comm and $mode eq 'read';
# try last-known-good v2 write # try last-known-good v2 write
my $snmp_comm_rw = eval { $device->community->snmp_comm_rw }; my $snmp_comm_rw = eval { $device->community->snmp_comm_rw };
push @communities, {write => 1, community => $snmp_comm_rw} push @communities, {
if $snmp_comm_rw and $mode eq 'write'; write => 1, read => 0, driver => 'snmp',
only => [$device->ip],
community => $snmp_comm_rw,
} if $snmp_comm_rw and $mode eq 'write';
# clean the community table of obsolete tags # clean the community table of obsolete tags
eval { $device->community->update({$tag_name => undef}) } eval { $device->community->update({$tag_name => undef}) }
@@ -151,6 +163,7 @@ sub _get_external_community {
if (length $1 and $mode eq 'read') { if (length $1 and $mode eq 'read') {
return map {{ return map {{
read => 1, read => 1,
only => [$device->ip],
community => $_, community => $_,
}} split(m/\s*,\s*/,$1); }} split(m/\s*,\s*/,$1);
} }
@@ -159,6 +172,7 @@ sub _get_external_community {
if (length $1 and $mode eq 'write') { if (length $1 and $mode eq 'write') {
return map {{ return map {{
write => 1, write => 1,
only => [$device->ip],
community => $_, community => $_,
}} split(m/\s*,\s*/,$1); }} split(m/\s*,\s*/,$1);
} }