Merge branch 'master' of github.com:netdisco/netdisco

This commit is contained in:
Oliver Gorwits
2019-03-15 05:25:58 +00:00
5 changed files with 64 additions and 37 deletions

View File

@@ -100,11 +100,19 @@ sub snmp_comm_reindex {
}
$prefix ||= 'vlan-';
debug
sprintf '[%s] reindexing to "%s%s" (ver: %s, class: %s)',
if ($vlan =~ /^[0-9]+$/i && $vlan) {
debug sprintf '[%s] reindexing to "%s%s" (ver: %s, class: %s)',
$device->ip, $prefix, $vlan, $ver, $snmp->class;
$vlan ? $snmp->update(Context => ($prefix . $vlan))
: $snmp->update(Context => '');
$snmp->update(Context => ($prefix . $vlan));
} elsif ($vlan =~ /^[a-z0-9]+$/i && $vlan) {
debug sprintf '[%s] reindexing to "%s" (ver: %s, class: %s)',
$device->ip, $vlan, $ver, $snmp->class;
$snmp->update(Context => ($vlan));
} else {
debug sprintf '[%s] reindexing without context (ver: %s, class: %s)',
$device->ip, $ver, $snmp->class;
$snmp->update(Context => '');
}
}
else {
my $comm = $snmp->snmp_comm;