mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Port Channels take 2 (#16246)

Browse Source 
* Resubmit of #16227

* Add missing new files
This commit is contained in:
Tony Murray
2024-07-26 08:45:34 -05:00
committed by GitHub
parent e45dd59f77
commit b41d1b7ffb
20 changed files with 749 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Device/Tabs/PortsController.php
View File

@@ -41,7 +41,7 @@ use LibreNMS\Interfaces\UI\DeviceTab;
class PortsController implements DeviceTab
{
private bool $detail = false;
private bool $detail = true;
private array $settings = [];
private array $defaults = [
'perPage' => 32,
@@ -121,6 +121,8 @@ class PortsController implements DeviceTab
$relationships[] = 'pseudowires.endpoints';
$relationships[] = 'ipv4Networks.ipv4';
$relationships[] = 'ipv6Networks.ipv6';
$relationships['stackParent'] = fn ($q) => $q->select('port_id');
$relationships['stackChildren'] = fn ($q) => $q->select('port_id');
}
/** @var Collection<Port>|LengthAwarePaginator<Port> $ports */
@@ -205,17 +207,13 @@ class PortsController implements DeviceTab
}
// port stack
// fa-expand portlink: local is low port
// fa-compress portlink: local is high portPort
$stacks = \DB::table('ports_stack')->where('device_id', $port->device_id)
->where(fn ($q) => $q->where('port_id_high', $port->port_id)->orWhere('port_id_low', $port->port_id))->get();
foreach ($stacks as $stack) {
if ($stack->port_id_low) {
$this->addPortNeighbor($neighbors, 'stack_low', $stack->port_id_low);
}
if ($stack->port_id_high) {
$this->addPortNeighbor($neighbors, 'stack_high', $stack->port_id_high);
}
// fa-expand stack_parent: local is a child port
// fa-compress stack_child: local is a parent port
foreach ($port->stackParent as $stackParent) {
$this->addPortNeighbor($neighbors, 'stack_parent', $stackParent->port_id);
}
foreach ($port->stackChildren as $stackChild) {
$this->addPortNeighbor($neighbors, 'stack_child', $stackChild->port_id);
}
// PAGP members/parent