From 96fa9c6ec6b2b0c28c06b71dfa352ef42aa79f3f Mon Sep 17 00:00:00 2001 From: vivia11 Date: Tue, 24 Apr 2018 20:36:14 -0600 Subject: [PATCH] Rewrite state sensors to walk entire table for TIMOS (#8588) * Rewrite state sensors to walk entire table * Adding test data --- .../discovery/sensors/state/timos.inc.php | 124 ++-- tests/data/timos.json | 532 ++++++++++++++++++ tests/snmpsim/timos.snmprec | 85 +++ 3 files changed, 665 insertions(+), 76 deletions(-) diff --git a/includes/discovery/sensors/state/timos.inc.php b/includes/discovery/sensors/state/timos.inc.php index bda593d53b..5f0cc5285c 100644 --- a/includes/discovery/sensors/state/timos.inc.php +++ b/includes/discovery/sensors/state/timos.inc.php @@ -1,81 +1,53 @@ 1, 'generic' => 3, 'graph' => 0, 'descr' => 'Unknown'), + array('value' => 2, 'generic' => 3, 'graph' => 0, 'descr' => 'Not Equipped'), + array('value' => 3, 'generic' => 0, 'graph' => 0, 'descr' => 'OK'), + array('value' => 4, 'generic' => 2, 'graph' => 0, 'descr' => 'Failed'), + array('value' => 5, 'generic' => 1, 'graph' => 0, 'descr' => 'Out of Service') ); - foreach ($nokia_device_states as $state) { - $insert = array( - 'state_index_id' => $state[0], - 'state_descr' => $state[1], - 'state_draw_graph' => $state[2], - 'state_value' => $state[3], - 'state_generic_value' => $state[4], - ); - dbInsert($insert, 'state_translations'); + + create_state_index($dev_state_name, $dev_states); + + $ps_state_name = 'tmnxChassisPowerSupplyAssignedTypes'; + $ps_states = array( + array('value' => 0, 'generic' => 3, 'graph' => 0, 'descr' => 'None'), + array('value' => 1, 'generic' => 0, 'graph' => 0, 'descr' => 'DC'), + array('value' => 2, 'generic' => 0, 'graph' => 0, 'descr' => 'Single AC'), + array('value' => 3, 'generic' => 0, 'graph' => 0, 'descr' => 'Multiple AC') + ); + + create_state_index($ps_state_name, $ps_states); + + $ps_table = array( + array('tbl_index' => 2, 'desc' => 'AC Status PS ', 'type' => $dev_state_name), + array('tbl_index' => 3, 'desc' => 'DC Status PS ', 'type' => $dev_state_name), + array('tbl_index' => 4, 'desc' => 'Temperature Status PS ', 'type' => $dev_state_name), + array('tbl_index' => 6, 'desc' => 'Power Supply 1 Status PS ', 'type' => $dev_state_name), + array('tbl_index' => 7, 'desc' => 'Power Supply 2 Status PS ', 'type' => $dev_state_name), + array('tbl_index' => 8, 'desc' => 'Assigned Type PS ', 'type' => $ps_state_name), + array('tbl_index' => 9, 'desc' => 'Input Status PS ', 'type' => $dev_state_name), + array('tbl_index' => 10, 'desc' => 'Output Status PS ', 'type' => $dev_state_name), + ); + + $base_oid = '.1.3.6.1.4.1.6527.3.1.2.2.1.5.1.'; + + foreach ($ps_table as $entry) { + foreach ($oids as $index => $value) { + $num_oid = $base_oid.$entry['tbl_index'].".1.".$index; + $sensor_index = 'tmnxPowerSupplyTable.'.$entry['tbl_index'].".1.".$index; + $desc = $entry['desc'].$index; + + //Discover sensors + discover_sensor($valid['sensor'], 'state', $device, $num_oid, $sensor_index, $entry['type'], $desc, 1, 1, null, null, null, null, $value[$num_oid]); + + // Create sensor to state index + create_sensor_to_state_index($device, $entry['type'], $sensor_index); + } } } - -$nokia_device_ps_assigned_types_name = 'tmnxChassisPowerSupplyAssignedTypes'; -$nokia_device_ps_assigned_types_index = create_state_index($nokia_device_ps_assigned_types_name); -if ($nokia_device_ps_assigned_types_index !== null) { - $nokia_device_ps_assigned_types = array( - array($nokia_device_ps_assigned_types_index, 'None', 0,0,0), - array($nokia_device_ps_assigned_types_index, 'DC', 0,1,0), - array($nokia_device_ps_assigned_types_index, 'Single AC', 0,2,0), - array($nokia_device_ps_assigned_types_index, 'Multiple AC', 0,3,0), - array($nokia_device_ps_assigned_types_index, 'default', 0,4,3), - ); - foreach ($nokia_device_ps_assigned_types as $state) { - $insert = array( - 'state_index_id' => $state[0], - 'state_descr' => $state[1], - 'state_draw_graph' => $state[2], - 'state_value' => $state[3], - 'state_generic_value' => $state[4], - ); - dbInsert($insert, 'state_translations'); - } -} - -$base_oid = '.1.3.6.1.4.1.6527.3.1.2.2.1.5.1.'; -$power_supply_oids = array( - array('sub_oid' => '2.1.1', 'desc' => 'AC Status', 'type' => $nokia_device_state_name), - array('sub_oid' => '3.1.1', 'desc' => 'DC Status', 'type' => $nokia_device_state_name), - array('sub_oid' => '6.1.1', 'desc' => 'Power Supply 1', 'type' => $nokia_device_state_name), - array('sub_oid' => '7.1.1', 'desc' => 'Power Supply 2', 'type' => $nokia_device_state_name), - array('sub_oid' => '8.1.1', 'desc' => 'Power Supply Type', 'type' => $nokia_device_ps_assigned_types_name), - array('sub_oid' => '9.1.1', 'desc' => 'Power In', 'type' => $nokia_device_state_name), - array('sub_oid' => '10.1.1', 'desc' => 'Power Out', 'type' => $nokia_device_state_name), -); - - -$pst = snmpwalk_cache_numerical_oid($device, 'tmnxChassisPowerSupplyTable', $power_supply_table = array(), 'TIMETRA-CHASSIS-MIB', null, '-OQUsn'); -$power_supply_table = end($pst); - -foreach ($power_supply_oids as $data) { - $full_oid = $base_oid . $data['sub_oid']; - $index = "tmnxChassisPowerSupplyTable." . $data['sub_oid']; - discover_sensor($valid['sensor'], 'state', $device, $full_oid, $index, $data['type'], $data['desc'], 1, 1, null, null, null, null, $power_supply_table[$full_oid], 'snmp', $index); - create_sensor_to_state_index($device, $data['type'], $index); - unset($full_oid); -} - -unset( - $power_supply_state_table, - $nokia_device_state_name, - $nokia_device_state_index, - $nokia_device_states, - $nokia_device_ps_assigned_types_name, - $nokia_device_ps_assigned_types_index, - $nokia_device_ps_assigned_types, - $base_oid, - $power_supply_oids -); diff --git a/tests/data/timos.json b/tests/data/timos.json index 355e95a165..cb1393fdea 100644 --- a/tests/data/timos.json +++ b/tests/data/timos.json @@ -16,5 +16,537 @@ ] }, "poller": "matches discovery" + }, + "sensors": { + "discovery": { + "sensors": [ + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.8.1.1", + "sensor_index": "tmnxPowerSupplyTable.8.1.1", + "sensor_type": "tmnxChassisPowerSupplyAssignedTypes", + "sensor_descr": "Assigned Type PS 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxChassisPowerSupplyAssignedTypes" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.8.1.2", + "sensor_index": "tmnxPowerSupplyTable.8.1.2", + "sensor_type": "tmnxChassisPowerSupplyAssignedTypes", + "sensor_descr": "Assigned Type PS 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxChassisPowerSupplyAssignedTypes" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.10.1.1", + "sensor_index": "tmnxPowerSupplyTable.10.1.1", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Output Status PS 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "1", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.10.1.2", + "sensor_index": "tmnxPowerSupplyTable.10.1.2", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Output Status PS 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "1", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.2.1.1", + "sensor_index": "tmnxPowerSupplyTable.2.1.1", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "AC Status PS 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.2.1.2", + "sensor_index": "tmnxPowerSupplyTable.2.1.2", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "AC Status PS 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.3.1.1", + "sensor_index": "tmnxPowerSupplyTable.3.1.1", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "DC Status PS 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.3.1.2", + "sensor_index": "tmnxPowerSupplyTable.3.1.2", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "DC Status PS 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.4.1.1", + "sensor_index": "tmnxPowerSupplyTable.4.1.1", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Temperature Status PS 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.4.1.2", + "sensor_index": "tmnxPowerSupplyTable.4.1.2", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Temperature Status PS 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.6.1.1", + "sensor_index": "tmnxPowerSupplyTable.6.1.1", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Power Supply 1 Status PS 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.6.1.2", + "sensor_index": "tmnxPowerSupplyTable.6.1.2", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Power Supply 1 Status PS 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.7.1.1", + "sensor_index": "tmnxPowerSupplyTable.7.1.1", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Power Supply 2 Status PS 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.7.1.2", + "sensor_index": "tmnxPowerSupplyTable.7.1.2", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Power Supply 2 Status PS 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.9.1.1", + "sensor_index": "tmnxPowerSupplyTable.9.1.1", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Input Status PS 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "1", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.5.1.9.1.2", + "sensor_index": "tmnxPowerSupplyTable.9.1.2", + "sensor_type": "tmnxDeviceState", + "sensor_descr": "Input Status PS 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "1", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "tmnxDeviceState" + }, + { + "sensor_deleted": "0", + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.134217729", + "sensor_index": "tmnxHwTemperature.1.134217729", + "sensor_type": "nokia", + "sensor_descr": "Slot 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "71", + "sensor_limit": "85", + "sensor_limit_warn": null, + "sensor_limit_low": "61", + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, + { + "sensor_deleted": "0", + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.150994977", + "sensor_index": "tmnxHwTemperature.1.150994977", + "sensor_type": "nokia", + "sensor_descr": "Slot A", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "71", + "sensor_limit": "85", + "sensor_limit_warn": null, + "sensor_limit_low": "61", + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, + { + "sensor_deleted": "0", + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.184549633", + "sensor_index": "tmnxHwTemperature.1.184549633", + "sensor_type": "nokia", + "sensor_descr": "MDA 1/1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "-128", + "sensor_limit": "85", + "sensor_limit_warn": null, + "sensor_limit_low": "-138", + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, + { + "sensor_deleted": "0", + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.50331649", + "sensor_index": "tmnxHwTemperature.1.50331649", + "sensor_type": "nokia", + "sensor_descr": "Chassis 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "71", + "sensor_limit": "85", + "sensor_limit_warn": null, + "sensor_limit_low": "61", + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + } + ], + "state_indexes": [ + { + "state_name": "tmnxChassisPowerSupplyAssignedTypes", + "state_descr": "None", + "state_draw_graph": "0", + "state_value": "0", + "state_generic_value": "3" + }, + { + "state_name": "tmnxChassisPowerSupplyAssignedTypes", + "state_descr": "DC", + "state_draw_graph": "0", + "state_value": "1", + "state_generic_value": "0" + }, + { + "state_name": "tmnxChassisPowerSupplyAssignedTypes", + "state_descr": "Single AC", + "state_draw_graph": "0", + "state_value": "2", + "state_generic_value": "0" + }, + { + "state_name": "tmnxChassisPowerSupplyAssignedTypes", + "state_descr": "Multiple AC", + "state_draw_graph": "0", + "state_value": "3", + "state_generic_value": "0" + }, + { + "state_name": "tmnxDeviceState", + "state_descr": "Unknown", + "state_draw_graph": "0", + "state_value": "1", + "state_generic_value": "3" + }, + { + "state_name": "tmnxDeviceState", + "state_descr": "Not Equipped", + "state_draw_graph": "0", + "state_value": "2", + "state_generic_value": "3" + }, + { + "state_name": "tmnxDeviceState", + "state_descr": "OK", + "state_draw_graph": "0", + "state_value": "3", + "state_generic_value": "0" + }, + { + "state_name": "tmnxDeviceState", + "state_descr": "Failed", + "state_draw_graph": "0", + "state_value": "4", + "state_generic_value": "2" + }, + { + "state_name": "tmnxDeviceState", + "state_descr": "Out of Service", + "state_draw_graph": "0", + "state_value": "5", + "state_generic_value": "1" + } + ] + }, + "poller": "matches discovery" } } diff --git a/tests/snmpsim/timos.snmprec b/tests/snmpsim/timos.snmprec index 22912874b7..123fa1880c 100644 --- a/tests/snmpsim/timos.snmprec +++ b/tests/snmpsim/timos.snmprec @@ -1,3 +1,88 @@ 1.3.6.1.2.1.1.1.0|4|Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010 1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.1.3 +1.3.6.1.2.1.1.3.0|67|213962520 +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.4.1.6527.3.1.2.1.1.1.0|2|42 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.2.1.1|2|3 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.2.1.2|2|3 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.3.1.1|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.3.1.2|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.4.1.1|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.4.1.2|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.5.1.1|2|85 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.5.1.2|2|85 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.6.1.1|2|3 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.6.1.2|2|3 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.7.1.1|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.7.1.2|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.8.1.1|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.8.1.2|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.9.1.1|2|1 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.9.1.2|2|1 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.10.1.1|2|1 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.10.1.2|2|1 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.11.1.1|2|0 +1.3.6.1.4.1.6527.3.1.2.2.1.5.1.11.1.2|2|0 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.50331649|6|1.3.6.1.4.1.6527.3.1.2.2.1.21.1.4.1.3.1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.83886081|6|1.3.6.1.4.1.6527.3.1.2.2.1.5.1.2.1.1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.83886082|6|1.3.6.1.4.1.6527.3.1.2.2.1.5.1.2.1.2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.100663297|6|1.3.6.1.4.1.6527.3.1.2.2.1.4.1.2.1.1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.134217729|6|1.3.6.1.4.1.6527.3.1.2.2.3.2.1.2.1.1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.150994977|6|1.3.6.1.4.1.6527.3.1.2.2.3.4.1.3.1.2.1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.167772162|6|1.3.6.1.4.1.6527.3.1.2.2.3.6.1.2.1.2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.184549633|6|1.3.6.1.4.1.6527.3.1.2.2.3.8.1.2.1.1.1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.184549634|6|1.3.6.1.4.1.6527.3.1.2.2.3.8.1.2.1.1.2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.201327105|6|1.3.6.1.4.1.6527.3.1.2.2.3.7.1.2.1.2.1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.201327106|6|1.3.6.1.4.1.6527.3.1.2.2.3.7.1.2.1.2.2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.2.1.201327107|6|1.3.6.1.4.1.6527.3.1.2.2.3.7.1.2.1.2.3 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.50331649|4|Chassis 1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.83886081|4|Power Supply 1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.83886082|4|Power Supply 2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.100663297|4|Fan 1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.134217729|4|Slot 1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.150994977|4|Slot A +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.167772162|4|Slot A +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.184549633|4|MDA 1/1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.184549634|4|MDA 1/2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.201327105|4|cf1: +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.201327106|4|cf2: +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.8.1.201327107|4|uf1: +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.50331649|2|1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.83886081|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.83886082|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.100663297|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.134217729|2|1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.150994977|2|1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.167772162|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.184549633|2|1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.184549634|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.201327105|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.201327106|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.17.1.201327107|2|2 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.50331649|2|71 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.83886081|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.83886082|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.100663297|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.134217729|2|71 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.150994977|2|71 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.167772162|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.184549633|2|-128 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.184549634|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.201327105|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.201327106|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.18.1.201327107|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.50331649|2|85 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.83886081|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.83886082|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.100663297|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.134217729|2|85 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.150994977|2|85 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.167772162|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.184549633|2|85 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.184549634|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.201327105|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.201327106|2|-1 +1.3.6.1.4.1.6527.3.1.2.2.1.8.1.19.1.201327107|2|-1 +1.3.6.1.6.3.10.2.1.3.0|2|2139627