mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Alcatel-Lucent Aos7 bgp fix (#13047)
* first * fix style * fix style * tests * tests * tests * tests * tests * tests
This commit is contained in:
@@ -325,25 +325,21 @@ if (\LibreNMS\Config::get('enable_bgp')) {
|
||||
'os10bgp4V2PeerLastErrorSubCodeReceived' => 'bgpPeerLastErrorSubCode',
|
||||
'os10bgp4V2PeerLastErrorReceivedText' => 'bgpPeerLastErrorText',
|
||||
];
|
||||
} elseif ($device['os'] === 'aos7') {
|
||||
} elseif ($device['os'] == 'aos7') {
|
||||
$peer_identifier = $peer['bgpPeerIdentifier'];
|
||||
$mib = 'BGP4-MIB';
|
||||
$oid_map = [
|
||||
'bgpPeerState' => 'bgpPeerState',
|
||||
'bgpPeerAdminStatus' => 'bgpPeerAdminStatus',
|
||||
'bgpPeerInUpdates' => 'bgpPeerInUpdates',
|
||||
'bgpPeerOutUpdates' => 'bgpPeerOutUpdates',
|
||||
'bgpPeerInTotalMessages' => 'bgpPeerInTotalMessages',
|
||||
'bgpPeerOutTotalMessages' => 'bgpPeerOutTotalMessages',
|
||||
'bgpPeerFsmEstablishedTime' => 'bgpPeerFsmEstablishedTime',
|
||||
'bgpPeerInUpdateElapsedTime' => 'bgpPeerInUpdateElapsedTime',
|
||||
'bgpPeerLocalAddr' => 'bgpLocalAddr',
|
||||
'bgpPeerLastError' => 'bgpPeerLastErrorCode',
|
||||
];
|
||||
|
||||
$peer_data = [];
|
||||
$al_descr = snmpwalk_cache_multi_oid($device, 'alaBgpPeerName', $al_descr, 'ALCATEL-IND1-BGP-MIB', 'aos7', '-OQUs');
|
||||
$al_peer = snmpwalk_cache_multi_oid($device, 'BgpPeerEntry', $al_peer, 'BGP4-MIB', 'aos7', '-OQUs');
|
||||
$peer_data['bgpPeerDescr'] = $al_descr[$peer_identifier]['alaBgpPeerName'];
|
||||
$peer_data['bgpPeerState'] = $al_peer[$peer_identifier]['bgpPeerState'];
|
||||
$peer_data['bgpPeerAdminStatus'] = $al_peer[$peer_identifier]['bgpPeerAdminStatus'];
|
||||
$peer_data['bgpPeerInUpdates'] = $al_peer[$peer_identifier]['bgpPeerInUpdates'];
|
||||
$peer_data['bgpPeerOutUpdates'] = $al_peer[$peer_identifier]['bgpPeerOutUpdates'];
|
||||
$peer_data['bgpPeerInTotalMessages'] = $al_peer[$peer_identifier]['bgpPeerInTotalMessages'];
|
||||
$peer_data['bgpPeerOutTotalMessages'] = $al_peer[$peer_identifier]['bgpPeerOutTotalMessages'];
|
||||
$peer_data['bgpPeerFsmEstablishedTime'] = $al_peer[$peer_identifier]['bgpPeerFsmEstablishedTime'];
|
||||
$peer_data['bgpPeerInUpdateElapsedTime'] = $al_peer[$peer_identifier]['bgpPeerInUpdateElapsedTime'];
|
||||
$peer_data['bgpPeerLastErrorCode'] = $al_peer[$peer_identifier]['bgpPeerLastErro'];
|
||||
} elseif ($device['os_group'] == 'cisco') {
|
||||
$peer_identifier = $ip_type . '.' . $ip_len . '.' . $bgp_peer_ident;
|
||||
$mib = 'CISCO-BGP4-MIB';
|
||||
|
||||
+276
-31
@@ -28806,6 +28806,113 @@
|
||||
"ifOutMulticastPkts_delta": null,
|
||||
"ifOutMulticastPkts_rate": null
|
||||
},
|
||||
{
|
||||
"port_descr_type": null,
|
||||
"port_descr_descr": null,
|
||||
"port_descr_circuit": null,
|
||||
"port_descr_speed": null,
|
||||
"port_descr_notes": null,
|
||||
"ifDescr": "vlan-30",
|
||||
"ifName": "vlan-30",
|
||||
"portName": null,
|
||||
"ifIndex": 13600035,
|
||||
"ifSpeed": null,
|
||||
"ifSpeed_prev": null,
|
||||
"ifConnectorPresent": null,
|
||||
"ifPromiscuousMode": null,
|
||||
"ifHighSpeed": null,
|
||||
"ifHighSpeed_prev": null,
|
||||
"ifOperStatus": "up",
|
||||
"ifOperStatus_prev": null,
|
||||
"ifAdminStatus": null,
|
||||
"ifAdminStatus_prev": null,
|
||||
"ifDuplex": null,
|
||||
"ifMtu": null,
|
||||
"ifType": "l3ipvlan",
|
||||
"ifAlias": "vlan-30",
|
||||
"ifPhysAddress": null,
|
||||
"ifHardType": null,
|
||||
"ifLastChange": 0,
|
||||
"ifVlan": "",
|
||||
"ifTrunk": null,
|
||||
"counter_in": null,
|
||||
"counter_out": null,
|
||||
"ignore": 0,
|
||||
"disabled": 0,
|
||||
"detailed": 0,
|
||||
"deleted": 0,
|
||||
"pagpOperationMode": null,
|
||||
"pagpPortState": null,
|
||||
"pagpPartnerDeviceId": null,
|
||||
"pagpPartnerLearnMethod": null,
|
||||
"pagpPartnerIfIndex": null,
|
||||
"pagpPartnerGroupIfIndex": null,
|
||||
"pagpPartnerDeviceName": null,
|
||||
"pagpEthcOperationMode": null,
|
||||
"pagpDeviceId": null,
|
||||
"pagpGroupIfIndex": null,
|
||||
"ifInUcastPkts": null,
|
||||
"ifInUcastPkts_prev": null,
|
||||
"ifInUcastPkts_delta": null,
|
||||
"ifInUcastPkts_rate": null,
|
||||
"ifOutUcastPkts": null,
|
||||
"ifOutUcastPkts_prev": null,
|
||||
"ifOutUcastPkts_delta": null,
|
||||
"ifOutUcastPkts_rate": null,
|
||||
"ifInErrors": null,
|
||||
"ifInErrors_prev": null,
|
||||
"ifInErrors_delta": null,
|
||||
"ifInErrors_rate": null,
|
||||
"ifOutErrors": null,
|
||||
"ifOutErrors_prev": null,
|
||||
"ifOutErrors_delta": null,
|
||||
"ifOutErrors_rate": null,
|
||||
"ifInOctets": null,
|
||||
"ifInOctets_prev": null,
|
||||
"ifInOctets_delta": null,
|
||||
"ifInOctets_rate": null,
|
||||
"ifOutOctets": null,
|
||||
"ifOutOctets_prev": null,
|
||||
"ifOutOctets_delta": null,
|
||||
"ifOutOctets_rate": null,
|
||||
"poll_prev": null,
|
||||
"ifInNUcastPkts": null,
|
||||
"ifInNUcastPkts_prev": null,
|
||||
"ifInNUcastPkts_delta": null,
|
||||
"ifInNUcastPkts_rate": null,
|
||||
"ifOutNUcastPkts": null,
|
||||
"ifOutNUcastPkts_prev": null,
|
||||
"ifOutNUcastPkts_delta": null,
|
||||
"ifOutNUcastPkts_rate": null,
|
||||
"ifInDiscards": null,
|
||||
"ifInDiscards_prev": null,
|
||||
"ifInDiscards_delta": null,
|
||||
"ifInDiscards_rate": null,
|
||||
"ifOutDiscards": null,
|
||||
"ifOutDiscards_prev": null,
|
||||
"ifOutDiscards_delta": null,
|
||||
"ifOutDiscards_rate": null,
|
||||
"ifInUnknownProtos": null,
|
||||
"ifInUnknownProtos_prev": null,
|
||||
"ifInUnknownProtos_delta": null,
|
||||
"ifInUnknownProtos_rate": null,
|
||||
"ifInBroadcastPkts": null,
|
||||
"ifInBroadcastPkts_prev": null,
|
||||
"ifInBroadcastPkts_delta": null,
|
||||
"ifInBroadcastPkts_rate": null,
|
||||
"ifOutBroadcastPkts": null,
|
||||
"ifOutBroadcastPkts_prev": null,
|
||||
"ifOutBroadcastPkts_delta": null,
|
||||
"ifOutBroadcastPkts_rate": null,
|
||||
"ifInMulticastPkts": null,
|
||||
"ifInMulticastPkts_prev": null,
|
||||
"ifInMulticastPkts_delta": null,
|
||||
"ifInMulticastPkts_rate": null,
|
||||
"ifOutMulticastPkts": null,
|
||||
"ifOutMulticastPkts_prev": null,
|
||||
"ifOutMulticastPkts_delta": null,
|
||||
"ifOutMulticastPkts_rate": null
|
||||
},
|
||||
{
|
||||
"port_descr_type": null,
|
||||
"port_descr_descr": null,
|
||||
@@ -61659,6 +61766,113 @@
|
||||
"ifOutMulticastPkts_delta": null,
|
||||
"ifOutMulticastPkts_rate": null
|
||||
},
|
||||
{
|
||||
"port_descr_type": null,
|
||||
"port_descr_descr": null,
|
||||
"port_descr_circuit": null,
|
||||
"port_descr_speed": null,
|
||||
"port_descr_notes": null,
|
||||
"ifDescr": "vlan-30",
|
||||
"ifName": "vlan-30",
|
||||
"portName": null,
|
||||
"ifIndex": 13600035,
|
||||
"ifSpeed": 1000000000,
|
||||
"ifSpeed_prev": null,
|
||||
"ifConnectorPresent": "true",
|
||||
"ifPromiscuousMode": "false",
|
||||
"ifHighSpeed": 1000,
|
||||
"ifHighSpeed_prev": null,
|
||||
"ifOperStatus": "up",
|
||||
"ifOperStatus_prev": "up",
|
||||
"ifAdminStatus": "up",
|
||||
"ifAdminStatus_prev": null,
|
||||
"ifDuplex": null,
|
||||
"ifMtu": 1500,
|
||||
"ifType": "l3ipvlan",
|
||||
"ifAlias": "vlan-30",
|
||||
"ifPhysAddress": "e8e73242e9d1",
|
||||
"ifHardType": null,
|
||||
"ifLastChange": 1587689180,
|
||||
"ifVlan": "",
|
||||
"ifTrunk": null,
|
||||
"counter_in": null,
|
||||
"counter_out": null,
|
||||
"ignore": 0,
|
||||
"disabled": 0,
|
||||
"detailed": 0,
|
||||
"deleted": 0,
|
||||
"pagpOperationMode": null,
|
||||
"pagpPortState": null,
|
||||
"pagpPartnerDeviceId": null,
|
||||
"pagpPartnerLearnMethod": null,
|
||||
"pagpPartnerIfIndex": null,
|
||||
"pagpPartnerGroupIfIndex": null,
|
||||
"pagpPartnerDeviceName": null,
|
||||
"pagpEthcOperationMode": null,
|
||||
"pagpDeviceId": null,
|
||||
"pagpGroupIfIndex": null,
|
||||
"ifInUcastPkts": 59,
|
||||
"ifInUcastPkts_prev": 0,
|
||||
"ifInUcastPkts_delta": null,
|
||||
"ifInUcastPkts_rate": null,
|
||||
"ifOutUcastPkts": 45655,
|
||||
"ifOutUcastPkts_prev": 0,
|
||||
"ifOutUcastPkts_delta": null,
|
||||
"ifOutUcastPkts_rate": null,
|
||||
"ifInErrors": 0,
|
||||
"ifInErrors_prev": 0,
|
||||
"ifInErrors_delta": null,
|
||||
"ifInErrors_rate": null,
|
||||
"ifOutErrors": 0,
|
||||
"ifOutErrors_prev": 0,
|
||||
"ifOutErrors_delta": null,
|
||||
"ifOutErrors_rate": null,
|
||||
"ifInOctets": 6316,
|
||||
"ifInOctets_prev": 0,
|
||||
"ifInOctets_delta": null,
|
||||
"ifInOctets_rate": null,
|
||||
"ifOutOctets": 2374340,
|
||||
"ifOutOctets_prev": 0,
|
||||
"ifOutOctets_delta": null,
|
||||
"ifOutOctets_rate": null,
|
||||
"poll_prev": null,
|
||||
"ifInNUcastPkts": 0,
|
||||
"ifInNUcastPkts_prev": 0,
|
||||
"ifInNUcastPkts_delta": null,
|
||||
"ifInNUcastPkts_rate": null,
|
||||
"ifOutNUcastPkts": 0,
|
||||
"ifOutNUcastPkts_prev": 0,
|
||||
"ifOutNUcastPkts_delta": null,
|
||||
"ifOutNUcastPkts_rate": null,
|
||||
"ifInDiscards": 0,
|
||||
"ifInDiscards_prev": 0,
|
||||
"ifInDiscards_delta": null,
|
||||
"ifInDiscards_rate": null,
|
||||
"ifOutDiscards": 0,
|
||||
"ifOutDiscards_prev": 0,
|
||||
"ifOutDiscards_delta": null,
|
||||
"ifOutDiscards_rate": null,
|
||||
"ifInUnknownProtos": 0,
|
||||
"ifInUnknownProtos_prev": 0,
|
||||
"ifInUnknownProtos_delta": null,
|
||||
"ifInUnknownProtos_rate": null,
|
||||
"ifInBroadcastPkts": 0,
|
||||
"ifInBroadcastPkts_prev": 0,
|
||||
"ifInBroadcastPkts_delta": null,
|
||||
"ifInBroadcastPkts_rate": null,
|
||||
"ifOutBroadcastPkts": 0,
|
||||
"ifOutBroadcastPkts_prev": 0,
|
||||
"ifOutBroadcastPkts_delta": null,
|
||||
"ifOutBroadcastPkts_rate": null,
|
||||
"ifInMulticastPkts": 0,
|
||||
"ifInMulticastPkts_prev": 0,
|
||||
"ifInMulticastPkts_delta": null,
|
||||
"ifInMulticastPkts_rate": null,
|
||||
"ifOutMulticastPkts": 0,
|
||||
"ifOutMulticastPkts_prev": 0,
|
||||
"ifOutMulticastPkts_delta": null,
|
||||
"ifOutMulticastPkts_rate": null
|
||||
},
|
||||
{
|
||||
"port_descr_type": null,
|
||||
"port_descr_descr": null,
|
||||
@@ -71955,6 +72169,13 @@
|
||||
"vlan_type": null,
|
||||
"vlan_mtu": null
|
||||
},
|
||||
{
|
||||
"vlan_vlan": 30,
|
||||
"vlan_domain": 1,
|
||||
"vlan_name": "Prod Data",
|
||||
"vlan_type": null,
|
||||
"vlan_mtu": null
|
||||
},
|
||||
{
|
||||
"vlan_vlan": 41,
|
||||
"vlan_domain": 1,
|
||||
@@ -74816,6 +75037,14 @@
|
||||
"cost": 0,
|
||||
"untagged": 0
|
||||
},
|
||||
{
|
||||
"vlan": 7,
|
||||
"baseport": 32796,
|
||||
"priority": 0,
|
||||
"state": "unknown",
|
||||
"cost": 0,
|
||||
"untagged": 0
|
||||
},
|
||||
{
|
||||
"vlan": 8,
|
||||
"baseport": 32783,
|
||||
@@ -74944,6 +75173,14 @@
|
||||
"cost": 0,
|
||||
"untagged": 0
|
||||
},
|
||||
{
|
||||
"vlan": 30,
|
||||
"baseport": 32794,
|
||||
"priority": 0,
|
||||
"state": "unknown",
|
||||
"cost": 0,
|
||||
"untagged": 0
|
||||
},
|
||||
{
|
||||
"vlan": 41,
|
||||
"baseport": 1,
|
||||
@@ -75112,6 +75349,14 @@
|
||||
"cost": 0,
|
||||
"untagged": 1
|
||||
},
|
||||
{
|
||||
"vlan": 106,
|
||||
"baseport": 32799,
|
||||
"priority": 0,
|
||||
"state": "unknown",
|
||||
"cost": 0,
|
||||
"untagged": 1
|
||||
},
|
||||
{
|
||||
"vlan": 107,
|
||||
"baseport": 30,
|
||||
@@ -79520,20 +79765,20 @@
|
||||
"astext": "",
|
||||
"bgpPeerIdentifier": "10.248.3.34",
|
||||
"bgpPeerRemoteAs": 64600,
|
||||
"bgpPeerState": "idle",
|
||||
"bgpPeerAdminStatus": "stop",
|
||||
"bgpPeerState": "established",
|
||||
"bgpPeerAdminStatus": "start",
|
||||
"bgpPeerLastErrorCode": null,
|
||||
"bgpPeerLastErrorSubCode": null,
|
||||
"bgpPeerLastErrorText": null,
|
||||
"bgpLocalAddr": "0.0.0.0",
|
||||
"bgpPeerRemoteAddr": "0.0.0.0",
|
||||
"bgpPeerDescr": "hle-sg066-ro-lug-1",
|
||||
"bgpPeerInUpdates": 0,
|
||||
"bgpPeerOutUpdates": 0,
|
||||
"bgpPeerInTotalMessages": 0,
|
||||
"bgpPeerOutTotalMessages": 0,
|
||||
"bgpPeerFsmEstablishedTime": 0,
|
||||
"bgpPeerInUpdateElapsedTime": 0,
|
||||
"bgpPeerInUpdates": 9512,
|
||||
"bgpPeerOutUpdates": 16,
|
||||
"bgpPeerInTotalMessages": 582973,
|
||||
"bgpPeerOutTotalMessages": 666695,
|
||||
"bgpPeerFsmEstablishedTime": 5671697,
|
||||
"bgpPeerInUpdateElapsedTime": 4020,
|
||||
"context_name": "",
|
||||
"bgpLocalAs": 64663,
|
||||
"vrfLocalAs": null
|
||||
@@ -79542,20 +79787,20 @@
|
||||
"astext": "",
|
||||
"bgpPeerIdentifier": "10.248.3.35",
|
||||
"bgpPeerRemoteAs": 64600,
|
||||
"bgpPeerState": "idle",
|
||||
"bgpPeerAdminStatus": "stop",
|
||||
"bgpPeerState": "established",
|
||||
"bgpPeerAdminStatus": "start",
|
||||
"bgpPeerLastErrorCode": null,
|
||||
"bgpPeerLastErrorSubCode": null,
|
||||
"bgpPeerLastErrorText": null,
|
||||
"bgpLocalAddr": "0.0.0.0",
|
||||
"bgpPeerRemoteAddr": "0.0.0.0",
|
||||
"bgpPeerDescr": "hle-sg066-ro-lug-2",
|
||||
"bgpPeerInUpdates": 0,
|
||||
"bgpPeerOutUpdates": 0,
|
||||
"bgpPeerInTotalMessages": 0,
|
||||
"bgpPeerOutTotalMessages": 0,
|
||||
"bgpPeerFsmEstablishedTime": 0,
|
||||
"bgpPeerInUpdateElapsedTime": 0,
|
||||
"bgpPeerInUpdates": 85,
|
||||
"bgpPeerOutUpdates": 5903,
|
||||
"bgpPeerInTotalMessages": 573537,
|
||||
"bgpPeerOutTotalMessages": 669768,
|
||||
"bgpPeerFsmEstablishedTime": 5670824,
|
||||
"bgpPeerInUpdateElapsedTime": 5671281,
|
||||
"context_name": "",
|
||||
"bgpLocalAs": 64663,
|
||||
"vrfLocalAs": null
|
||||
@@ -79564,20 +79809,20 @@
|
||||
"astext": "",
|
||||
"bgpPeerIdentifier": "10.248.3.50",
|
||||
"bgpPeerRemoteAs": 64600,
|
||||
"bgpPeerState": "idle",
|
||||
"bgpPeerAdminStatus": "stop",
|
||||
"bgpPeerState": "established",
|
||||
"bgpPeerAdminStatus": "start",
|
||||
"bgpPeerLastErrorCode": null,
|
||||
"bgpPeerLastErrorSubCode": null,
|
||||
"bgpPeerLastErrorText": null,
|
||||
"bgpLocalAddr": "0.0.0.0",
|
||||
"bgpPeerRemoteAddr": "0.0.0.0",
|
||||
"bgpPeerDescr": "hle-sg068-ro-tsr-1",
|
||||
"bgpPeerInUpdates": 0,
|
||||
"bgpPeerOutUpdates": 0,
|
||||
"bgpPeerInTotalMessages": 0,
|
||||
"bgpPeerOutTotalMessages": 0,
|
||||
"bgpPeerFsmEstablishedTime": 0,
|
||||
"bgpPeerInUpdateElapsedTime": 0,
|
||||
"bgpPeerInUpdates": 9580,
|
||||
"bgpPeerOutUpdates": 2,
|
||||
"bgpPeerInTotalMessages": 326855,
|
||||
"bgpPeerOutTotalMessages": 368877,
|
||||
"bgpPeerFsmEstablishedTime": 9518460,
|
||||
"bgpPeerInUpdateElapsedTime": 6290,
|
||||
"context_name": "",
|
||||
"bgpLocalAs": 64663,
|
||||
"vrfLocalAs": null
|
||||
@@ -79586,8 +79831,8 @@
|
||||
"astext": "",
|
||||
"bgpPeerIdentifier": "10.248.3.51",
|
||||
"bgpPeerRemoteAs": 64600,
|
||||
"bgpPeerState": "idle",
|
||||
"bgpPeerAdminStatus": "stop",
|
||||
"bgpPeerState": "established",
|
||||
"bgpPeerAdminStatus": "start",
|
||||
"bgpPeerLastErrorCode": null,
|
||||
"bgpPeerLastErrorSubCode": null,
|
||||
"bgpPeerLastErrorText": null,
|
||||
@@ -79595,11 +79840,11 @@
|
||||
"bgpPeerRemoteAddr": "0.0.0.0",
|
||||
"bgpPeerDescr": "hle-sg068-ro-tsr-2",
|
||||
"bgpPeerInUpdates": 0,
|
||||
"bgpPeerOutUpdates": 0,
|
||||
"bgpPeerInTotalMessages": 0,
|
||||
"bgpPeerOutTotalMessages": 0,
|
||||
"bgpPeerFsmEstablishedTime": 0,
|
||||
"bgpPeerInUpdateElapsedTime": 0,
|
||||
"bgpPeerOutUpdates": 7438,
|
||||
"bgpPeerInTotalMessages": 317272,
|
||||
"bgpPeerOutTotalMessages": 372651,
|
||||
"bgpPeerFsmEstablishedTime": 9518454,
|
||||
"bgpPeerInUpdateElapsedTime": 9518677,
|
||||
"context_name": "",
|
||||
"bgpLocalAs": 64663,
|
||||
"vrfLocalAs": null
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user