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 MPLS Tab Display for Nokia devices using LDP and not RSVP (#15128)

Browse Source
This commit is contained in:
Nick Peelman
2023-07-03 06:08:58 -04:00
committed by GitHub
parent 91acfcc017
commit e486ef4c22
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Device/Tabs/RoutingController.php
View File

@@ -44,7 +44,7 @@ class RoutingController implements DeviceTab
'bgp' => $device->bgppeers()->count(),
'vrf' => $device->vrfs()->count(),
'cef' => $device->cefSwitching()->count(),
'mpls' => $device->mplsLsps()->count(),
'mpls' => $device->mplsServices()->count(),
'cisco-otv' => Component::query()->where('device_id', $device->device_id)->where('type', 'Cisco-OTV')->count(),
'loadbalancer_rservers' => $device->rServers()->count(),
'ipsec_tunnels' => $device->ipsecTunnels()->count(),

6
includes/html/pages/device/routing/mpls.inc.php
View File

@@ -292,7 +292,7 @@ if ($vars['view'] == 'sdps') {
} // end sdps view
if ($vars['view'] == 'sdpbinds') {
echo '<th><a title="The value of this object specifies the Service identifier. This value should be unique within the service domain.">Service Id</a></th>
echo '<th><a title="The value of this object specifies the Service identifier. This value should be unique within the service domain.">Service ID</a></th>
<th><a title="SDP Binding identifier. SDP identifier : Service identifier">SDP Bind Id</a></th>
<th><a title="This object specifies whether this Service SDP binding is a spoke or a mesh.">Bind Type</a></th>
<th><a title="The value of VC Type is an enumerated integer that specifies the type of virtual circuit (VC) associated with the SDP binding">VC Type</a></th>
@@ -358,7 +358,7 @@ sapDown: The SAP associated with the service is down.">Oper State</a></th>
} // end sdpbinds view
if ($vars['view'] == 'services') {
echo '<th><a title="The value of this object specifies the Service identifier. This value should be unique within the service domain.">Service Id</a></th>
echo '<th><a title="The value of this object specifies the Service identifier. This value should be unique within the service domain.">Service ID</a></th>
<th><a title="The value of this object specifies the service type: e.g. epipe, tls, etc.">Type</a></th>
<th><a title="The value of this object specifies the ID of the customer who owns this service.">Customer</a></th>
<th><a title="The value of this object specifies the desired state of this service.">Admin Status</a></th>
@@ -436,7 +436,7 @@ vprn services are up when the service is administratively up however routing fun
} // end services view
if ($vars['view'] == 'saps') {
echo '<th><a title="The value of this object specifies the Service identifier.">Service Id</a></th>
echo '<th><a title="The value of this object specifies the Service identifier.">Service ID</a></th>
<th><a title="The ID of the access port where this SAP is defined.">SAP Port</a></th>
<th><a title="The value of the label used to identify this SAP on the access port specified by sapPortId.">Encapsulation</a></th>
<th><a title="This object indicates the type of service where this SAP is defined.">Type</a></th>

6
includes/html/pages/routing/mpls.inc.php
View File

@@ -292,7 +292,7 @@ if ($vars['view'] == 'sdps') {
if ($vars['view'] == 'sdpbinds') {
echo '<tr><th><a title="Device">Device</a></th>
<th><a title="The value of this object specifies the Service identifier. This value should be unique within the service domain">Service Id</a></th>
<th><a title="The value of this object specifies the Service identifier. This value should be unique within the service domain">Service ID</a></th>
<th><a title="SDP Binding identifier. SDP identifier : Service identifier">SDP Bind Id</a></th>
<th><a title="This object specifies whether this Service SDP binding is a spoke or a mesh.">Bind Type</a></th>
<th><a title="The value of VC Type is an enumerated integer that specifies the type of virtual circuit (VC) associated with the SDP binding">VC Type</a></th>
@@ -361,7 +361,7 @@ sapDown: The SAP associated with the service is down.">Oper State</a></th>
if ($vars['view'] == 'services') {
echo '<tr><th><a title="Device">Device</a></th>
<th><a title="The value of this object specifies the Service identifier. This value should be unique within the service domain.">Service Id</a></th>
<th><a title="The value of this object specifies the Service identifier. This value should be unique within the service domain.">Service ID</a></th>
<th><a title="The value of this object specifies the service type: e.g. epipe, tls, etc.">Type</a></th>
<th><a title="The value of this object specifies the ID of the customer who owns this service.">Customer</a></th>
<th><a title="The value of this object specifies the desired state of this service.">Admin Status</a></th>
@@ -442,7 +442,7 @@ vprn services are up when the service is administratively up however routing fun
if ($vars['view'] == 'saps') {
echo '<tr><th><a title="Device">Device</a></th>
<th><a title="The value of this object specifies the Service identifier.">Service Id</a></th>
<th><a title="The value of this object specifies the Service identifier.">Service ID</a></th>
<th><a title="The ID of the access port where this SAP is defined.">SAP Port</a></th>
<th><a title="The value of the label used to identify this SAP on the access port specified by sapPortId.">Encapsulation</a></th>
<th><a title="This object indicates the type of service where this SAP is defined.">Type</a></th>