mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Improve Huawei VRP bgp discovery (#11054)
* vrp bgp rewrite VRP BGP code isolated and VRF aware Ipv6 peer and afi typo * mib-update * avoid malformed OIDs in discovery * Restore BGP4 MIB calls for some Campus devices * CodeClimate
This commit is contained in:
PipoCanaja
GitHub
@@ -5,6 +5,133 @@ use LibreNMS\Exceptions\InvalidIpException;
|
||||
use LibreNMS\Util\IP;
|
||||
|
||||
if (Config::get('enable_bgp')) {
|
||||
if ($device['os'] == 'vrp') {
|
||||
$vrfs = dbFetchRows('SELECT vrf_id, vrf_name from `vrfs` WHERE device_id = ?', [$device['device_id']]);
|
||||
foreach ($vrfs as $vrf) {
|
||||
$map_vrf['byId'][$vrf['vrf_id']]['vrf_name'] = $vrf['vrf_name'];
|
||||
$map_vrf['byName'][$vrf['vrf_name']]['vrf_id'] = $vrf['vrf_id'];
|
||||
}
|
||||
$bgpPeersCache = snmpwalk_cache_oid($device, 'hwBgpPeers', [], 'HUAWEI-BGP-VPN-MIB');
|
||||
foreach ($bgpPeersCache as $key => $value) {
|
||||
$oid = explode(".", $key);
|
||||
$vrfInstance = $value['hwBgpPeerVrfName'];
|
||||
if ($oid[0] == 0) {
|
||||
$vrfInstance = '';
|
||||
$value['hwBgpPeerVrfName'] = '';
|
||||
}
|
||||
$address = str_replace($oid[0].".".$oid[1].".".$oid[2].".".$oid[3].".", '', $key);
|
||||
if ($oid[3] == 'ipv6') {
|
||||
$address = IP::fromHexString($address)->compressed();
|
||||
} elseif ($oid[3] != 'ipv4') {
|
||||
// we have a malformed OID reply, let's skip it
|
||||
continue;
|
||||
}
|
||||
|
||||
$bgpPeers[$vrfInstance][$address] = $value;
|
||||
$bgpPeers[$vrfInstance][$address]['vrf_id'] = $map_vrf['byName'][$vrfInstance]['vrf_id'];
|
||||
$bgpPeers[$vrfInstance][$address]['afi'] = $oid[1];
|
||||
$bgpPeers[$vrfInstance][$address]['safi'] = $oid[2];
|
||||
$bgpPeers[$vrfInstance][$address]['typePeer'] = $oid[3];
|
||||
}
|
||||
|
||||
foreach ($bgpPeers as $vrfName => $vrf) {
|
||||
$vrfId = $map_vrf['byName'][$vrfName]['vrf_id'];
|
||||
$checkVrf = ' AND vrf_id = ? ';
|
||||
if (empty($vrfId)) {
|
||||
$checkVrf = ' AND `vrf_id` IS NULL ';
|
||||
}
|
||||
|
||||
foreach ($vrf as $address => $value) {
|
||||
$astext = get_astext($value['hwBgpPeerRemoteAs']);
|
||||
if (dbFetchCell('SELECT COUNT(*) from `bgpPeers` WHERE device_id = ? AND bgpPeerIdentifier = ? ' . $checkVrf, [$device['device_id'], $address, $vrfId]) < '1') {
|
||||
$peers = [
|
||||
'device_id' => $device['device_id'],
|
||||
'vrf_id' => $vrfId,
|
||||
'bgpPeerIdentifier' => $address,
|
||||
'bgpPeerRemoteAs' => $value['hwBgpPeerRemoteAs'],
|
||||
'bgpPeerState' => $value['hwBgpPeerState'],
|
||||
'bgpPeerAdminStatus' => 'stop',
|
||||
'bgpLocalAddr' => '0.0.0.0',
|
||||
'bgpPeerRemoteAddr' => $value['hwBgpPeerRemoteAddr'],
|
||||
'bgpPeerInUpdates' => 0,
|
||||
'bgpPeerOutUpdates' => 0,
|
||||
'bgpPeerInTotalMessages' => 0,
|
||||
'bgpPeerOutTotalMessages' => 0,
|
||||
'bgpPeerFsmEstablishedTime' => $value['hwBgpPeerFsmEstablishedTime'],
|
||||
'bgpPeerInUpdateElapsedTime' => 0,
|
||||
'astext' => $astext,
|
||||
];
|
||||
if (empty($vrfId)) {
|
||||
unset($peers['vrf_id']);
|
||||
}
|
||||
dbInsert($peers, 'bgpPeers');
|
||||
|
||||
if (Config::get('autodiscovery.bgp')) {
|
||||
$name = gethostbyaddr($address);
|
||||
discover_new_device($name, $device, 'BGP');
|
||||
}
|
||||
echo '+';
|
||||
$vrp_bgp_peer_count ++;
|
||||
} else {
|
||||
dbUpdate(['bgpPeerRemoteAs' => $value['hwBgpPeerRemoteAs'], 'astext' => $astext], 'bgpPeers', 'device_id = ? AND bgpPeerIdentifier = ? AND vrf_id = ?', [$device['device_id'], $address, $vrfId]);
|
||||
echo '.';
|
||||
$vrp_bgp_peer_count ++;
|
||||
}
|
||||
if (dbFetchCell('SELECT COUNT(*) from `bgpPeers_cbgp` WHERE device_id = ? AND bgpPeerIdentifier = ? AND afi=? AND safi=?', array($device['device_id'], $value['hwBgpPeerRemoteAddr'], $value['afi'], $value['safi'])) < 1) {
|
||||
$device['context_name'] = $vrfName;
|
||||
add_cbgp_peer($device, ['ip' => $value['hwBgpPeerRemoteAddr']], $value['afi'], $value['safi']);
|
||||
unset($device['context_name']);
|
||||
} else {
|
||||
//nothing to update
|
||||
}
|
||||
}
|
||||
}
|
||||
// clean up peers
|
||||
$peers = dbFetchRows('SELECT `vrf_id`, `bgpPeerIdentifier` FROM `bgpPeers` WHERE `device_id` = ?', [$device['device_id']]);
|
||||
foreach ($peers as $value) {
|
||||
$vrfId = $value['vrf_id'];
|
||||
$checkVrf = ' AND vrf_id = ? ';
|
||||
if (empty($vrfId)) {
|
||||
$checkVrf = ' AND `vrf_id` IS NULL ';
|
||||
}
|
||||
$vrfName = $map_vrf['byId'][$vrfId]['vrf_name'];
|
||||
$address = $value['bgpPeerIdentifier'];
|
||||
|
||||
if ((empty($vrfId) && empty($bgpPeers[''][$address])) ||
|
||||
(!empty($vrfId) && !empty($vrfName) && empty($bgpPeers[$vrfName][$address])) ||
|
||||
(!empty($vrfId) && empty($vrfName))) {
|
||||
$deleted = dbDelete('bgpPeers', 'device_id = ? AND bgpPeerIdentifier = ? ' . $checkVrf, [$device['device_id'], $address, $vrfId]);
|
||||
|
||||
echo str_repeat('-', $deleted);
|
||||
echo PHP_EOL;
|
||||
}
|
||||
}
|
||||
|
||||
$af_query = "SELECT bgpPeerIdentifier, afi, safi FROM bgpPeers_cbgp WHERE `device_id`=? AND bgpPeerIdentifier=?";
|
||||
foreach (dbFetchRows($af_query, [$device['device_id'], $peer['ip']]) as $entry) {
|
||||
$afi = $entry['afi'];
|
||||
$safi = $entry['safi'];
|
||||
$vrfName = $entry['context_name'];
|
||||
if (!exist($bgpPeersCache[$vrfName]) ||
|
||||
!exist($bgpPeersCache[$vrfName][$entry['bgpPeerIdentifier']]) ||
|
||||
$bgpPeersCache[$vrfName][$entry['bgpPeerIdentifier']][$entry['afi']] != $afi ||
|
||||
$bgpPeersCache[$vrfName][$entry['bgpPeerIdentifier']][$entry['safi']] != $safi ) {
|
||||
dbDelete(
|
||||
'bgpPeers_cbgp',
|
||||
'`device_id`=? AND `bgpPeerIdentifier`=? AND context_name=? AND afi=? AND safi=?',
|
||||
[$device['device_id'], $address, $vrfName, $afi, $safi]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
unset($bgpPeersCache);
|
||||
unset($bgpPeers);
|
||||
if ($vrp_bgp_peer_count > 0) {
|
||||
return; //Finish BGP discovery here, cause we collected data
|
||||
}
|
||||
// If not, we continue with standard BGP4 MIB
|
||||
}
|
||||
|
||||
if ($device['os'] == 'timos') {
|
||||
$bgpPeersCache =snmpwalk_cache_multi_oid($device, 'tBgpPeerNgTable', [], 'TIMETRA-BGP-MIB', 'nokia');
|
||||
foreach ($bgpPeersCache as $key => $value) {
|
||||
@@ -141,11 +268,6 @@ if (Config::get('enable_bgp')) {
|
||||
if (!empty($af_data)) {
|
||||
$af_list = build_cbgp_peers($device, $peer, $af_data, $peer2);
|
||||
}
|
||||
if ($device['os'] == 'vrp') {
|
||||
d_echo("VRP:");
|
||||
$af_data = snmpwalk_cache_oid($device, 'hwBgpPeers', $af_data, 'HUAWEI-BGP-VPN-MIB');
|
||||
$af_list = build_cbgp_peers($device, $peer, $af_data, $peer2);
|
||||
}
|
||||
|
||||
if (!$bgp4_mib && $device['os'] == 'junos') {
|
||||
$afis['ipv4'] = 'ipv4';
|
||||
|
||||
@@ -1213,10 +1213,10 @@ function build_cbgp_peers($device, $peer, $af_data, $peer2)
|
||||
|
||||
$afisafi_tmp = explode('.', $k);
|
||||
if ($device['os_group'] === 'vrp') {
|
||||
array_shift($afisafi_tmp); //remove 1st value, always 0 so far
|
||||
$vpninst_id = array_shift($afisafi_tmp);
|
||||
$afi = array_shift($afisafi_tmp);
|
||||
$safi = array_shift($afisafi_tmp);
|
||||
array_shift($afisafi_tmp); //type, always ipv4 so far
|
||||
$peertype = array_shift($afisafi_tmp);
|
||||
$bgp_ip = implode('.', $afisafi_tmp);
|
||||
} else {
|
||||
$safi = array_pop($afisafi_tmp);
|
||||
|
||||
@@ -395,6 +395,8 @@ if (\LibreNMS\Config::get('enable_bgp')) {
|
||||
$vrpPrefixes = snmpwalk_cache_multi_oid($device, 'hwBgpPeerPrefixRcvCounter', $vrpPrefixes, 'HUAWEI-BGP-VPN-MIB', null, '-OQUs');
|
||||
$vrpPrefixes = snmpwalk_cache_multi_oid($device, 'hwBgpPeerPrefixAdvCounter', $vrpPrefixes, 'HUAWEI-BGP-VPN-MIB', null, '-OQUs');
|
||||
|
||||
// only works in global routing table, as the vpnInstanceId is not available
|
||||
// for now in the VRF discovery of VRP devices
|
||||
$key = '0.'.$afi.'.'.$safi.'.ipv4.'.$peer['bgpPeerIdentifier'];
|
||||
$cbgpPeerAcceptedPrefixes = $vrpPrefixes[$key]['hwBgpPeerPrefixRcvCounter'];
|
||||
$cbgpPeerAdvertisedPrefixes = $vrpPrefixes[$key]['hwBgpPeerPrefixAdvCounter'];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -25,7 +25,7 @@
|
||||
"sysObjectID": ".1.3.6.1.4.1.2011.2.239.1",
|
||||
"sysDescr": "Huawei Versatile Routing Platform Software\nVRP (R) software, Version 8.150 (CE12800 V200R002C50SPC800) \r\nCopyright (C) 2012-2017 Huawei Technologies Co., Ltd. \r\nHUAWEICE12804",
|
||||
"sysContact": "<private>",
|
||||
"version": "8.150 (V200R002C50SPC800) [601981 seconds]",
|
||||
"version": "8.150 (V200R002C50SPC800) [patch]",
|
||||
"hardware": "Huawei CE12800",
|
||||
"features": null,
|
||||
"os": "vrp",
|
||||
@@ -24420,5 +24420,105 @@
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"bgp-peers": {
|
||||
"discovery": {
|
||||
"bgpPeers": [
|
||||
{
|
||||
"astext": "",
|
||||
"bgpPeerIdentifier": "192.168.189.96",
|
||||
"bgpPeerRemoteAs": 64512,
|
||||
"bgpPeerState": "established",
|
||||
"bgpPeerAdminStatus": "stop",
|
||||
"bgpLocalAddr": "0.0.0.0",
|
||||
"bgpPeerRemoteAddr": "192.168.189.96",
|
||||
"bgpPeerDescr": "",
|
||||
"bgpPeerInUpdates": 0,
|
||||
"bgpPeerOutUpdates": 0,
|
||||
"bgpPeerInTotalMessages": 0,
|
||||
"bgpPeerOutTotalMessages": 0,
|
||||
"bgpPeerFsmEstablishedTime": 2078608,
|
||||
"bgpPeerInUpdateElapsedTime": 0,
|
||||
"context_name": null,
|
||||
"bgpLocalAs": null,
|
||||
"vrfLocalAs": null
|
||||
}
|
||||
],
|
||||
"bgpPeers_cbgp": [
|
||||
{
|
||||
"bgpPeerIdentifier": "192.168.189.96",
|
||||
"afi": "ipv4",
|
||||
"safi": "unicast",
|
||||
"AcceptedPrefixes": 0,
|
||||
"DeniedPrefixes": 0,
|
||||
"PrefixAdminLimit": 0,
|
||||
"PrefixThreshold": 0,
|
||||
"PrefixClearThreshold": 0,
|
||||
"AdvertisedPrefixes": 0,
|
||||
"SuppressedPrefixes": 0,
|
||||
"WithdrawnPrefixes": 0,
|
||||
"AcceptedPrefixes_delta": 0,
|
||||
"AcceptedPrefixes_prev": 0,
|
||||
"DeniedPrefixes_delta": 0,
|
||||
"DeniedPrefixes_prev": 0,
|
||||
"AdvertisedPrefixes_delta": 0,
|
||||
"AdvertisedPrefixes_prev": 0,
|
||||
"SuppressedPrefixes_delta": 0,
|
||||
"SuppressedPrefixes_prev": 0,
|
||||
"WithdrawnPrefixes_delta": 0,
|
||||
"WithdrawnPrefixes_prev": 0,
|
||||
"context_name": "test1"
|
||||
}
|
||||
]
|
||||
},
|
||||
"poller": {
|
||||
"bgpPeers": [
|
||||
{
|
||||
"astext": "",
|
||||
"bgpPeerIdentifier": "192.168.189.96",
|
||||
"bgpPeerRemoteAs": 64512,
|
||||
"bgpPeerState": "established",
|
||||
"bgpPeerAdminStatus": "stop",
|
||||
"bgpLocalAddr": "0.0.0.0",
|
||||
"bgpPeerRemoteAddr": "192.168.189.96",
|
||||
"bgpPeerDescr": "",
|
||||
"bgpPeerInUpdates": 0,
|
||||
"bgpPeerOutUpdates": 0,
|
||||
"bgpPeerInTotalMessages": 0,
|
||||
"bgpPeerOutTotalMessages": 0,
|
||||
"bgpPeerFsmEstablishedTime": 2078608,
|
||||
"bgpPeerInUpdateElapsedTime": 0,
|
||||
"context_name": null,
|
||||
"bgpLocalAs": null,
|
||||
"vrfLocalAs": null
|
||||
}
|
||||
],
|
||||
"bgpPeers_cbgp": [
|
||||
{
|
||||
"bgpPeerIdentifier": "192.168.189.96",
|
||||
"afi": "ipv4",
|
||||
"safi": "unicast",
|
||||
"AcceptedPrefixes": 0,
|
||||
"DeniedPrefixes": 0,
|
||||
"PrefixAdminLimit": 0,
|
||||
"PrefixThreshold": 0,
|
||||
"PrefixClearThreshold": 0,
|
||||
"AdvertisedPrefixes": 0,
|
||||
"SuppressedPrefixes": 0,
|
||||
"WithdrawnPrefixes": 0,
|
||||
"AcceptedPrefixes_delta": 0,
|
||||
"AcceptedPrefixes_prev": 0,
|
||||
"DeniedPrefixes_delta": 0,
|
||||
"DeniedPrefixes_prev": 0,
|
||||
"AdvertisedPrefixes_delta": 0,
|
||||
"AdvertisedPrefixes_prev": 0,
|
||||
"SuppressedPrefixes_delta": 0,
|
||||
"SuppressedPrefixes_prev": 0,
|
||||
"WithdrawnPrefixes_delta": 0,
|
||||
"WithdrawnPrefixes_prev": 0,
|
||||
"context_name": "test1"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3695,4 +3695,14 @@
|
||||
1.3.6.1.2.1.31.1.1.1.19.204|67|0
|
||||
1.3.6.1.2.1.31.1.1.1.19.205|67|0
|
||||
1.3.6.1.2.1.31.1.1.1.19.206|67|0
|
||||
1.3.6.1.4.1.2011.5.25.19.1.8.5.1.1.4.0|4|patch
|
||||
1.3.6.1.4.1.2011.5.25.177.1.1.1.1.6.32.1.1.1.4.192.168.189.96|4|test1
|
||||
1.3.6.1.4.1.2011.5.25.177.1.1.2.1.1.32.1.1.1.4.192.168.189.96|66|4
|
||||
1.3.6.1.4.1.2011.5.25.177.1.1.2.1.2.32.1.1.1.4.192.168.189.96|66|64512
|
||||
1.3.6.1.4.1.2011.5.25.177.1.1.2.1.4.32.1.1.1.4.192.168.189.96|4|192.168.189.96
|
||||
1.3.6.1.4.1.2011.5.25.177.1.1.2.1.5.32.1.1.1.4.192.168.189.96|2|6
|
||||
1.3.6.1.4.1.2011.5.25.177.1.1.2.1.6.32.1.1.1.4.192.168.189.96|66|1
|
||||
1.3.6.1.4.1.2011.5.25.177.1.1.2.1.7.32.1.1.1.4.192.168.189.96|66|2078608
|
||||
1.3.6.1.4.1.2011.5.25.177.1.1.2.1.9.32.1.1.1.4.192.168.189.96|4x|0202
|
||||
1.3.6.1.4.1.2011.5.25.177.1.1.2.1.10.32.1.1.1.4.192.168.189.96|66|0
|
||||
1.3.6.1.6.3.10.2.1.3.0|2|601981
|
||||
|
||||
Reference in New Issue
Block a user