From 36fe6c83dca9cc7d32b73c3fdfe318cb81e8f8c8 Mon Sep 17 00:00:00 2001 From: Misha Komarovskiy Date: Sun, 21 Jan 2018 06:21:39 +0300 Subject: [PATCH] fix: Bgp-peers junos empty afi-safi names (#8083) * fix: Bgp-peers junos empty afi-safi names * fix discovery of all names * fix polling rrd names assignment Signed-off-by: Misha Komarovskiy * Update tests data for junos bgp-peers safi update Signed-off-by: Misha Komarovskiy --- includes/discovery/bgp-peers.inc.php | 19 ++- includes/polling/bgp-peers.inc.php | 17 +- tests/data/junos_mx.json | 222 +++++++++++++-------------- tests/snmpsim/junos_mx.snmprec | 48 +++--- 4 files changed, 162 insertions(+), 144 deletions(-) diff --git a/includes/discovery/bgp-peers.inc.php b/includes/discovery/bgp-peers.inc.php index 768a32d685..268f86bba3 100644 --- a/includes/discovery/bgp-peers.inc.php +++ b/includes/discovery/bgp-peers.inc.php @@ -80,11 +80,19 @@ if (Config::get('enable_bgp')) { } if (!$bgp4_mib && $device['os'] == 'junos') { - $safis[1] = 'unicast'; - $safis[2] = 'multicast'; - $safis[3] = 'unicastAndMulticast'; - $safis[4] = 'labeledUnicast'; - $safis[128] = 'vpn'; + $afis['ipv4'] = 'ipv4'; + $afis['ipv6'] = 'ipv6'; + $afis[25] = 'l2vpn'; + $safis[1] = 'unicast'; + $safis[2] = 'multicast'; + $safis[3] = 'unicastAndMulticast'; + $safis[4] = 'labeledUnicast'; + $safis[5] = 'mvpn'; + $safis[65] = 'vpls'; + $safis[70] = 'evpn'; + $safis[128] = 'vpn'; + $safis[132] = 'rtfilter'; + $safis[133] = 'flow'; if (!isset($j_peerIndexes)) { $j_bgp = snmpwalk_cache_multi_oid($device, 'jnxBgpM2PeerEntry', $jbgp, 'BGP4-V2-MIB-JUNIPER', 'junos'); @@ -111,6 +119,7 @@ if (Config::get('enable_bgp')) { foreach ($j_afisafi[$j_peerIndexes[$peer['ip']]] as $afisafi) { list ($afi,$safi) = explode('.', $afisafi); + $afi = $afis[$afi]; $safi = $safis[$safi]; $af_list[$peer['ip']][$afi][$safi] = 1; add_cbgp_peer($device, $peer, $afi, $safi); diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php index 01ac928214..2d69223e32 100644 --- a/includes/polling/bgp-peers.inc.php +++ b/includes/polling/bgp-peers.inc.php @@ -306,10 +306,19 @@ if ($config['enable_bgp']) { }//end if if ($device['os'] == 'junos') { - $safis['unicast'] = 1; - $safis['multicast'] = 2; - $afis['ipv4'] = 1; - $afis['ipv6'] = 2; + $afis['ipv4'] = 1; + $afis['ipv6'] = 2; + $afis['l2vpn'] = 25; + $safis['unicast'] = 1; + $safis['multicast'] = 2; + $safis['unicastAndMulticast'] = 3; + $safis['labeledUnicast'] = 4; + $safis['mvpn'] = 5; + $safis['vpls'] = 65; + $safis['evpn'] = 70; + $safis['vpn'] = 128; + $safis['rtfilter'] = 132; + $safis['flow'] = 133; if (!isset($j_prefixes)) { $j_prefixes = snmpwalk_cache_multi_oid($device, 'jnxBgpM2PrefixInPrefixesAccepted', $j_prefixes, 'BGP4-V2-MIB-JUNIPER', 'junos', '-OQnU'); diff --git a/tests/data/junos_mx.json b/tests/data/junos_mx.json index 7aa739fb76..599cd0dce9 100644 --- a/tests/data/junos_mx.json +++ b/tests/data/junos_mx.json @@ -57,54 +57,6 @@ } ], "bgpPeers_cbgp": [ - { - "bgpPeerIdentifier": "192.168.99.25", - "afi": "25", - "safi": "", - "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": "" - }, - { - "bgpPeerIdentifier": "192.168.99.25", - "afi": "ipv4", - "safi": "", - "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": "" - }, { "bgpPeerIdentifier": "192.168.99.25", "afi": "ipv4", @@ -129,6 +81,30 @@ "WithdrawnPrefixes_prev": "0", "context_name": "" }, + { + "bgpPeerIdentifier": "192.168.99.25", + "afi": "ipv4", + "safi": "mvpn", + "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": "" + }, { "bgpPeerIdentifier": "192.168.99.25", "afi": "ipv4", @@ -177,6 +153,30 @@ "WithdrawnPrefixes_prev": "0", "context_name": "" }, + { + "bgpPeerIdentifier": "192.168.99.25", + "afi": "l2vpn", + "safi": "vpls", + "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": "" + }, { "bgpPeerIdentifier": "192.168.99.34", "afi": "ipv4", @@ -290,11 +290,11 @@ "bgpPeerAdminStatus": "running", "bgpLocalAddr": "192.168.99.24", "bgpPeerRemoteAddr": "0.0.0.0", - "bgpPeerInUpdates": "7", - "bgpPeerOutUpdates": "0", - "bgpPeerInTotalMessages": "115", - "bgpPeerOutTotalMessages": "107", - "bgpPeerFsmEstablishedTime": "2915", + "bgpPeerInUpdates": "56", + "bgpPeerOutUpdates": "1", + "bgpPeerInTotalMessages": "13199", + "bgpPeerOutTotalMessages": "13351", + "bgpPeerFsmEstablishedTime": "361781", "bgpPeerInUpdateElapsedTime": "0", "context_name": "" }, @@ -308,9 +308,9 @@ "bgpPeerRemoteAddr": "0.0.0.0", "bgpPeerInUpdates": "6", "bgpPeerOutUpdates": "0", - "bgpPeerInTotalMessages": "99", - "bgpPeerOutTotalMessages": "101", - "bgpPeerFsmEstablishedTime": "2744", + "bgpPeerInTotalMessages": "14583", + "bgpPeerOutTotalMessages": "16137", + "bgpPeerFsmEstablishedTime": "437296", "bgpPeerInUpdateElapsedTime": "0", "context_name": "" }, @@ -326,65 +326,17 @@ "bgpPeerOutUpdates": "0", "bgpPeerInTotalMessages": "0", "bgpPeerOutTotalMessages": "0", - "bgpPeerFsmEstablishedTime": "1645", + "bgpPeerFsmEstablishedTime": "633976", "bgpPeerInUpdateElapsedTime": "0", "context_name": "" } ], "bgpPeers_cbgp": [ - { - "bgpPeerIdentifier": "192.168.99.25", - "afi": "25", - "safi": "", - "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": "" - }, - { - "bgpPeerIdentifier": "192.168.99.25", - "afi": "ipv4", - "safi": "", - "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": "" - }, { "bgpPeerIdentifier": "192.168.99.25", "afi": "ipv4", "safi": "multicast", - "AcceptedPrefixes": "0", + "AcceptedPrefixes": "4", "DeniedPrefixes": "0", "PrefixAdminLimit": "0", "PrefixThreshold": "0", @@ -392,7 +344,31 @@ "AdvertisedPrefixes": "0", "SuppressedPrefixes": "0", "WithdrawnPrefixes": "0", - "AcceptedPrefixes_delta": "0", + "AcceptedPrefixes_delta": "4", + "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": "" + }, + { + "bgpPeerIdentifier": "192.168.99.25", + "afi": "ipv4", + "safi": "mvpn", + "AcceptedPrefixes": "4", + "DeniedPrefixes": "0", + "PrefixAdminLimit": "0", + "PrefixThreshold": "0", + "PrefixClearThreshold": "0", + "AdvertisedPrefixes": "0", + "SuppressedPrefixes": "0", + "WithdrawnPrefixes": "0", + "AcceptedPrefixes_delta": "4", "AcceptedPrefixes_prev": "0", "DeniedPrefixes_delta": "0", "DeniedPrefixes_prev": "0", @@ -408,7 +384,7 @@ "bgpPeerIdentifier": "192.168.99.25", "afi": "ipv4", "safi": "unicast", - "AcceptedPrefixes": "0", + "AcceptedPrefixes": "20", "DeniedPrefixes": "0", "PrefixAdminLimit": "0", "PrefixThreshold": "0", @@ -416,7 +392,7 @@ "AdvertisedPrefixes": "0", "SuppressedPrefixes": "0", "WithdrawnPrefixes": "0", - "AcceptedPrefixes_delta": "0", + "AcceptedPrefixes_delta": "20", "AcceptedPrefixes_prev": "0", "DeniedPrefixes_delta": "0", "DeniedPrefixes_prev": "0", @@ -432,7 +408,7 @@ "bgpPeerIdentifier": "192.168.99.25", "afi": "ipv4", "safi": "vpn", - "AcceptedPrefixes": "0", + "AcceptedPrefixes": "20", "DeniedPrefixes": "0", "PrefixAdminLimit": "0", "PrefixThreshold": "0", @@ -440,7 +416,31 @@ "AdvertisedPrefixes": "0", "SuppressedPrefixes": "0", "WithdrawnPrefixes": "0", - "AcceptedPrefixes_delta": "0", + "AcceptedPrefixes_delta": "20", + "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": "" + }, + { + "bgpPeerIdentifier": "192.168.99.25", + "afi": "l2vpn", + "safi": "vpls", + "AcceptedPrefixes": "20", + "DeniedPrefixes": "0", + "PrefixAdminLimit": "0", + "PrefixThreshold": "0", + "PrefixClearThreshold": "0", + "AdvertisedPrefixes": "0", + "SuppressedPrefixes": "0", + "WithdrawnPrefixes": "0", + "AcceptedPrefixes_delta": "20", "AcceptedPrefixes_prev": "0", "DeniedPrefixes_delta": "0", "DeniedPrefixes_prev": "0", diff --git a/tests/snmpsim/junos_mx.snmprec b/tests/snmpsim/junos_mx.snmprec index 76423dd2ec..df16933ea5 100644 --- a/tests/snmpsim/junos_mx.snmprec +++ b/tests/snmpsim/junos_mx.snmprec @@ -1,11 +1,11 @@ 1.3.6.1.2.1.1.1.0|4|Juniper Networks, Inc. mx80 internet router, kernel JUNOS 16.2R2.8, Build date: 2017-07-06 04:21:20 UTC Copyright (c) 1996-2017 Juniper Networks, Inc. 1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2636.1.1.1.2.57 -1.3.6.1.2.1.1.3.0|67|12421061 +1.3.6.1.2.1.1.3.0|67|63397606 1.3.6.1.2.1.1.4.0|4| 1.3.6.1.2.1.1.5.0|4| 1.3.6.1.2.1.1.6.0|4| 1.3.6.1.2.1.15.2.0|2|64513 -1.3.6.1.2.1.25.1.1.0|67|12442019 +1.3.6.1.2.1.25.1.1.0|67|63413353 1.3.6.1.2.1.25.6.3.1.2.2|4|JUNOS Base OS Software Suite [16.2R2.8] 1.3.6.1.4.1.2636.3.1.3.0|4|G0290 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.1.0.1.192.168.99.24.1.192.168.99.25|4x|C0A86319 @@ -29,7 +29,7 @@ 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.7.0.1.192.168.99.24.1.192.168.99.25|4x|C0A86318 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.7.0.1.192.168.99.24.1.192.168.99.34|4x|C0A86318 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.7.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|4x|FD000028000100010000000000010004 -1.3.6.1.4.1.2636.5.1.1.2.1.1.1.8.0.1.192.168.99.24.1.192.168.99.25|66|179 +1.3.6.1.4.1.2636.5.1.1.2.1.1.1.8.0.1.192.168.99.24.1.192.168.99.25|66|51162 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.8.0.1.192.168.99.24.1.192.168.99.34|66|179 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.8.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|66|0 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.9.0.1.192.168.99.24.1.192.168.99.25|66|64513 @@ -41,8 +41,8 @@ 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.11.0.1.192.168.99.24.1.192.168.99.25|4x|C0A86319 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.11.0.1.192.168.99.24.1.192.168.99.34|4x|C0A86322 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.11.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|4x|FD000028000100010000000000010005 -1.3.6.1.4.1.2636.5.1.1.2.1.1.1.12.0.1.192.168.99.24.1.192.168.99.25|66|38686 -1.3.6.1.4.1.2636.5.1.1.2.1.1.1.12.0.1.192.168.99.24.1.192.168.99.34|66|36976 +1.3.6.1.4.1.2636.5.1.1.2.1.1.1.12.0.1.192.168.99.24.1.192.168.99.25|66|179 +1.3.6.1.4.1.2636.5.1.1.2.1.1.1.12.0.1.192.168.99.24.1.192.168.99.34|66|34534 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.12.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|66|0 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.13.0.1.192.168.99.24.1.192.168.99.25|66|64513 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.13.0.1.192.168.99.24.1.192.168.99.34|66|65000 @@ -53,23 +53,23 @@ 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.15.0.1.192.168.99.24.1.192.168.99.25|66|0 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.15.0.1.192.168.99.24.1.192.168.99.34|66|0 1.3.6.1.4.1.2636.5.1.1.2.1.1.1.15.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|66|0 -1.3.6.1.4.1.2636.5.1.1.2.4.1.1.1.0.1.192.168.99.24.1.192.168.99.25|66|2915 -1.3.6.1.4.1.2636.5.1.1.2.4.1.1.1.0.1.192.168.99.24.1.192.168.99.34|66|2744 -1.3.6.1.4.1.2636.5.1.1.2.4.1.1.1.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|66|1645 -1.3.6.1.4.1.2636.5.1.1.2.4.1.1.2.0.1.192.168.99.24.1.192.168.99.25|66|2888 -1.3.6.1.4.1.2636.5.1.1.2.4.1.1.2.0.1.192.168.99.24.1.192.168.99.34|66|2743 -1.3.6.1.4.1.2636.5.1.1.2.4.1.1.2.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|66|1645 -1.3.6.1.4.1.2636.5.1.1.2.6.1.1.1.0.1.192.168.99.24.1.192.168.99.25|65|7 +1.3.6.1.4.1.2636.5.1.1.2.4.1.1.1.0.1.192.168.99.24.1.192.168.99.25|66|361781 +1.3.6.1.4.1.2636.5.1.1.2.4.1.1.1.0.1.192.168.99.24.1.192.168.99.34|66|437296 +1.3.6.1.4.1.2636.5.1.1.2.4.1.1.1.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|66|633976 +1.3.6.1.4.1.2636.5.1.1.2.4.1.1.2.0.1.192.168.99.24.1.192.168.99.25|66|49798 +1.3.6.1.4.1.2636.5.1.1.2.4.1.1.2.0.1.192.168.99.24.1.192.168.99.34|66|437296 +1.3.6.1.4.1.2636.5.1.1.2.4.1.1.2.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|66|633977 +1.3.6.1.4.1.2636.5.1.1.2.6.1.1.1.0.1.192.168.99.24.1.192.168.99.25|65|56 1.3.6.1.4.1.2636.5.1.1.2.6.1.1.1.0.1.192.168.99.24.1.192.168.99.34|65|6 1.3.6.1.4.1.2636.5.1.1.2.6.1.1.1.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|65|0 -1.3.6.1.4.1.2636.5.1.1.2.6.1.1.2.0.1.192.168.99.24.1.192.168.99.25|65|0 +1.3.6.1.4.1.2636.5.1.1.2.6.1.1.2.0.1.192.168.99.24.1.192.168.99.25|65|1 1.3.6.1.4.1.2636.5.1.1.2.6.1.1.2.0.1.192.168.99.24.1.192.168.99.34|65|0 1.3.6.1.4.1.2636.5.1.1.2.6.1.1.2.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|65|0 -1.3.6.1.4.1.2636.5.1.1.2.6.1.1.3.0.1.192.168.99.24.1.192.168.99.25|65|115 -1.3.6.1.4.1.2636.5.1.1.2.6.1.1.3.0.1.192.168.99.24.1.192.168.99.34|65|99 +1.3.6.1.4.1.2636.5.1.1.2.6.1.1.3.0.1.192.168.99.24.1.192.168.99.25|65|13199 +1.3.6.1.4.1.2636.5.1.1.2.6.1.1.3.0.1.192.168.99.24.1.192.168.99.34|65|14583 1.3.6.1.4.1.2636.5.1.1.2.6.1.1.3.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|65|0 -1.3.6.1.4.1.2636.5.1.1.2.6.1.1.4.0.1.192.168.99.24.1.192.168.99.25|65|107 -1.3.6.1.4.1.2636.5.1.1.2.6.1.1.4.0.1.192.168.99.24.1.192.168.99.34|65|101 +1.3.6.1.4.1.2636.5.1.1.2.6.1.1.4.0.1.192.168.99.24.1.192.168.99.25|65|13351 +1.3.6.1.4.1.2636.5.1.1.2.6.1.1.4.0.1.192.168.99.24.1.192.168.99.34|65|16137 1.3.6.1.4.1.2636.5.1.1.2.6.1.1.4.0.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.4.2.253.0.0.40.0.1.0.1.0.0.0.0.0.1.0.5|65|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.1.0.1.1|2|1 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.1.0.1.2|2|1 @@ -93,8 +93,8 @@ 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.0.1.2|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.0.1.4|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.0.1.128|66|0 -1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.1.1.1|66|0 -1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.1.1.2|66|0 +1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.1.1.1|66|20 +1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.1.1.2|66|4 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.1.1.5|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.1.1.128|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.7.1.25.65|66|0 @@ -102,8 +102,8 @@ 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.0.1.2|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.0.1.4|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.0.1.128|66|0 -1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.1.1.1|66|0 -1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.1.1.2|66|0 +1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.1.1.1|66|20 +1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.1.1.2|66|4 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.1.1.5|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.1.1.128|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.8.1.25.65|66|0 @@ -129,9 +129,9 @@ 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.0.1.2|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.0.1.4|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.0.1.128|66|0 -1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.1.1.1|66|0 -1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.1.1.2|66|0 +1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.1.1.1|66|6 +1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.1.1.2|66|4 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.1.1.5|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.1.1.128|66|0 1.3.6.1.4.1.2636.5.1.1.2.6.2.1.11.1.25.65|66|0 -1.3.6.1.6.3.10.2.1.3.0|2|124211 +1.3.6.1.6.3.10.2.1.3.0|2|633976