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

update undiscovered neighbors and port properties discovery to use remote_is_discoverable

Browse Source
This commit is contained in:
Oliver Gorwits
2022-05-15 23:16:49 +01:00
parent 1a810d89f3
commit e1bfd917a9
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/App/Netdisco/Web/Plugin/AdminTask/UndiscoveredNeighbors.pm
View File

@@ -21,27 +21,15 @@ get '/ajax/content/admin/undiscoveredneighbors' => require_role admin => sub {
= schema('netdisco')->resultset('Virtual::UndiscoveredNeighbors')->hri->all;
return unless scalar @results;
# Don't include devices excluded from discovery by config
my @discoverable_results = ();
foreach my $r (@results) {
# create a new row object to avoid hitting the DB in get_device()
my $dev = schema('netdisco')->resultset('Device')->new({ip => $r->{remote_ip}});
next unless is_discoverable( $dev, $r->{remote_type} );
next if (not setting('discover_waps')) and $r->{remote_is_wap};
next if (not setting('discover_phones')) and $r->{remote_is_phone};
push @discoverable_results, $r;
}
return unless scalar @discoverable_results;
if ( request->is_ajax ) {
template 'ajax/admintask/undiscoveredneighbors.tt',
{ results => \@discoverable_results, },
{ results => \@results, },
{ layout => undef };
}
else {
header( 'Content-Type' => 'text/comma-separated-values' );
template 'ajax/admintask/undiscoveredneighbors_csv.tt',
{ results => \@discoverable_results, },
{ results => \@results, },
{ layout => undef };
}
};