mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Stp module rewrite (#13570)
* STP module rewrite WIP * Finish rewrite * Ignore disabled and log root/topology changes * Remove interfaces for now * fix style * Lint fixes * Document ResolvesPortIds and hide map functions * whitespace fixes * Revert to stpInstances in case someone writes mstp support * missed one * phpstan fixes * Handle table and oids separately * forgot to register observer * Test data and correct non-table handling in SnmpResponse->table() * update test * test data * revert aos7 silly things * minimal polling * Update test data * order ports_ntp and rename new field to port_index * forgot the db_schema * revert ciena-sds port things * MSTP support, maybe * Adding test data * Filter bad lines instead of discarding the entire snmp response and capture fixes and test data * fresh data * add os data * update data, ignore unfound ports, obviously bad device implementation. * fixes * Ignore context files in os detection test * Remove empty table data * add ciena-sds vlan * designatedCost column is too small * Update stp webui * Refactor code to interfaces, to allow vendor mibs * update schema * fix issues added by abstraction * STP fixes * Default to no context for vlan 1 * never store vlan 1 * Update test data * remove eltex brokenness * fix style * fix stan * Fix Rewrite MAC to Hex padding with floats * fix sqlite migration
This commit is contained in:
@@ -27,6 +27,7 @@ namespace App\Http\Controllers\Device\Tabs;
|
||||
|
||||
use App\Models\Device;
|
||||
use LibreNMS\Interfaces\UI\DeviceTab;
|
||||
use LibreNMS\Util\Url;
|
||||
|
||||
class StpController implements DeviceTab
|
||||
{
|
||||
@@ -52,6 +53,30 @@ class StpController implements DeviceTab
|
||||
|
||||
public function data(Device $device): array
|
||||
{
|
||||
return [];
|
||||
$active_vlan = Url::parseOptions('vlan', 1);
|
||||
$stpInstances = $device->stpInstances;
|
||||
$vlanOptions = $stpInstances->pluck('vlan')->mapWithKeys(function ($vlan) use ($device) {
|
||||
if (empty($vlan)) {
|
||||
$vlan = 1;
|
||||
}
|
||||
|
||||
return [$vlan => [
|
||||
'text' => $vlan,
|
||||
'link' => Url::deviceUrl($device, ['tab' => 'stp', 'vlan' => $vlan]),
|
||||
]];
|
||||
});
|
||||
|
||||
return [
|
||||
'vlans' => $vlanOptions->all(),
|
||||
'vlan' => $active_vlan,
|
||||
'device_id' => $device->device_id,
|
||||
'stpInstances' => $stpInstances->filter(function ($instance) use ($active_vlan) {
|
||||
return $active_vlan == 1 && $instance->vlan !== null || $instance->vlan !== $active_vlan;
|
||||
}),
|
||||
'stpPorts' => $device->stpPorts()->where('vlan', $active_vlan)->when($active_vlan == 1, function ($query) {
|
||||
return $query->orWhereNull('vlan');
|
||||
})->exists(),
|
||||
'bootgridUrl' => url('/ajax/table/'),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -146,7 +146,9 @@ abstract class PaginatedAjaxController extends Controller
|
||||
protected function filter($request, $query, $fields)
|
||||
{
|
||||
foreach ($fields as $target => $field) {
|
||||
if ($value = $request->get($field)) {
|
||||
if (is_callable($field)) {
|
||||
$field($query, $request->get($target));
|
||||
} elseif ($value = $request->get($field)) {
|
||||
$value = $this->adjustFilterValue($field, $value);
|
||||
if (is_string($target)) {
|
||||
$query->where($target, $value);
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
<?php
|
||||
/**
|
||||
* StpPortsController.php
|
||||
*
|
||||
* -Description-
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
* @link https://www.librenms.org
|
||||
*
|
||||
* @copyright 2021 Tony Murray
|
||||
* @author Tony Murray <[email protected]>
|
||||
*/
|
||||
|
||||
namespace App\Http\Controllers\Table;
|
||||
|
||||
use App\Facades\DeviceCache;
|
||||
use App\Models\PortStp;
|
||||
use App\Models\Stp;
|
||||
use LibreNMS\Util\Rewrite;
|
||||
use LibreNMS\Util\Url;
|
||||
|
||||
class PortStpController extends TableController
|
||||
{
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'device_id' => 'int',
|
||||
'vlan' => 'int',
|
||||
];
|
||||
}
|
||||
|
||||
protected function filterFields($request): array
|
||||
{
|
||||
return [
|
||||
'device_id',
|
||||
'vlan' => function ($query, $vlan) {
|
||||
$query->where(function ($query) use ($vlan) {
|
||||
$query->where('vlan', $vlan)->when($vlan == 1, function ($query) {
|
||||
return $query->orWhereNull('vlan');
|
||||
})->when($vlan === null, function ($query) {
|
||||
return $query->orWhere('vlan', 1);
|
||||
});
|
||||
});
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
protected function sortFields($request)
|
||||
{
|
||||
return [
|
||||
'device_id',
|
||||
'vlan',
|
||||
'port_id',
|
||||
'priority',
|
||||
'state',
|
||||
'enable',
|
||||
'pathCost',
|
||||
'designatedRoot',
|
||||
'designatedCost',
|
||||
'designatedBridge',
|
||||
'designatedPort',
|
||||
'forwardTransitions',
|
||||
];
|
||||
}
|
||||
|
||||
protected function baseQuery($request)
|
||||
{
|
||||
return PortStp::query()->with('port');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param PortStp $stpPort
|
||||
*/
|
||||
public function formatItem($stpPort)
|
||||
{
|
||||
return [
|
||||
'port_id' => Url::portLink($stpPort->port, $stpPort->port->getShortLabel()) . '<br />' . $stpPort->port->getDescription(),
|
||||
'vlan' => $stpPort->vlan ?: 1,
|
||||
'priority' => $stpPort->priority,
|
||||
'state' => $stpPort->state,
|
||||
'enable' => $stpPort->enable,
|
||||
'pathCost' => $stpPort->pathCost,
|
||||
'designatedRoot' => Rewrite::readableMac($stpPort->designatedRoot),
|
||||
'designatedRoot_vendor' => Rewrite::readableOUI($stpPort->designatedRoot),
|
||||
'designatedRoot_device' => Url::deviceLink(DeviceCache::get(Stp::where('bridgeAddress', $stpPort->designatedRoot)->value('device_id'))),
|
||||
'designatedCost' => $stpPort->designatedCost,
|
||||
'designatedBridge' => Rewrite::readableMac($stpPort->designatedBridge),
|
||||
'designatedBridge_vendor' => Rewrite::readableOUI($stpPort->designatedBridge),
|
||||
'designatedBridge_device' => Url::deviceLink(DeviceCache::get(Stp::where('bridgeAddress', $stpPort->designatedBridge)->value('device_id'))),
|
||||
'designatedPort' => $stpPort->designatedPort,
|
||||
'forwardTransitions' => $stpPort->forwardTransitions,
|
||||
];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user