clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 02:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug - Fix CISCO-BGP4-MIB logic (#16260)

Browse Source 
* Fix CISCO-BGP4-MIB logic

* style

* tests

* tests suite
This commit is contained in:
PipoCanaja 2024-08-07 04:19:50 +02:00 committed by GitHub
parent cc971b6233
commit b62a4bacd4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/polling/bgp-peers.inc.php
View File

@ -620,9 +620,10 @@ if (! empty($peers)) {
$cbgpPeerPrefixAdminLimit = $cbgp_data['cbgpPeerPrefixAdminLimit'];
$cbgpPeerPrefixThreshold = $cbgp_data['cbgpPeerPrefixThreshold'];
$cbgpPeerPrefixClearThreshold = $cbgp_data['cbgpPeerPrefixClearThreshold'];
$cbgpPeerAdvertisedPrefixes = $cbgp_data['cbgpPeerAdvertisedPrefixes'];
$cbgpPeerAdvertisedPrefixes = max(0, $cbgp_data['cbgpPeerAdvertisedPrefixes'] - $cbgp_data['cbgpPeerWithdrawnPrefixes']);
$cbgpPeerWithdrawnPrefixes = 0; // no use, it is a gauge32 value, only the difference between cbgpPeerAdvertisedPrefixes and cbgpPeerWithdrawnPrefixes makes sense.
// CF CISCO-BGP4-MIB definition for both
$cbgpPeerSuppressedPrefixes = $cbgp_data['cbgpPeerSuppressedPrefixes'];
$cbgpPeerWithdrawnPrefixes = $cbgp_data['cbgpPeerWithdrawnPrefixes'];
unset($cbgp_data);
} //end if

24
tests/data/iosxe.json
View File

@ -202,7 +202,7 @@
"bgpPeerRemoteAs": 65083,
"bgpPeerState": "established",
"bgpPeerAdminStatus": "start",
"bgpPeerLastErrorCode": null,
"bgpPeerLastErrorCode": 0,
"bgpPeerLastErrorSubCode": null,
"bgpPeerLastErrorText": null,
"bgpPeerIface": null,
@ -225,7 +225,7 @@
"bgpPeerRemoteAs": 65083,
"bgpPeerState": "established",
"bgpPeerAdminStatus": "start",
"bgpPeerLastErrorCode": null,
"bgpPeerLastErrorCode": 0,
"bgpPeerLastErrorSubCode": null,
"bgpPeerLastErrorText": null,
"bgpPeerIface": null,
@ -248,7 +248,7 @@
"bgpPeerRemoteAs": 65083,
"bgpPeerState": "established",
"bgpPeerAdminStatus": "start",
"bgpPeerLastErrorCode": null,
"bgpPeerLastErrorCode": 0,
"bgpPeerLastErrorSubCode": null,
"bgpPeerLastErrorText": null,
"bgpPeerIface": null,
@ -271,7 +271,7 @@
"bgpPeerRemoteAs": 65083,
"bgpPeerState": "established",
"bgpPeerAdminStatus": "start",
"bgpPeerLastErrorCode": null,
"bgpPeerLastErrorCode": 0,
"bgpPeerLastErrorSubCode": null,
"bgpPeerLastErrorText": null,
"bgpPeerIface": null,
@ -299,18 +299,18 @@
"PrefixAdminLimit": 0,
"PrefixThreshold": 0,
"PrefixClearThreshold": 0,
"AdvertisedPrefixes": 3,
"AdvertisedPrefixes": 2,
"SuppressedPrefixes": 0,
"WithdrawnPrefixes": 1,
"WithdrawnPrefixes": 0,
"AcceptedPrefixes_delta": 1,
"AcceptedPrefixes_prev": 0,
"DeniedPrefixes_delta": 0,
"DeniedPrefixes_prev": 0,
"AdvertisedPrefixes_delta": 3,
"AdvertisedPrefixes_delta": 2,
"AdvertisedPrefixes_prev": 0,
"SuppressedPrefixes_delta": 0,
"SuppressedPrefixes_prev": 0,
"WithdrawnPrefixes_delta": 1,
"WithdrawnPrefixes_delta": 0,
"WithdrawnPrefixes_prev": 0,
"context_name": ""
},
@ -323,18 +323,18 @@
"PrefixAdminLimit": 0,
"PrefixThreshold": 0,
"PrefixClearThreshold": 0,
"AdvertisedPrefixes": 3,
"AdvertisedPrefixes": 2,
"SuppressedPrefixes": 0,
"WithdrawnPrefixes": 1,
"WithdrawnPrefixes": 0,
"AcceptedPrefixes_delta": 1,
"AcceptedPrefixes_prev": 0,
"DeniedPrefixes_delta": 0,
"DeniedPrefixes_prev": 0,
"AdvertisedPrefixes_delta": 3,
"AdvertisedPrefixes_delta": 2,
"AdvertisedPrefixes_prev": 0,
"SuppressedPrefixes_delta": 0,
"SuppressedPrefixes_prev": 0,
"WithdrawnPrefixes_delta": 1,
"WithdrawnPrefixes_delta": 0,
"WithdrawnPrefixes_prev": 0,
"context_name": ""
},

