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

use new faster portvlanmismatch query without duplication

Browse Source
This commit is contained in:
Oliver Gorwits
2023-06-13 17:40:27 +01:00
parent 460b014e91
commit f14e495e49
3 changed files with 126 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,53 +8,104 @@ __PACKAGE__->table_class('DBIx::Class::ResultSource::View');
__PACKAGE__->table('port_vlan_mismatch'); __PACKAGE__->table('port_vlan_mismatch');
__PACKAGE__->result_source_instance->is_virtual(1); __PACKAGE__->result_source_instance->is_virtual(1);
my $all_vlans = qq/ __PACKAGE__->result_source_instance->view_definition(<<'ENDSQL');
SELECT ip, port,
array_to_string(array_agg( CASE WHEN native THEN 'n:' || vlan::text SELECT ips[1] AS left_ip,
ELSE vlan::text END ld.dns AS left_dns,
ORDER BY vlan ASC ), ', ') AS vlist ports[1] AS left_port,
FROM (SELECT ip, port, native, vlan FROM device_port_vlan UNION port_descr[1] AS left_port_descr,
SELECT dp.ip, dp.port, false, dp2v.vlan
FROM device_port dp (SELECT array_agg(a) FROM jsonb_array_elements_text(vlans->0) AS a) AS left_vlans,
LEFT JOIN device_port dp2 ON (dp.ip = dp2.ip and dp.port = dp2.slave_of) (SELECT array_agg(a)
LEFT JOIN device_port_vlan dp2v ON (dp2.ip = dp2v.ip and dp2.port = dp2v.port) FROM jsonb_array_elements_text(vlans->0) AS a
WHERE dp.has_subinterfaces) alldpv WHERE a NOT IN
WHERE vlan::text NOT IN (?, ?, ?, ?) GROUP BY ip, port (SELECT b FROM jsonb_array_elements_text(vlans->1) AS b)) as only_left_vlans,
/;
__PACKAGE__->result_source_instance->view_definition(" ips[2] AS right_ip,
SELECT CASE WHEN length(ld.dns) > 0 THEN ld.dns ELSE host(ld.ip) END AS left_device, rd.dns AS right_dns,
ld.name AS left_name, ports[2] AS right_port,
lp.port AS left_port, port_descr[2] AS right_port_descr,
lp.name AS left_portname,
(SELECT vlist FROM ($all_vlans) a0 WHERE ip=lp.ip AND port=lp.port) AS left_vlans, (SELECT array_agg(a) FROM jsonb_array_elements_text(vlans->1) AS a) AS right_vlans,
CASE WHEN length(rd.dns) > 0 THEN rd.dns ELSE host(rd.ip) END AS right_device, (SELECT array_agg(a)
rd.name AS right_name, FROM jsonb_array_elements_text(vlans->1) AS a
rp.port AS right_port, WHERE a NOT IN
rp.name AS right_portname, (SELECT b FROM jsonb_array_elements_text(vlans->0) AS b)) as only_right_vlans,
(SELECT vlist FROM ($all_vlans) a1 WHERE ip=rp.ip AND port=rp.port) AS right_vlans
FROM device ld CASE WHEN (jsonb_array_length(vlans->0) = 1 AND jsonb_array_length(vlans->1) = 1
JOIN device_port lp USING (ip) AND position('n:' in vlans->0->>0) = 1 AND position('n:' in vlans->1->>0) = 1)
JOIN device_port rp ON lp.remote_ip=rp.ip AND lp.remote_port=rp.port THEN true ELSE false END AS native_translated
JOIN device rd ON rp.ip=rd.ip
WHERE ld.ip < rd.ip AND FROM (
(SELECT vlist FROM ($all_vlans) a2 WHERE ip=lp.ip AND port=lp.port) SELECT array_agg(ip) AS ips,
!= array_agg(port) AS ports,
(SELECT vlist FROM ($all_vlans) a3 WHERE ip=rp.ip AND port=rp.port) array_agg(port_descr) AS port_descr,
ORDER BY left_device, left_port jsonb_agg(DISTINCT vlist) AS vlans
");
FROM (
SELECT alldpv.ip,
alldpv.port,
alldpv.port_descr,
jsonb_agg( CASE WHEN native THEN 'n:' || vlan::text ELSE vlan::text END ORDER BY vlan ASC )
FILTER (WHERE vlan IS NOT NULL) AS vlist,
-- create a key for each port allowing pairs of ports to be matched
CASE WHEN alldpv.ip <= alldpv.remote_ip THEN host(alldpv.ip)::text || '!' || alldpv.port::text
ELSE host(alldpv.remote_ip)::text || '!' || alldpv.remote_port::text END AS lowport
FROM (
SELECT dpv.ip, dpv.port, dp.name as port_descr, dpv.native, dip.ip AS remote_ip, dp.remote_port, dpv.vlan
FROM device_port_vlan dpv
LEFT JOIN device_port dp
ON dpv.ip = dp.ip AND dpv.port = dp.port
LEFT JOIN device_ip dip
ON dp.remote_ip = dip.alias
UNION
SELECT dp2.ip, dp2.port, dp2.name AS port_descr, false, dip2.ip AS remote_ip, dp2.remote_port, dpv2.vlan
FROM device_port dp2
LEFT JOIN device_port dp3
ON dp2.ip = dp3.ip AND dp2.port = dp3.slave_of AND dp2.has_subinterfaces
LEFT JOIN device_port_vlan dpv2
ON dp3.ip = dpv2.ip AND dp3.port = dpv2.port
LEFT JOIN device_ip dip2
ON dp2.remote_ip = dip2.alias
) alldpv
WHERE vlan NOT IN ( ?, ?, ?, ? ) AND remote_ip IS NOT NULL
GROUP BY ip, port, port_descr, remote_ip, remote_port
) ports_with_vlans
GROUP BY lowport
) pairs_of_ports
LEFT JOIN device ld ON ips[1] = ld.ip
LEFT JOIN device rd ON ips[2] = rd.ip
WHERE jsonb_array_length(vlans) > 1
ORDER BY left_ip, left_port
ENDSQL
__PACKAGE__->add_columns( __PACKAGE__->add_columns(
'left_device' => { data_type => 'text' }, 'left_ip' => { data_type => 'text' },
'left_name' => { data_type => 'text' }, 'left_dns' => { data_type => 'text' },
'left_port' => { data_type => 'text' }, 'left_port' => { data_type => 'text' },
'left_portname' => { data_type => 'text' }, 'left_port_descr' => { data_type => 'text' },
'left_vlans' => { data_type => 'text' }, 'left_vlans' => { data_type => 'text[]' },
'only_left_vlans' => { data_type => 'text[]' },
'right_device' => { data_type => 'text' }, 'right_ip' => { data_type => 'text' },
'right_name' => { data_type => 'text' }, 'right_dns' => { data_type => 'text' },
'right_port' => { data_type => 'text' }, 'right_port' => { data_type => 'text' },
'right_portname' => { data_type => 'text' }, 'right_port_descr' => { data_type => 'text' },
'right_vlans' => { data_type => 'text' }, 'right_vlans' => { data_type => 'text[]' },
'only_right_vlans' => { data_type => 'text[]' },
); );
1; 1;

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

@@ -21,24 +21,29 @@ get '/ajax/content/report/portvlanmismatch' => require_login sub {
my @results = schema(vars->{'tenant'}) my @results = schema(vars->{'tenant'})
->resultset('Virtual::PortVLANMismatch')->search({},{ ->resultset('Virtual::PortVLANMismatch')->search({},{
bind => [ setting('sidebar_defaults')->{'device_ports'}->{'p_hide1002'}->{'default'} bind => [ setting('sidebar_defaults')->{'device_ports'}->{'p_hide1002'}->{'default'}
? (1002, 1003, 1004, 1005, 1002, 1003, 1004, 1005, 1002, 1003, 1004, 1005, 1002, 1003, 1004, 1005) : (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) ], ? (1002, 1003, 1004, 1005) : (0, 0, 0, 0) ],
}) })
->hri->all; ->hri->all;
# note that the generated list is rendered without HTML escape, # # note that the generated list is rendered without HTML escape,
# so we MUST sanitise here with the grep # # so we MUST sanitise here with the grep
# foreach my $res (@results) {
# my @left = grep {m/^(?:n:)?\d+$/} map {s/\s//g; $_} split ',', $res->{left_vlans};
# my @right = grep {m/^(?:n:)?\d+$/} map {s/\s//g; $_} split ',', $res->{right_vlans};
#
# my %new = (0 => [], 1 => []);
# my %cmp = listcmp @left, @right;
# foreach my $vlan (keys %cmp) {
# map { push @{ $new{$_} }, ( (2 == scalar @{ $cmp{$vlan} }) ? $vlan : "<strong>$vlan</strong>" ) } @{ $cmp{$vlan} };
# }
#
# $res->{left_vlans} = join ', ', sort_by { (my $a = $_) =~ s/\D//g; sprintf "%05d", $a } @{ $new{0} };
# $res->{right_vlans} = join ', ', sort_by { (my $a = $_) =~ s/\D//g; sprintf "%05d", $a } @{ $new{1} };
# }
foreach my $res (@results) { foreach my $res (@results) {
my @left = grep {m/^(?:n:)?\d+$/} map {s/\s//g; $_} split ',', $res->{left_vlans}; $res->{only_left_vlans} = join ', ', @{ $res->{only_left_vlans} || [] };
my @right = grep {m/^(?:n:)?\d+$/} map {s/\s//g; $_} split ',', $res->{right_vlans}; $res->{only_right_vlans} = join ', ', @{ $res->{only_right_vlans} || [] };
my %new = (0 => [], 1 => []);
my %cmp = listcmp @left, @right;
foreach my $vlan (keys %cmp) {
map { push @{ $new{$_} }, ( (2 == scalar @{ $cmp{$vlan} }) ? $vlan : "<strong>$vlan</strong>" ) } @{ $cmp{$vlan} };
}
$res->{left_vlans} = join ', ', sort_by { (my $a = $_) =~ s/\D//g; sprintf "%05d", $a } @{ $new{0} };
$res->{right_vlans} = join ', ', sort_by { (my $a = $_) =~ s/\D//g; sprintf "%05d", $a } @{ $new{1} };
} }
if (request->is_ajax) { if (request->is_ajax) {

24
share/views/ajax/report/portvlanmismatch.tt
View File

@@ -3,10 +3,10 @@
<tr> <tr>
<th>Left Device</th> <th>Left Device</th>
<th>Left Port</th> <th>Left Port</th>
<th>Left VLANs</th> <th>Only Left VLANs</th>
<th>Right Device</th> <th>Right Device</th>
<th>Right Port</th> <th>Right Port</th>
<th>Right VLANs</th> <th>Only Right VLANs</th>
</tr> </tr>
</thead> </thead>
</table> </table>
@@ -18,35 +18,35 @@ $(document).ready(function() {
"data": [% results | none %], "data": [% results | none %],
"columns": [ "columns": [
{ {
"data": 'left_device', "data": 'left_ip',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>' return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>'
+ '<br />' + he.encode(row.left_name || ''); } + '<br />' + he.encode(row.left_dns || ''); }
}, { }, {
"data": 'left_port', "data": 'left_port',
"type": 'portsort', "type": 'portsort',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return type === 'display' ? return type === 'display' ?
'<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.left_device) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>' '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.left_ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>'
+ '<br />' + he.encode(row.left_portname || '') + '<br />' + he.encode(row.left_port_descr || '')
: he.encode(data || ''); } : he.encode(data || ''); }
}, { }, {
"data": 'left_vlans' "data": 'only_left_vlans'
}, { }, {
"data": 'right_device', "data": 'right_ip',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>' return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>'
+ '<br />' + he.encode(row.right_name || ''); } + '<br />' + he.encode(row.right_dns || ''); }
}, { }, {
"data": 'right_port', "data": 'right_port',
"type": 'portsort', "type": 'portsort',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return type === 'display' ? return type === 'display' ?
'<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.right_device) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>' '<a href="[% device_ports | none %]&q=' + encodeURIComponent(row.right_ip) + '&f=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>'
+ '<br />' + he.encode(row.right_portname || '') + '<br />' + he.encode(row.right_port_descr || '')
: he.encode(data || ''); } : he.encode(data || ''); }
}, { }, {
"data": 'right_vlans' "data": 'only_right_vlans'
} }
], ],
[% INCLUDE 'ajax/datatabledefaults.tt' -%] [% INCLUDE 'ajax/datatabledefaults.tt' -%]