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

#428 Port-Channels not showing in netmap

Browse Source
This commit is contained in:
Oliver Gorwits
2019-03-02 21:54:27 +00:00
parent 5ba5bcd295
commit a643820a62
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
View File

@@ -22,8 +22,8 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
array_agg(dp.port) AS left_port, array_agg(dp.port) AS left_port,
array_agg(dp.name) AS left_descr, array_agg(dp.name) AS left_descr,
count(dpp.*) AS aggports,
sum(COALESCE(dpp.raw_speed, 0)) AS aggspeed, sum(COALESCE(dpp.raw_speed, 0)) AS aggspeed,
count(*) AS aggports,
di.ip AS right_ip, di.ip AS right_ip,
rd.dns AS right_dns, rd.dns AS right_dns,
@@ -32,8 +32,14 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
array_agg(dp2.name) AS right_descr array_agg(dp2.name) AS right_descr
FROM device_port dp FROM device_port dp
LEFT OUTER JOIN device_port_properties dpp USING (ip,
port) LEFT OUTER JOIN device_port_properties dpp ON (
(dp.ip = dpp.ip) AND (dp.port = dpp.port)
AND (dp.type IS NULL
OR dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
AND (dp.is_master = 'false'
OR dp.slave_of IS NOT NULL) )
INNER JOIN device ld ON dp.ip = ld.ip INNER JOIN device ld ON dp.ip = ld.ip
INNER JOIN device_ip di ON dp.remote_ip = di.alias INNER JOIN device_ip di ON dp.remote_ip = di.alias
INNER JOIN device rd ON di.ip = rd.ip INNER JOIN device rd ON di.ip = rd.ip
@@ -45,12 +51,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
WHERE dp.remote_port IS NOT NULL WHERE dp.remote_port IS NOT NULL
AND dp.port !~* 'vlan' AND dp.port !~* 'vlan'
AND (dp.descr IS NULL AND (dp.descr IS NULL OR dp.descr !~* 'vlan')
OR dp.descr !~* 'vlan')
AND (dp.type IS NULL
OR dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
AND (dp.is_master = 'false'
OR dp.slave_of IS NOT NULL)
GROUP BY left_ip, GROUP BY left_ip,
left_dns, left_dns,
@@ -58,6 +59,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
right_ip, right_ip,
right_dns, right_dns,
right_name ) right_name )
SELECT * SELECT *
FROM BothWays b FROM BothWays b
WHERE NOT EXISTS WHERE NOT EXISTS

19
lib/App/Netdisco/Web/Plugin/Device/Neighbors.pm
View File

@@ -125,18 +125,13 @@ sub make_link_infostring {
(my $left_name = lc($link->{left_dns} || $link->{left_name} || $link->{left_ip})) =~ s/$domain$//; (my $left_name = lc($link->{left_dns} || $link->{left_name} || $link->{left_ip})) =~ s/$domain$//;
(my $right_name = lc($link->{right_dns} || $link->{right_name} || $link->{right_ip})) =~ s/$domain$//; (my $right_name = lc($link->{right_dns} || $link->{right_name} || $link->{right_ip})) =~ s/$domain$//;
if ($link->{aggports} == 1) { my @zipped = List::MoreUtils::zip6
return sprintf '<b>%s:%s</b> (%s)<br><b>%s:%s</b> (%s)', @{$link->{left_port}}, @{$link->{left_descr}},
$left_name, $link->{left_port}->[0], @{$link->{right_port}}, @{$link->{right_descr}};
($link->{left_descr}->[0] || 'no description'),
$right_name, $link->{right_port}->[0], return join '<br><br>', map { sprintf '<b>%s:%s</b> (%s)<br><b>%s:%s</b> (%s)',
($link->{right_descr}->[0] || 'no description'); $left_name, $_->[0], ($_->[1] || 'no description'),
} $right_name, $_->[2], ($_->[3] || 'no description') } @zipped;
else {
return sprintf '<b>%s:(%s)</b><br><b>%s:(%s)</b>',
$left_name, join(',', @{$link->{left_port}}),
$right_name, join(',', @{$link->{right_port}});
}
} }
ajax '/ajax/data/device/netmap' => require_login sub { ajax '/ajax/data/device/netmap' => require_login sub {