24
tests/data/iosxe_c9400.json
View File

@ -32232,7 +32232,7 @@
"bgpPeerRemoteAs": 65083,
"bgpPeerState": "established",
"bgpPeerAdminStatus": "start",
"bgpPeerLastErrorCode": null,
"bgpPeerLastErrorCode": 0,
"bgpPeerLastErrorSubCode": null,
"bgpPeerLastErrorText": null,
"bgpPeerIface": null,
@ -32255,7 +32255,7 @@
"bgpPeerRemoteAs": 65083,
"bgpPeerState": "established",
"bgpPeerAdminStatus": "start",
"bgpPeerLastErrorCode": null,
"bgpPeerLastErrorCode": 0,
"bgpPeerLastErrorSubCode": null,
"bgpPeerLastErrorText": null,
"bgpPeerIface": null,
@ -32278,7 +32278,7 @@
"bgpPeerRemoteAs": 65083,
"bgpPeerState": "established",
"bgpPeerAdminStatus": "start",
"bgpPeerLastErrorCode": null,
"bgpPeerLastErrorCode": 0,
"bgpPeerLastErrorSubCode": null,
"bgpPeerLastErrorText": null,
"bgpPeerIface": null,
@ -32301,7 +32301,7 @@
"bgpPeerRemoteAs": 65083,
"bgpPeerState": "established",
"bgpPeerAdminStatus": "start",
"bgpPeerLastErrorCode": null,
"bgpPeerLastErrorCode": 0,
"bgpPeerLastErrorSubCode": null,
"bgpPeerLastErrorText": null,
"bgpPeerIface": null,
@ -32329,18 +32329,18 @@
"PrefixAdminLimit": 0,
"PrefixThreshold": 0,
"PrefixClearThreshold": 0,
"AdvertisedPrefixes": 3,
"AdvertisedPrefixes": 2,
"SuppressedPrefixes": 0,
"WithdrawnPrefixes": 1,
"WithdrawnPrefixes": 0,
"AcceptedPrefixes_delta": 1,
"AcceptedPrefixes_prev": 0,
"DeniedPrefixes_delta": 0,
"DeniedPrefixes_prev": 0,
"AdvertisedPrefixes_delta": 3,
"AdvertisedPrefixes_delta": 2,
"AdvertisedPrefixes_prev": 0,
"SuppressedPrefixes_delta": 0,
"SuppressedPrefixes_prev": 0,
"WithdrawnPrefixes_delta": 1,
"WithdrawnPrefixes_delta": 0,
"WithdrawnPrefixes_prev": 0,
"context_name": ""
},
@ -32353,18 +32353,18 @@
"PrefixAdminLimit": 0,
"PrefixThreshold": 0,
"PrefixClearThreshold": 0,
"AdvertisedPrefixes": 3,
"AdvertisedPrefixes": 2,
"SuppressedPrefixes": 0,
"WithdrawnPrefixes": 1,
"WithdrawnPrefixes": 0,
"AcceptedPrefixes_delta": 1,
"AcceptedPrefixes_prev": 0,
"DeniedPrefixes_delta": 0,
"DeniedPrefixes_prev": 0,
"AdvertisedPrefixes_delta": 3,
"AdvertisedPrefixes_delta": 2,
"AdvertisedPrefixes_prev": 0,
"SuppressedPrefixes_delta": 0,
"SuppressedPrefixes_prev": 0,
"WithdrawnPrefixes_delta": 1,
"WithdrawnPrefixes_delta": 0,
"WithdrawnPrefixes_prev": 0,
"context_name": ""
},

