replace unicode nonbreaking space with ascii space (#794)
This commit is contained in:
@@ -43,7 +43,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
|
||||
next unless ref {} eq ref $map;
|
||||
|
||||
foreach my $key (sort keys %$map) {
|
||||
# lhs matches device, rhs matches device_ip
|
||||
# lhs matches device, rhs matches device_ip
|
||||
if (check_acl_only($device, $key)
|
||||
and check_acl_only($alias, $map->{$key})) {
|
||||
|
||||
@@ -64,7 +64,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
|
||||
}
|
||||
}
|
||||
}
|
||||
} # ALIAS
|
||||
} # ALIAS
|
||||
}
|
||||
|
||||
return if $new_ip eq $old_ip;
|
||||
|
||||
@@ -104,7 +104,7 @@ sub store_neighbors {
|
||||
my @to_discover = ();
|
||||
|
||||
my $snmp = App::Netdisco::Transport::SNMP->reader_for($device)
|
||||
or return (); # already checked!
|
||||
or return (); # already checked!
|
||||
|
||||
# first allow any manually configured topology to be set
|
||||
# and do this before we cache the rows in vars->{'device_ports'}
|
||||
@@ -127,14 +127,14 @@ sub store_neighbors {
|
||||
{ map {($_->port => $_)} $device->ports->reset->all };
|
||||
my $device_ports = vars->{'device_ports'};
|
||||
|
||||
# v4 and v6 neighbor tables
|
||||
# v4 and v6 neighbor tables
|
||||
my $c_ip = ($snmp->c_ip || {});
|
||||
my %c_ipv6 = %{ ($snmp->can('hasLLDP') and $snmp->hasLLDP)
|
||||
? ($snmp->lldp_ipv6 || {}) : {} };
|
||||
|
||||
# remove keys with undef values, as c_ip does
|
||||
# remove keys with undef values, as c_ip does
|
||||
delete @c_ipv6{ grep { not defined $c_ipv6{$_} } keys %c_ipv6 };
|
||||
# now combine them, v6 wins
|
||||
# now combine them, v6 wins
|
||||
$c_ip = { %$c_ip, %c_ipv6 };
|
||||
|
||||
foreach my $entry (sort (List::MoreUtils::uniq( keys %$c_ip ))) {
|
||||
|
||||
@@ -71,11 +71,11 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
|
||||
}
|
||||
}
|
||||
|
||||
# support for Hooks
|
||||
# support for Hooks
|
||||
vars->{'hook_data'} = { $device->get_columns };
|
||||
delete vars->{'hook_data'}->{'snmp_comm'}; # for privacy
|
||||
delete vars->{'hook_data'}->{'snmp_comm'}; # for privacy
|
||||
|
||||
# support for new_device Hook
|
||||
# support for new_device Hook
|
||||
vars->{'new_device'} = 1 if not $device->in_storage;
|
||||
|
||||
schema('netdisco')->txn_do(sub {
|
||||
@@ -156,7 +156,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
|
||||
push @$resolved_aliases, { alias => $device->ip, dns => $device->dns }
|
||||
if 0 == scalar grep {$_->{alias} eq $device->ip} @aliases;
|
||||
|
||||
# support for Hooks
|
||||
# support for Hooks
|
||||
vars->{'hook_data'}->{'device_ips'} = $resolved_aliases;
|
||||
|
||||
schema('netdisco')->txn_do(sub {
|
||||
@@ -308,7 +308,7 @@ register_worker({ phase => 'early', driver => 'snmp' }, sub {
|
||||
$interfaces{$master}->{is_master} = 'true';
|
||||
}
|
||||
|
||||
# support for Hooks
|
||||
# support for Hooks
|
||||
vars->{'hook_data'}->{'ports'} = [values %interfaces];
|
||||
|
||||
schema('netdisco')->resultset('DevicePort')->txn_do_locked(sub {
|
||||
|
||||
@@ -124,7 +124,7 @@ register_worker({ phase => 'main', driver => 'snmp' }, sub {
|
||||
};
|
||||
}
|
||||
|
||||
# support for Hooks
|
||||
# support for Hooks
|
||||
vars->{'hook_data'}->{'vlans'} = \@devicevlans;
|
||||
|
||||
schema('netdisco')->txn_do(sub {
|
||||
|
||||
@@ -12,7 +12,7 @@ register_worker({ phase => 'main' }, sub {
|
||||
my $device = $job->device;
|
||||
|
||||
# if requested, and the device has not yet been
|
||||
# arpniped/macsucked, queue those jobs now
|
||||
# arpniped/macsucked, queue those jobs now
|
||||
return unless $device->in_storage and $job->subaction eq 'with-nodes';
|
||||
|
||||
if (!defined $device->last_macsuck and $device->has_layer(2)) {
|
||||
|
||||
Reference in New Issue
Block a user