From a2bce2690d003a181211b6f7ccb0b052a3cf42b2 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Fri, 29 Dec 2017 09:17:23 -0600 Subject: [PATCH] bgp-peers: fix incorrect variable name (#7979) --- includes/polling/bgp-peers.inc.php | 4 +- tests/data/iosxe.json | 86 +++++++++++++++--------------- tests/snmpsim/iosxe.snmprec | 8 +-- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php index 9bbfb5572a..aac053cd34 100644 --- a/includes/polling/bgp-peers.inc.php +++ b/includes/polling/bgp-peers.inc.php @@ -330,7 +330,7 @@ if ($config['enable_bgp']) { // Validate data $cbgpPeerAcceptedPrefixes = set_numeric($cbgpPeerAcceptedPrefixes); $cbgpPeerDeniedPrefixes = set_numeric($cbgpPeerDeniedPrefixes); - $cbgpPeerPrefixAdminLimit = set_numeric($cbgpPeerAdminLimit); + $cbgpPeerPrefixAdminLimit = set_numeric($cbgpPeerPrefixAdminLimit); $cbgpPeerPrefixThreshold = set_numeric($cbgpPeerPrefixThreshold); $cbgpPeerPrefixClearThreshold = set_numeric($cbgpPeerPrefixClearThreshold); $cbgpPeerAdvertisedPrefixes = set_numeric($cbgpPeerAdvertisedPrefixes); @@ -340,7 +340,7 @@ if ($config['enable_bgp']) { $cbgpPeers_cbgp_fields = array( 'AcceptedPrefixes' => $cbgpPeerAcceptedPrefixes, 'DeniedPrefixes' => $cbgpPeerDeniedPrefixes, - 'PrefixAdminLimit' => $cbgpPeerAdminLimit, + 'PrefixAdminLimit' => $cbgpPeerPrefixAdminLimit, 'PrefixThreshold' => $cbgpPeerPrefixThreshold, 'PrefixClearThreshold' => $cbgpPeerPrefixClearThreshold, 'AdvertisedPrefixes' => $cbgpPeerAdvertisedPrefixes, diff --git a/tests/data/iosxe.json b/tests/data/iosxe.json index ff342bdf25..c8ac26eb43 100644 --- a/tests/data/iosxe.json +++ b/tests/data/iosxe.json @@ -184,7 +184,7 @@ "bgpPeerRemoteAs": "65083", "bgpPeerState": "established", "bgpPeerAdminStatus": "start", - "bgpLocalAddr": "130.225.243.14", + "bgpLocalAddr": "10.44.32.14", "bgpPeerRemoteAddr": "0.0.0.0", "bgpPeerInUpdates": "1", "bgpPeerOutUpdates": "4", @@ -200,7 +200,7 @@ "bgpPeerRemoteAs": "65083", "bgpPeerState": "established", "bgpPeerAdminStatus": "start", - "bgpLocalAddr": "130.226.136.162", + "bgpLocalAddr": "10.45.63.162", "bgpPeerRemoteAddr": "0.0.0.0", "bgpPeerInUpdates": "1", "bgpPeerOutUpdates": "4", @@ -216,7 +216,7 @@ "bgpPeerRemoteAs": "65083", "bgpPeerState": "established", "bgpPeerAdminStatus": "start", - "bgpLocalAddr": "2001:0878:0000:e000:0082:00e1:00f3:000e", + "bgpLocalAddr": "2001:0db8:85a3:0000:341a:8a2e:03e1:000e", "bgpPeerRemoteAddr": "0.0.0.0", "bgpPeerInUpdates": "1", "bgpPeerOutUpdates": "3", @@ -232,7 +232,7 @@ "bgpPeerRemoteAs": "65083", "bgpPeerState": "established", "bgpPeerAdminStatus": "start", - "bgpLocalAddr": "2001:0878:0000:e000:0082:00e2:0088:00a2", + "bgpLocalAddr": "2001:0db8:85a3:0000:341a:8a2e:03e2:00a2", "bgpPeerRemoteAddr": "0.0.0.0", "bgpPeerInUpdates": "1", "bgpPeerOutUpdates": "3", @@ -248,23 +248,23 @@ "bgpPeerIdentifier": "10.44.32.13", "afi": "ipv4", "safi": "vpn", - "AcceptedPrefixes": "0", + "AcceptedPrefixes": "1", "DeniedPrefixes": "0", "PrefixAdminLimit": "0", "PrefixThreshold": "0", "PrefixClearThreshold": "0", - "AdvertisedPrefixes": "0", + "AdvertisedPrefixes": "3", "SuppressedPrefixes": "0", - "WithdrawnPrefixes": "0", - "AcceptedPrefixes_delta": "0", + "WithdrawnPrefixes": "1", + "AcceptedPrefixes_delta": "1", "AcceptedPrefixes_prev": "0", "DeniedPrefixes_delta": "0", "DeniedPrefixes_prev": "0", - "AdvertisedPrefixes_delta": "0", + "AdvertisedPrefixes_delta": "3", "AdvertisedPrefixes_prev": "0", "SuppressedPrefixes_delta": "0", "SuppressedPrefixes_prev": "0", - "WithdrawnPrefixes_delta": "0", + "WithdrawnPrefixes_delta": "1", "WithdrawnPrefixes_prev": "0", "context_name": "" }, @@ -272,23 +272,23 @@ "bgpPeerIdentifier": "10.45.63.161", "afi": "ipv4", "safi": "vpn", - "AcceptedPrefixes": "0", + "AcceptedPrefixes": "1", "DeniedPrefixes": "0", "PrefixAdminLimit": "0", "PrefixThreshold": "0", "PrefixClearThreshold": "0", - "AdvertisedPrefixes": "0", + "AdvertisedPrefixes": "3", "SuppressedPrefixes": "0", - "WithdrawnPrefixes": "0", - "AcceptedPrefixes_delta": "0", + "WithdrawnPrefixes": "1", + "AcceptedPrefixes_delta": "1", "AcceptedPrefixes_prev": "0", "DeniedPrefixes_delta": "0", "DeniedPrefixes_prev": "0", - "AdvertisedPrefixes_delta": "0", + "AdvertisedPrefixes_delta": "3", "AdvertisedPrefixes_prev": "0", "SuppressedPrefixes_delta": "0", "SuppressedPrefixes_prev": "0", - "WithdrawnPrefixes_delta": "0", + "WithdrawnPrefixes_delta": "1", "WithdrawnPrefixes_prev": "0", "context_name": "" }, @@ -296,23 +296,23 @@ "bgpPeerIdentifier": "2001:0db8:85a3:0000:341a:8a2e:03e1:000d", "afi": "ipv6", "safi": "vpn", - "AcceptedPrefixes": "0", - "DeniedPrefixes": "0", - "PrefixAdminLimit": "0", - "PrefixThreshold": "0", - "PrefixClearThreshold": "0", - "AdvertisedPrefixes": "0", - "SuppressedPrefixes": "0", - "WithdrawnPrefixes": "0", - "AcceptedPrefixes_delta": "0", + "AcceptedPrefixes": "1", + "DeniedPrefixes": "1", + "PrefixAdminLimit": "1", + "PrefixThreshold": "1", + "PrefixClearThreshold": "1", + "AdvertisedPrefixes": "1", + "SuppressedPrefixes": "1", + "WithdrawnPrefixes": "1", + "AcceptedPrefixes_delta": "1", "AcceptedPrefixes_prev": "0", - "DeniedPrefixes_delta": "0", + "DeniedPrefixes_delta": "1", "DeniedPrefixes_prev": "0", - "AdvertisedPrefixes_delta": "0", + "AdvertisedPrefixes_delta": "1", "AdvertisedPrefixes_prev": "0", - "SuppressedPrefixes_delta": "0", + "SuppressedPrefixes_delta": "1", "SuppressedPrefixes_prev": "0", - "WithdrawnPrefixes_delta": "0", + "WithdrawnPrefixes_delta": "1", "WithdrawnPrefixes_prev": "0", "context_name": "" }, @@ -320,27 +320,27 @@ "bgpPeerIdentifier": "2001:0db8:85a3:0000:341a:8a2e:03e2:00a1", "afi": "ipv6", "safi": "vpn", - "AcceptedPrefixes": "0", - "DeniedPrefixes": "0", - "PrefixAdminLimit": "0", - "PrefixThreshold": "0", - "PrefixClearThreshold": "0", - "AdvertisedPrefixes": "0", - "SuppressedPrefixes": "0", - "WithdrawnPrefixes": "0", - "AcceptedPrefixes_delta": "0", + "AcceptedPrefixes": "1", + "DeniedPrefixes": "1", + "PrefixAdminLimit": "1", + "PrefixThreshold": "1", + "PrefixClearThreshold": "1", + "AdvertisedPrefixes": "1", + "SuppressedPrefixes": "1", + "WithdrawnPrefixes": "1", + "AcceptedPrefixes_delta": "1", "AcceptedPrefixes_prev": "0", - "DeniedPrefixes_delta": "0", + "DeniedPrefixes_delta": "1", "DeniedPrefixes_prev": "0", - "AdvertisedPrefixes_delta": "0", + "AdvertisedPrefixes_delta": "1", "AdvertisedPrefixes_prev": "0", - "SuppressedPrefixes_delta": "0", + "SuppressedPrefixes_delta": "1", "SuppressedPrefixes_prev": "0", - "WithdrawnPrefixes_delta": "0", + "WithdrawnPrefixes_delta": "1", "WithdrawnPrefixes_prev": "0", "context_name": "" } ] } } -} \ No newline at end of file +} diff --git a/tests/snmpsim/iosxe.snmprec b/tests/snmpsim/iosxe.snmprec index a8b69719c8..0aff81dd5d 100644 --- a/tests/snmpsim/iosxe.snmprec +++ b/tests/snmpsim/iosxe.snmprec @@ -23,10 +23,10 @@ 1.3.6.1.4.1.9.9.187.1.2.5.1.4.1.4.10.45.63.161|2|2 1.3.6.1.4.1.9.9.187.1.2.5.1.4.2.16.32.1.13.184.133.163.0.0.52.26.138.46.3.225.0.13|2|2 1.3.6.1.4.1.9.9.187.1.2.5.1.4.2.16.32.1.13.184.133.163.0.0.52.26.138.46.3.226.0.161|2|2 -1.3.6.1.4.1.9.9.187.1.2.5.1.6.1.4.10.44.32.13|4x|82E1F30E -1.3.6.1.4.1.9.9.187.1.2.5.1.6.1.4.10.45.63.161|4x|82E288A2 -1.3.6.1.4.1.9.9.187.1.2.5.1.6.2.16.32.1.13.184.133.163.0.0.52.26.138.46.3.225.0.13|4x|200108780000E000008200E100F3000E -1.3.6.1.4.1.9.9.187.1.2.5.1.6.2.16.32.1.13.184.133.163.0.0.52.26.138.46.3.226.0.161|4x|200108780000E000008200E2008800A2 +1.3.6.1.4.1.9.9.187.1.2.5.1.6.1.4.10.44.32.13|4x|0A2C200E +1.3.6.1.4.1.9.9.187.1.2.5.1.6.1.4.10.45.63.161|4x|0A2D3FA2 +1.3.6.1.4.1.9.9.187.1.2.5.1.6.2.16.32.1.13.184.133.163.0.0.52.26.138.46.3.225.0.13|4x|20010DB885A30000341A8A2E03E1000E +1.3.6.1.4.1.9.9.187.1.2.5.1.6.2.16.32.1.13.184.133.163.0.0.52.26.138.46.3.226.0.161|4x|20010DB885A30000341A8A2E03E200A2 1.3.6.1.4.1.9.9.187.1.2.5.1.11.1.4.10.44.32.13|66|65083 1.3.6.1.4.1.9.9.187.1.2.5.1.11.1.4.10.45.63.161|66|65083 1.3.6.1.4.1.9.9.187.1.2.5.1.11.2.16.32.1.13.184.133.163.0.0.52.26.138.46.3.225.0.13|66|65083