From 78a85fe3efa8279e643a2b8003205ff2fdfd0f37 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Wed, 18 Oct 2023 01:59:18 -0500 Subject: [PATCH] Ports module: fix nulls not updating (#15467) * Ports module fix nulls not updating * Fix broken test data I'd like to see how it came out broken in the first place, but I don't have access * Update json data * Fix fortivoice snmprec * Fix scs-ks * Fix bad siteboss550 data --- includes/polling/ports.inc.php | 9 +-- tests/data/adva_fsp150_xg116proh.json | 26 ++++---- tests/data/dell-compellent_scv3020.json | 24 +++---- tests/data/fortivoice.json | 60 ++++++++--------- tests/data/scs-ks.json | 28 ++++---- tests/data/siteboss550.json | 64 +++++++++---------- tests/snmpsim/adva_fsp150_xg116proh.snmprec | 2 +- tests/snmpsim/dell-compellent_scv3020.snmprec | 38 +++++------ tests/snmpsim/fortivoice.snmprec | 8 +-- tests/snmpsim/scs-ks.snmprec | 2 +- tests/snmpsim/siteboss550.snmprec | 4 +- 11 files changed, 130 insertions(+), 135 deletions(-) diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index f515e20ed4..3ae529af45 100644 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -613,7 +613,8 @@ foreach ($ports as $port) { if (isset($this_port['ifHighSpeed']) && is_numeric($this_port['ifHighSpeed'])) { d_echo("ifHighSpeed ({$this_port['ifHighSpeed']}) "); - $this_port['ifSpeed'] = $this_port['ifHighSpeed'] . '000000'; // * 1000000, but handle in sql + $this_port['ifSpeed'] = $this_port['ifHighSpeed'] == '0' ? 0 + : $this_port['ifHighSpeed'] . '000000'; // * 1000000, but handle in sql } elseif (isset($this_port['ifSpeed']) && is_numeric($this_port['ifSpeed'])) { d_echo("ifSpeed ({$this_port['ifSpeed']}) "); } else { @@ -920,12 +921,6 @@ foreach ($ports as $port) { } } - foreach ($port['update'] as $key => $val_check) { - if (! isset($val_check)) { - unset($port['update'][$key]); - } - } - // Update Database if $port['update'] is not empty // or if previous poll time $port['poll_time'] is different from device globally previous port time $device_global_ports["poll_prev"] // This could happen if disabled port was enabled since last polling diff --git a/tests/data/adva_fsp150_xg116proh.json b/tests/data/adva_fsp150_xg116proh.json index 74124a31c2..901cb6c888 100644 --- a/tests/data/adva_fsp150_xg116proh.json +++ b/tests/data/adva_fsp150_xg116proh.json @@ -2261,11 +2261,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 12826, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 12828, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -2277,11 +2277,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 5113072, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 2428655, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, @@ -2861,11 +2861,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 8349, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 8323, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -2877,11 +2877,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 3677474, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 4558946, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, @@ -2977,11 +2977,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 59840, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 7424, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, @@ -3061,7 +3061,7 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 4294966515, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, @@ -3077,11 +3077,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 189420447, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 187938785, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, diff --git a/tests/data/dell-compellent_scv3020.json b/tests/data/dell-compellent_scv3020.json index ca2b5bac94..0b965fc967 100644 --- a/tests/data/dell-compellent_scv3020.json +++ b/tests/data/dell-compellent_scv3020.json @@ -337,12 +337,12 @@ "ifName": "eth0", "portName": null, "ifIndex": 1, - "ifSpeed": null, - "ifSpeed_prev": 0, + "ifSpeed": 0, + "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 1500, @@ -437,12 +437,12 @@ "ifName": "eth1", "portName": null, "ifIndex": 2, - "ifSpeed": null, - "ifSpeed_prev": 0, + "ifSpeed": 0, + "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 9000, @@ -537,12 +537,12 @@ "ifName": "lo0", "portName": null, "ifIndex": 3, - "ifSpeed": null, - "ifSpeed_prev": 0, + "ifSpeed": 0, + "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 16384, diff --git a/tests/data/fortivoice.json b/tests/data/fortivoice.json index 34a25103b7..3237a97f60 100644 --- a/tests/data/fortivoice.json +++ b/tests/data/fortivoice.json @@ -441,14 +441,14 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": "0", "ifMtu": 1500, "ifType": "ethernetCsmacd", "ifAlias": "port1", - "ifPhysAddress": null, + "ifPhysAddress": "906cac906cac", "ifLastChange": 0, "ifVlan": null, "ifTrunk": null, @@ -465,11 +465,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 15835084, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 2423099, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -481,11 +481,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 1595750231, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 696163083, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, @@ -498,7 +498,7 @@ "ifOutNUcastPkts_prev": 0, "ifOutNUcastPkts_delta": null, "ifOutNUcastPkts_rate": null, - "ifInDiscards": 0, + "ifInDiscards": 15, "ifInDiscards_prev": 0, "ifInDiscards_delta": null, "ifInDiscards_rate": null, @@ -541,14 +541,14 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": "0", "ifMtu": 1500, "ifType": "ethernetCsmacd", "ifAlias": "port2", - "ifPhysAddress": null, + "ifPhysAddress": "906cac906cad", "ifLastChange": 0, "ifVlan": null, "ifTrunk": null, @@ -565,11 +565,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 52279768, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 51766581, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -581,11 +581,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 2780473043, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 2620318903, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, @@ -641,14 +641,14 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": "0", "ifMtu": 1500, "ifType": "ethernetCsmacd", "ifAlias": "port3", - "ifPhysAddress": null, + "ifPhysAddress": "906cac906cae", "ifLastChange": 0, "ifVlan": null, "ifTrunk": null, @@ -665,11 +665,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 157596694, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 110469830, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -681,11 +681,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 1496347950, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 3552430521, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, @@ -741,14 +741,14 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": "0", "ifMtu": 1500, "ifType": "ethernetCsmacd", "ifAlias": "port4", - "ifPhysAddress": null, + "ifPhysAddress": "906cac906caf", "ifLastChange": 0, "ifVlan": null, "ifTrunk": null, @@ -765,11 +765,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 50804659, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 5261761, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -781,11 +781,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 2016607595, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 1130504088, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, @@ -798,7 +798,7 @@ "ifOutNUcastPkts_prev": 0, "ifOutNUcastPkts_delta": null, "ifOutNUcastPkts_rate": null, - "ifInDiscards": 0, + "ifInDiscards": 4, "ifInDiscards_prev": 0, "ifInDiscards_delta": null, "ifInDiscards_rate": null, diff --git a/tests/data/scs-ks.json b/tests/data/scs-ks.json index c8c9a5b8a8..250c2c3cd2 100644 --- a/tests/data/scs-ks.json +++ b/tests/data/scs-ks.json @@ -241,15 +241,15 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 1500, "ifType": "ethernetCsmacd", "ifAlias": "ETH", - "ifPhysAddress": null, - "ifLastChange": 0, + "ifPhysAddress": "000000000001", + "ifLastChange": 120517535, "ifVlan": null, "ifTrunk": null, "ignore": 0, @@ -265,11 +265,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 85065021, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 67907408, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -281,20 +281,20 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 509368580, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 2749288297, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, "poll_prev": null, - "ifInNUcastPkts": 0, + "ifInNUcastPkts": 349, "ifInNUcastPkts_prev": 0, "ifInNUcastPkts_delta": null, "ifInNUcastPkts_rate": null, - "ifOutNUcastPkts": 0, + "ifOutNUcastPkts": 578617, "ifOutNUcastPkts_prev": 0, "ifOutNUcastPkts_delta": null, "ifOutNUcastPkts_rate": null, @@ -306,7 +306,7 @@ "ifOutDiscards_prev": 0, "ifOutDiscards_delta": null, "ifOutDiscards_rate": null, - "ifInUnknownProtos": 0, + "ifInUnknownProtos": 6877290, "ifInUnknownProtos_prev": 0, "ifInUnknownProtos_delta": null, "ifInUnknownProtos_rate": null, @@ -341,14 +341,14 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "down", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "down", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 1500, "ifType": "ethernetCsmacd", "ifAlias": "USB", - "ifPhysAddress": null, + "ifPhysAddress": "000000000000", "ifLastChange": 0, "ifVlan": null, "ifTrunk": null, diff --git a/tests/data/siteboss550.json b/tests/data/siteboss550.json index c530a2a777..89e660f85a 100644 --- a/tests/data/siteboss550.json +++ b/tests/data/siteboss550.json @@ -941,8 +941,8 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "down", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "down", + "ifAdminStatus": "down", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 0, @@ -1041,8 +1041,8 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "down", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "down", + "ifAdminStatus": "down", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 0, @@ -1141,8 +1141,8 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "down", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "down", + "ifAdminStatus": "down", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 0, @@ -1241,8 +1241,8 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "down", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "down", + "ifAdminStatus": "down", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 0, @@ -1341,8 +1341,8 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 16436, @@ -1365,11 +1365,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 30310473, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 30310473, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -1381,11 +1381,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 2669723912, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 2669723912, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, @@ -1441,8 +1441,8 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "down", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "down", + "ifAdminStatus": "down", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 1480, @@ -1541,8 +1541,8 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "down", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "down", + "ifAdminStatus": "down", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 1480, @@ -1641,14 +1641,14 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 1500, "ifType": "ethernetCsmacd", "ifAlias": "ixp0", - "ifPhysAddress": null, + "ifPhysAddress": "0010a3aabbc1", "ifLastChange": 0, "ifVlan": null, "ifTrunk": null, @@ -1665,11 +1665,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 69056846, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 57131572, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -1681,11 +1681,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 2312832275, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 3004575175, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, @@ -1741,14 +1741,14 @@ "ifSpeed_prev": null, "ifConnectorPresent": null, "ifOperStatus": "up", - "ifOperStatus_prev": null, - "ifAdminStatus": null, + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", "ifAdminStatus_prev": null, "ifDuplex": null, "ifMtu": 1500, "ifType": "ethernetCsmacd", "ifAlias": "ixp1", - "ifPhysAddress": null, + "ifPhysAddress": "0010a3aabbc2", "ifLastChange": 0, "ifVlan": null, "ifTrunk": null, @@ -1765,11 +1765,11 @@ "pagpEthcOperationMode": null, "pagpDeviceId": null, "pagpGroupIfIndex": null, - "ifInUcastPkts": 0, + "ifInUcastPkts": 12539545, "ifInUcastPkts_prev": 0, "ifInUcastPkts_delta": null, "ifInUcastPkts_rate": null, - "ifOutUcastPkts": 0, + "ifOutUcastPkts": 4, "ifOutUcastPkts_prev": 0, "ifOutUcastPkts_delta": null, "ifOutUcastPkts_rate": null, @@ -1781,11 +1781,11 @@ "ifOutErrors_prev": 0, "ifOutErrors_delta": null, "ifOutErrors_rate": null, - "ifInOctets": 0, + "ifInOctets": 3825547490, "ifInOctets_prev": 0, "ifInOctets_delta": null, "ifInOctets_rate": null, - "ifOutOctets": 0, + "ifOutOctets": 328, "ifOutOctets_prev": 0, "ifOutOctets_delta": null, "ifOutOctets_rate": null, diff --git a/tests/snmpsim/adva_fsp150_xg116proh.snmprec b/tests/snmpsim/adva_fsp150_xg116proh.snmprec index 9f97256d40..f4de64e109 100644 --- a/tests/snmpsim/adva_fsp150_xg116proh.snmprec +++ b/tests/snmpsim/adva_fsp150_xg116proh.snmprec @@ -199,7 +199,7 @@ 1.3.6.1.2.1.31.1.1.1.5.5|65|0 1.3.6.1.2.1.31.1.1.1.5.6|65|0 1.3.6.1.2.1.31.1.1.1.5.7|65|10340 -1.3.6.1.2.1.31.1.1.1.5.8|65| +1.3.6.1.2.1.31.1.1.1.5.8|65|0 1.3.6.1.2.1.31.1.1.1.5.9|65|0 1.3.6.1.2.1.31.1.1.1.6.1|70|5113072 1.3.6.1.2.1.31.1.1.1.6.2|70|0 diff --git a/tests/snmpsim/dell-compellent_scv3020.snmprec b/tests/snmpsim/dell-compellent_scv3020.snmprec index b000dde2d4..2a2bdce765 100644 --- a/tests/snmpsim/dell-compellent_scv3020.snmprec +++ b/tests/snmpsim/dell-compellent_scv3020.snmprec @@ -15,8 +15,8 @@ 1.3.6.1.2.1.2.2.1.4.1|2|1500 1.3.6.1.2.1.2.2.1.4.2|2|9000 1.3.6.1.2.1.2.2.1.4.3|2|16384 -1.3.6.1.2.1.2.2.1.5.1|66| -1.3.6.1.2.1.2.2.1.5.2|66| +1.3.6.1.2.1.2.2.1.5.1|66|0 +1.3.6.1.2.1.2.2.1.5.2|66|0 1.3.6.1.2.1.2.2.1.5.3|66|0 1.3.6.1.2.1.2.2.1.6.1|4x| 1.3.6.1.2.1.2.2.1.6.2|4x| @@ -30,12 +30,12 @@ 1.3.6.1.2.1.2.2.1.9.1|67|0 1.3.6.1.2.1.2.2.1.9.2|67|0 1.3.6.1.2.1.2.2.1.9.3|67|0 -1.3.6.1.2.1.2.2.1.10.1|65| -1.3.6.1.2.1.2.2.1.10.2|65| -1.3.6.1.2.1.2.2.1.10.3|65| -1.3.6.1.2.1.2.2.1.11.1|65| -1.3.6.1.2.1.2.2.1.11.2|65| -1.3.6.1.2.1.2.2.1.11.3|65| +1.3.6.1.2.1.2.2.1.10.1|65|0 +1.3.6.1.2.1.2.2.1.10.2|65|0 +1.3.6.1.2.1.2.2.1.10.3|65|0 +1.3.6.1.2.1.2.2.1.11.1|65|0 +1.3.6.1.2.1.2.2.1.11.2|65|0 +1.3.6.1.2.1.2.2.1.11.3|65|0 1.3.6.1.2.1.2.2.1.12.1|65|0 1.3.6.1.2.1.2.2.1.12.2|65|0 1.3.6.1.2.1.2.2.1.12.3|65|0 @@ -48,12 +48,12 @@ 1.3.6.1.2.1.2.2.1.15.1|65|0 1.3.6.1.2.1.2.2.1.15.2|65|0 1.3.6.1.2.1.2.2.1.15.3|65|0 -1.3.6.1.2.1.2.2.1.16.1|65| -1.3.6.1.2.1.2.2.1.16.2|65| -1.3.6.1.2.1.2.2.1.16.3|65| -1.3.6.1.2.1.2.2.1.17.1|65| -1.3.6.1.2.1.2.2.1.17.2|65| -1.3.6.1.2.1.2.2.1.17.3|65| +1.3.6.1.2.1.2.2.1.16.1|65|0 +1.3.6.1.2.1.2.2.1.16.2|65|0 +1.3.6.1.2.1.2.2.1.16.3|65|0 +1.3.6.1.2.1.2.2.1.17.1|65|0 +1.3.6.1.2.1.2.2.1.17.2|65|0 +1.3.6.1.2.1.2.2.1.17.3|65|0 1.3.6.1.2.1.2.2.1.18.1|65|0 1.3.6.1.2.1.2.2.1.18.2|65|0 1.3.6.1.2.1.2.2.1.18.3|65|0 @@ -69,14 +69,14 @@ 1.3.6.1.2.1.2.2.1.22.1|6|0.0 1.3.6.1.2.1.2.2.1.22.2|6|0.0 1.3.6.1.2.1.2.2.1.22.3|6|0.0 -1.3.6.1.2.1.4.3.0|65| +1.3.6.1.2.1.4.3.0|65|0 1.3.6.1.2.1.4.4.0|65|0 1.3.6.1.2.1.4.5.0|65|0 1.3.6.1.2.1.4.6.0|65|0 1.3.6.1.2.1.4.7.0|65|0 1.3.6.1.2.1.4.8.0|65|0 -1.3.6.1.2.1.4.9.0|65| -1.3.6.1.2.1.4.10.0|65| +1.3.6.1.2.1.4.9.0|65|0 +1.3.6.1.2.1.4.10.0|65|0 1.3.6.1.2.1.4.11.0|65|0 1.3.6.1.2.1.4.13.0|2|60 1.3.6.1.2.1.4.14.0|65|132 @@ -85,9 +85,9 @@ 1.3.6.1.2.1.4.17.0|65|132 1.3.6.1.2.1.4.18.0|65|0 1.3.6.1.2.1.4.19.0|65|162 -1.3.6.1.2.1.5.1.0|65| +1.3.6.1.2.1.5.1.0|65|0 1.3.6.1.2.1.5.2.0|65|0 -1.3.6.1.2.1.5.3.0|65| +1.3.6.1.2.1.5.3.0|65|0 1.3.6.1.2.1.5.4.0|65|0 1.3.6.1.2.1.5.5.0|65|0 1.3.6.1.2.1.5.6.0|65|0 diff --git a/tests/snmpsim/fortivoice.snmprec b/tests/snmpsim/fortivoice.snmprec index 3d33daafed..1c21d91626 100644 --- a/tests/snmpsim/fortivoice.snmprec +++ b/tests/snmpsim/fortivoice.snmprec @@ -24,10 +24,10 @@ 1.3.6.1.2.1.2.2.1.5.2|66|1048576000 1.3.6.1.2.1.2.2.1.5.3|66|1048576000 1.3.6.1.2.1.2.2.1.5.4|66|1048576000 -1.3.6.1.2.1.2.2.1.6.1|4x|906CAC -1.3.6.1.2.1.2.2.1.6.2|4x|906CAC -1.3.6.1.2.1.2.2.1.6.3|4x|906CAC -1.3.6.1.2.1.2.2.1.6.4|4x|906CAC +1.3.6.1.2.1.2.2.1.6.1|4x|906CAC906CAC +1.3.6.1.2.1.2.2.1.6.2|4x|906CAC906CAD +1.3.6.1.2.1.2.2.1.6.3|4x|906CAC906CAE +1.3.6.1.2.1.2.2.1.6.4|4x|906CAC906CAF 1.3.6.1.2.1.2.2.1.7.1|2|1 1.3.6.1.2.1.2.2.1.7.2|2|1 1.3.6.1.2.1.2.2.1.7.3|2|1 diff --git a/tests/snmpsim/scs-ks.snmprec b/tests/snmpsim/scs-ks.snmprec index 3884680560..a4b1f982d2 100644 --- a/tests/snmpsim/scs-ks.snmprec +++ b/tests/snmpsim/scs-ks.snmprec @@ -14,7 +14,7 @@ 1.3.6.1.2.1.2.2.1.4.2|2|1500 1.3.6.1.2.1.2.2.1.5.1|66|100000000 1.3.6.1.2.1.2.2.1.5.2|66|0 -1.3.6.1.2.1.2.2.1.6.1|4x| +1.3.6.1.2.1.2.2.1.6.1|4x|000000000001 1.3.6.1.2.1.2.2.1.6.2|4x|000000000000 1.3.6.1.2.1.2.2.1.7.1|2|1 1.3.6.1.2.1.2.2.1.7.2|2|1 diff --git a/tests/snmpsim/siteboss550.snmprec b/tests/snmpsim/siteboss550.snmprec index 65dca9502f..52da18e8e4 100644 --- a/tests/snmpsim/siteboss550.snmprec +++ b/tests/snmpsim/siteboss550.snmprec @@ -56,8 +56,8 @@ 1.3.6.1.2.1.2.2.1.6.5|4| 1.3.6.1.2.1.2.2.1.6.6|4| 1.3.6.1.2.1.2.2.1.6.7|4| -1.3.6.1.2.1.2.2.1.6.8|4x|0010A3XXYYZ1 -1.3.6.1.2.1.2.2.1.6.9|4x|0010A3XXYYZ2 +1.3.6.1.2.1.2.2.1.6.8|4x|0010A3AABBC1 +1.3.6.1.2.1.2.2.1.6.9|4x|0010A3AABBC2 1.3.6.1.2.1.2.2.1.7.1|2|2 1.3.6.1.2.1.2.2.1.7.2|2|2 1.3.6.1.2.1.2.2.1.7.3|2|2