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

dynamic size in neighbor map should use device_port_properties

Browse Source
This commit is contained in:
Oliver Gorwits
2018-03-10 11:38:41 +00:00
parent 9fa8372685
commit 147ef33d5e
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@@ -13,6 +13,7 @@
[BUG FIXES] [BUG FIXES]
* #274 errors in IP Inventory report * #274 errors in IP Inventory report
* dynamic size in neighbor map should use device_port_properties
2.039015 - 2018-03-05 2.039015 - 2018-03-05

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

@@ -17,7 +17,7 @@ __PACKAGE__->result_source_instance->is_virtual(1);
__PACKAGE__->result_source_instance->view_definition(<<ENDSQL __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
SELECT dp.ip AS left_ip, ld.dns AS left_dns, ld.name AS left_name, SELECT dp.ip AS left_ip, ld.dns AS left_dns, ld.name AS left_name,
array_agg(dp.port) AS left_port, array_agg(dp.name) AS left_descr, array_agg(dp.port) AS left_port, array_agg(dp.name) AS left_descr,
sum( COALESCE(dpp.raw_speed,0) ) as aggspeed, sum( COALESCE(dpp.raw_speed,1) ) as aggspeed,
count(*) AS aggports, count(*) AS aggports,
dp2.ip AS right_ip, rd.dns AS right_dns, rd.name AS right_name, dp2.ip AS right_ip, rd.dns AS right_dns, rd.name AS right_name,
array_agg(dp2.port) AS right_port, array_agg(dp2.name) AS right_descr array_agg(dp2.port) AS right_port, array_agg(dp2.name) AS right_descr

7
lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
View File

@@ -11,12 +11,9 @@ __PACKAGE__->table('device_port_speed');
__PACKAGE__->result_source_instance->is_virtual(1); __PACKAGE__->result_source_instance->is_virtual(1);
__PACKAGE__->result_source_instance->view_definition(<<ENDSQL __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
SELECT ip, SELECT ip,
sum(btrim(speed, ' MGTbps')::float * sum( COALESCE(dpp.raw_speed,1) ) as total
(CASE btrim(speed, ' 0123456789.')
WHEN 'Gbps' THEN 1000
WHEN 'Tbps' THEN 1000000
ELSE 1 END)) AS total
FROM device_port FROM device_port
LEFT OUTER JOIN device_port_properties dpp USING (ip, port)
WHERE type = 'ethernetCsmacd' WHERE type = 'ethernetCsmacd'
AND speed LIKE '%bps' AND speed LIKE '%bps'
GROUP BY ip GROUP BY ip