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

Merge branch 'master' into og-remoteport-fix

Browse Source
This commit is contained in:
Oliver Gorwits
2018-04-08 13:13:04 +01:00
parent 7a481282c0 8e30dec24f
commit 60e22dda3c
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
AND dp.port !~* 'vlan' AND dp.port !~* 'vlan'
AND (dp.type IS NULL OR dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$') AND (dp.type IS NULL OR dp.type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
AND (dp.name IS NULL OR dp.name !~* 'vlan') AND (dp.name IS NULL OR dp.name !~* 'vlan')
AND (dp.is_master = 'false' OR dp.slave_of IS NOT NULL)
AND dp.ip <= di.ip AND dp.ip <= di.ip
GROUP BY left_ip, left_dns, left_name, right_ip, right_dns, right_name GROUP BY left_ip, left_dns, left_name, right_ip, right_dns, right_name
ORDER BY dp.ip ORDER BY dp.ip

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

@@ -11,12 +11,13 @@ __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( COALESCE(dpp.raw_speed,1) ) as total GREATEST(1, sum( COALESCE(dpp.raw_speed,1) )) as total
FROM device_port FROM device_port
LEFT OUTER JOIN device_port_properties dpp USING (ip, port) LEFT OUTER JOIN device_port_properties dpp USING (ip, port)
WHERE port !~* 'vlan' WHERE port !~* 'vlan'
AND (type IS NULL OR type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$') AND (type IS NULL OR type !~* '^(53|ieee8023adLag|propVirtual|l2vlan|l3ipvlan|135|136|137)\$')
AND (name IS NULL OR name !~* 'vlan') AND (name IS NULL OR name !~* 'vlan')
AND (is_master = 'false' OR slave_of IS NOT NULL)
GROUP BY ip GROUP BY ip
ORDER BY total DESC, ip ASC ORDER BY total DESC, ip ASC
ENDSQL ENDSQL

2
lib/App/Netdisco/Util/Node.pm
View File

@@ -65,6 +65,8 @@ MAC address does not belong to an interface on any known Device
sub check_mac { sub check_mac {
my ($device, $node, $port_macs) = @_; my ($device, $node, $port_macs) = @_;
return 0 if !$device or !$node;
my $mac = NetAddr::MAC->new(mac => $node); my $mac = NetAddr::MAC->new(mac => $node);
my $devip = (ref $device ? $device->ip : ''); my $devip = (ref $device ? $device->ip : '');
$port_macs ||= {}; $port_macs ||= {};