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

VRP - avoid emptying bgpPeers description at discovery when manually set (#15713)

Browse Source 
* avoid clearing BGP peer desc at discovery

* more fix

* more fix
This commit is contained in:
PipoCanaja
2024-01-15 23:43:53 +01:00
committed by GitHub
parent 4effb40294
commit 598857c6ef
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
includes/discovery/bgp-peers/vrp.inc.php
View File

@@ -72,7 +72,6 @@ if (count($bgpPeersCache) > 0 || count($bgpPeersCache_ietf) == 0) {
$bgpPeers[$vrfInstance][$address]['afi'] = $oid[1];
$bgpPeers[$vrfInstance][$address]['safi'] = $oid[2];
$bgpPeers[$vrfInstance][$address]['typePeer'] = $oid[3];
$bgpPeers[$vrfInstance][$address]['bgpPeerDescr'] = '';
if (array_key_exists('0.' . $oid[3] . '.' . $oid_address, $bgpPeersDesc)) {
// We may have a description
$bgpPeers[$vrfInstance][$address]['bgpPeerDescr'] = $bgpPeersDesc['0.' . $oid[3] . '.' . $oid_address]['hwBgpPeerSessionExtDescription'];
@@ -100,9 +99,11 @@ if (count($bgpPeersCache) > 0 || count($bgpPeersCache_ietf) == 0) {
'bgpPeerOutTotalMessages' => 0,
'bgpPeerFsmEstablishedTime' => $value['hwBgpPeerFsmEstablishedTime'],
'bgpPeerInUpdateElapsedTime' => 0,
'bgpPeerDescr' => $value['bgpPeerDescr'] ?? '',
'astext' => $astext,
];
if (array_key_exists('bgpPeerDescr', $value)) {
$peers['bgpPeerDescr'] = $value['bgpPeerDescr'];
}
if (empty($vrfId)) {
unset($peers['vrf_id']);
}
@@ -118,8 +119,10 @@ if (count($bgpPeersCache) > 0 || count($bgpPeersCache_ietf) == 0) {
$peers = [
'bgpPeerRemoteAs' => $value['hwBgpPeerRemoteAs'],
'astext' => $astext,
'bgpPeerDescr' => $value['bgpPeerDescr'] ?? '',
];
if (array_key_exists('bgpPeerDescr', $value)) {
$peers['bgpPeerDescr'] = $value['bgpPeerDescr'];
}
$affected = DeviceCache::getPrimary()->bgppeers()->where('bgpPeerIdentifier', $address)->where('vrf_id', $vrfId)->update($peers);
$seenPeerID[] = DeviceCache::getPrimary()->bgppeers()->where('bgpPeerIdentifier', $address)->where('vrf_id', $vrfId)->select('bgpPeer_id')->orderBy('bgpPeer_id', 'ASC')->first()->bgpPeer_id;