16
tests/data/iosxr_asr9001.json
View File

@ -22396,18 +22396,18 @@
"PrefixAdminLimit": 2097152,
"PrefixThreshold": 75,
"PrefixClearThreshold": 75,
"AdvertisedPrefixes": 25,
"AdvertisedPrefixes": 18,
"SuppressedPrefixes": 0,
"WithdrawnPrefixes": 7,
"WithdrawnPrefixes": 0,
"AcceptedPrefixes_delta": 5,
"AcceptedPrefixes_prev": 0,
"DeniedPrefixes_delta": 0,
"DeniedPrefixes_prev": 0,
"AdvertisedPrefixes_delta": 25,
"AdvertisedPrefixes_delta": 18,
"AdvertisedPrefixes_prev": 0,
"SuppressedPrefixes_delta": 0,
"SuppressedPrefixes_prev": 0,
"WithdrawnPrefixes_delta": 7,
"WithdrawnPrefixes_delta": 0,
"WithdrawnPrefixes_prev": 0,
"context_name": ""
},
@ -22420,18 +22420,18 @@
"PrefixAdminLimit": 2097152,
"PrefixThreshold": 75,
"PrefixClearThreshold": 75,
"AdvertisedPrefixes": 25,
"AdvertisedPrefixes": 18,
"SuppressedPrefixes": 0,
"WithdrawnPrefixes": 7,
"WithdrawnPrefixes": 0,
"AcceptedPrefixes_delta": 5,
"AcceptedPrefixes_prev": 0,
"DeniedPrefixes_delta": 0,
"DeniedPrefixes_prev": 0,
"AdvertisedPrefixes_delta": 25,
"AdvertisedPrefixes_delta": 18,
"AdvertisedPrefixes_prev": 0,
"SuppressedPrefixes_delta": 0,
"SuppressedPrefixes_prev": 0,
"WithdrawnPrefixes_delta": 7,
"WithdrawnPrefixes_delta": 0,
"WithdrawnPrefixes_prev": 0,
"context_name": ""
},

16
tests/data/iosxr_asr9901.json
View File

@ -20891,18 +20891,18 @@
"PrefixAdminLimit": 2097152,
"PrefixThreshold": 75,
"PrefixClearThreshold": 75,
"AdvertisedPrefixes": 12,
"AdvertisedPrefixes": 10,
"SuppressedPrefixes": 0,
"WithdrawnPrefixes": 2,
"WithdrawnPrefixes": 0,
"AcceptedPrefixes_delta": 5,
"AcceptedPrefixes_prev": 0,
"DeniedPrefixes_delta": 0,
"DeniedPrefixes_prev": 0,
"AdvertisedPrefixes_delta": 12,
"AdvertisedPrefixes_delta": 10,
"AdvertisedPrefixes_prev": 0,
"SuppressedPrefixes_delta": 0,
"SuppressedPrefixes_prev": 0,
"WithdrawnPrefixes_delta": 2,
"WithdrawnPrefixes_delta": 0,
"WithdrawnPrefixes_prev": 0,
"context_name": ""
},
@ -20915,18 +20915,18 @@
"PrefixAdminLimit": 2097152,
"PrefixThreshold": 75,
"PrefixClearThreshold": 75,
"AdvertisedPrefixes": 12,
"AdvertisedPrefixes": 10,
"SuppressedPrefixes": 0,
"WithdrawnPrefixes": 2,
"WithdrawnPrefixes": 0,
"AcceptedPrefixes_delta": 5,
"AcceptedPrefixes_prev": 0,
"DeniedPrefixes_delta": 0,
"DeniedPrefixes_prev": 0,
"AdvertisedPrefixes_delta": 12,
"AdvertisedPrefixes_delta": 10,
"AdvertisedPrefixes_prev": 0,
"SuppressedPrefixes_delta": 0,
"SuppressedPrefixes_prev": 0,
"WithdrawnPrefixes_delta": 2,
"WithdrawnPrefixes_delta": 0,
"WithdrawnPrefixes_prev": 0,
"context_name": ""
},