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

#900 make Port VLAN mismatch respect p_hide1002 setting

Browse Source
This commit is contained in:
Oliver Gorwits
2022-08-03 10:25:23 +01:00
parent 3d81f3e5f6
commit b40c30606e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/DB/Result/Virtual/PortVLANMismatch.pm
View File

@@ -20,7 +20,7 @@ __PACKAGE__->result_source_instance->view_definition(<<'ENDSQL');
LEFT JOIN device_port dp2 ON (dp.ip = dp2.ip and dp.port = dp2.slave_of) LEFT JOIN device_port dp2 ON (dp.ip = dp2.ip and dp.port = dp2.slave_of)
LEFT JOIN device_port_vlan dp2v ON (dp2.ip = dp2v.ip and dp2.port = dp2v.port) LEFT JOIN device_port_vlan dp2v ON (dp2.ip = dp2v.ip and dp2.port = dp2v.port)
WHERE dp.has_subinterfaces) alldpv WHERE dp.has_subinterfaces) alldpv
WHERE vlan NOT IN (1002, 1003, 1004, 1005) GROUP BY ip, port) WHERE vlan::text NOT IN (?, ?, ?, ?) GROUP BY ip, port)
SELECT CASE WHEN length(ld.dns) > 0 THEN ld.dns ELSE host(ld.ip) END AS left_device, SELECT CASE WHEN length(ld.dns) > 0 THEN ld.dns ELSE host(ld.ip) END AS left_device,
lp.port AS left_port, lp.port AS left_port,

7
lib/App/Netdisco/Web/Plugin/Report/PortVLANMismatch.pm
View File

@@ -17,7 +17,12 @@ register_report(
get '/ajax/content/report/portvlanmismatch' => require_login sub { get '/ajax/content/report/portvlanmismatch' => require_login sub {
return unless schema('netdisco')->resultset('Device')->count; return unless schema('netdisco')->resultset('Device')->count;
my @results = schema('netdisco')->resultset('Virtual::PortVLANMismatch')->hri->all; my @results = schema('netdisco')
->resultset('Virtual::PortVLANMismatch')->search({},{
bind => [ setting('sidebar_defaults')->{'device_ports'}->{'p_hide1002'}->{'default'}
? (1002, 1003, 1004, 1005) : (0, 0, 0, 0) ],
})
->hri->all;
if (request->is_ajax) { if (request->is_ajax) {
my $json = to_json (\@results); my $json = to_json (\@results);