diff --git a/LibreNMS/OS/HimoinsaGensets.php b/LibreNMS/OS/HimoinsaGensets.php new file mode 100644 index 0000000000..740fbfc2af --- /dev/null +++ b/LibreNMS/OS/HimoinsaGensets.php @@ -0,0 +1,131 @@ +. + * + * @link https://www.librenms.org + * + * @copyright 2021 Daniel Baeza & Tony Murray + * @author TheGreatDoc & murrant + */ + +namespace LibreNMS\OS; + +use LibreNMS\OS; + +class HimoinsaGensets extends OS +{ + /* state parsing functions + CEC7 (a.k.a CEA7CC2) bitmap status ( R G B T Mn Au Al) + statusConm.0 + R = Mains commutator closed + G = Gen commutator closed + B = Blocked mode + T = Test mode + Mn = Manual mode + Au = Auto mode + Al = Active commutator alarm + In LibreNMS it equals to 3 state sensors: + Closed commutator: Mains or Genset (what commutator is closed, so where the power comes from) + Genset Mode: Block, Test, Manual, Auto (the 4 modes of the genset) + Alarm: Yes or No (If there is a commutator alarm) + Example: + Value = 66 + Value binary = 1000010 + States equals to: + - Alarm: No active alarm + - Genset Mode: Auto + - Closed commutator: Mains + + CEA7 / CEM7 (CEA7 is a combination of CEC7 + CEM7 in a single Central) bitmap status (R G Al Bt B T Mn Au P A) + status.0 + R = Mains commutator closed + G = Gen commutator closed + Al = Active Alarm + Bt = Transfer Pump + B = Blocked mode + T = Test mode + Mn = Manual mode + Au = Auto mode + P = Motor Stopped + A = Motor Running + */ + + /** + * @param int $value + */ + public static function motorStatus($value): int + { + return ($value & 1) | ($value & 2); + } + + /** + * @param int $value + */ + public static function modeStatus($value): int + { + return ($value & 4) | ($value & 8) | ($value & 16) | ($value & 32); + } + + /** + * @param int $value + */ + public static function alarmStatus($value): int + { + return $value & 128; + } + + /** + * @param int $value + */ + public static function transferPumpStatus($value): int + { + return $value & 64; + } + + /** + * @param int $value + */ + public static function commStatus($value): int + { + return ($value & 512) | ($value & 256); + } + + /** + * @param int $value + */ + public static function cec7CommStatus($value): int + { + return ($value & 32) | ($value & 64); + } + + /** + * @param int $value + */ + public static function cec7CommAlarmStatus($value): int + { + return $value & 1; + } + + /** + * @param int $value + */ + public static function cec7ModeStatus($value): int + { + return ($value & 2) | ($value & 4) | ($value & 8) | ($value & 16); + } +} diff --git a/includes/definitions/discovery/himoinsa-gensets.yaml b/includes/definitions/discovery/himoinsa-gensets.yaml index 46572bfd41..34d09b7ee4 100644 --- a/includes/definitions/discovery/himoinsa-gensets.yaml +++ b/includes/definitions/discovery/himoinsa-gensets.yaml @@ -153,3 +153,102 @@ modules: descr: Fuel level divisor: 10 group: Genset + state: + data: + - + oid: status + num_oid: '.1.3.6.1.4.1.41809.1.46.{{ $index }}' + user_func: \LibreNMS\OS\HimoinsaGensets::motorStatus + index: motor + descr: Motor + group: 'CEA7/CEM7' + state_name: HimoinsaMotorStatus + states: + - {value: 1, generic: 2, graph: 0, descr: Running} + - {value: 2, generic: 0, graph: 0, descr: Stopped} + - {value: 0, generic: 3, graph: 0, descr: Unknown} + - + oid: status + num_oid: '.1.3.6.1.4.1.41809.1.46.{{ $index }}' + user_func: \LibreNMS\OS\HimoinsaGensets::modeStatus + index: mode + descr: Mode + group: 'CEA7/CEM7' + state_name: HimoinsaModeStatus + states: + - {value: 4, generic: 0, graph: 0, descr: Auto} + - {value: 8, generic: 2, graph: 0, descr: Manual} + - {value: 16, generic: 1, graph: 0, descr: Test} + - {value: 32, generic: 2, graph: 0, descr: Blocked} + - {value: 0, generic: 3, graph: 0, descr: Unknown} + - + oid: status + num_oid: '.1.3.6.1.4.1.41809.1.46.{{ $index }}' + user_func: \LibreNMS\OS\HimoinsaGensets::transferPumpStatus + index: transfer_pump + descr: Transfer Pump + group: 'CEA7/CEM7' + state_name: HimoinsaTransferPumpStatus + states: + - {value: 0, generic: 0, graph: 0, descr: Off} + - {value: 64, generic: 1, graph: 0, descr: On} + - + oid: status + num_oid: '.1.3.6.1.4.1.41809.1.46.{{ $index }}' + user_func: \LibreNMS\OS\HimoinsaGensets::alarmStatus + index: alarm + descr: Alarm + group: 'CEA7/CEM7' + state_name: HimoinsaAlarmStatus + states: + - {value: 0, generic: 0, graph: 0, descr: No Alarm} + - {value: 128, generic: 2, graph: 0, descr: Alarm} + - + oid: status + num_oid: '.1.3.6.1.4.1.41809.1.46.{{ $index }}' + user_func: \LibreNMS\OS\HimoinsaGensets::commStatus + index: comm + descr: Commutator Mode + group: 'CEA7/CEM7' + state_name: HimoinsaCommStatus + states: + - {value: 512, generic: 2, graph: 0, descr: Genset} + - {value: 256, generic: 0, graph: 0, descr: Mains} + - {value: 0, generic: 3, graph: 0, descr: Unknown} + - + oid: statusConm + num_oid: '.1.3.6.1.4.1.41809.1.55.1.28.{{ $index }}' + user_func: \LibreNMS\OS\HimoinsaGensets::cec7CommStatus + index: 'cec7_comm.{{ $index }}' + descr: Commutator Mode + group: 'CEC7' + state_name: HimoinsaCec7CommStatus + states: + - {value: 32, generic: 2, graph: 0, descr: Genset} + - {value: 64, generic: 0, graph: 0, descr: Mains} + - {value: 0, generic: 3, graph: 0, descr: Unknown} + - + oid: statusConm + num_oid: '.1.3.6.1.4.1.41809.1.55.1.28.{{ $index }}' + user_func: \LibreNMS\OS\HimoinsaGensets::cec7CommAlarmStatus + index: 'cec7_alarm.{{ $index }}' + descr: Alarm + group: 'CEC7' + state_name: HimoinsaCec7AlarmStatus + states: + - {value: 0, generic: 0, graph: 0, descr: No Alarm} + - {value: 1, generic: 2, graph: 0, descr: Alarm} + - + oid: statusConm + num_oid: '.1.3.6.1.4.1.41809.1.55.1.28.{{ $index }}' + user_func: \LibreNMS\OS\HimoinsaGensets::cec7ModeStatus + index: 'cec7_mode.{{ $index }}' + descr: Mode + group: 'CEC7' + state_name: HimoinsaCec7ModeStatus + states: + - {value: 2, generic: 0, graph: 0, descr: Auto} + - {value: 4, generic: 2, graph: 0, descr: Manual} + - {value: 8, generic: 1, graph: 0, descr: Test} + - {value: 16, generic: 2, graph: 0, descr: Blocked} + - {value: 0, generic: 3, graph: 0, descr: Unknown} diff --git a/includes/definitions/himoinsa-gensets.yaml b/includes/definitions/himoinsa-gensets.yaml index 1d259f9df6..758c9640f5 100644 --- a/includes/definitions/himoinsa-gensets.yaml +++ b/includes/definitions/himoinsa-gensets.yaml @@ -3,6 +3,7 @@ text: 'Himoinsa Generator Sets' type: power icon: himoinsa group: himoinsa +mib_dir: himoinsa over: - { graph: device_uptime, text: 'Device Uptime' } discovery: diff --git a/misc/discovery_schema.json b/misc/discovery_schema.json index 02808ebd73..497ae99aee 100644 --- a/misc/discovery_schema.json +++ b/misc/discovery_schema.json @@ -230,6 +230,9 @@ "string" ] }, + "user_func": { + "type": "string" + }, "states": { "type": "array", "items": { diff --git a/tests/data/himoinsa-gensets_v14.json b/tests/data/himoinsa-gensets.json similarity index 53% rename from tests/data/himoinsa-gensets_v14.json rename to tests/data/himoinsa-gensets.json index 31f109f803..05e658cb9e 100644 --- a/tests/data/himoinsa-gensets_v14.json +++ b/tests/data/himoinsa-gensets.json @@ -4,7 +4,7 @@ "devices": [ { "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.41809", + "sysObjectID": ".0.0", "sysDescr": "C2LAN SNMP", "sysContact": "", "version": "210", @@ -154,7 +154,7 @@ "group": "Genset", "sensor_divisor": 10, "sensor_multiplier": 1, - "sensor_current": 77.7, + "sensor_current": 100, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -167,6 +167,198 @@ "user_func": null, "state_name": null }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.41809.1.46.0", + "sensor_index": "alarm", + "sensor_type": "HimoinsaAlarmStatus", + "sensor_descr": "Alarm", + "group": "CEA7/CEM7", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "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": "\\LibreNMS\\OS\\HimoinsaGensets::alarmStatus", + "state_name": "HimoinsaAlarmStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.41809.1.55.1.28.0", + "sensor_index": "cec7_alarm.0", + "sensor_type": "HimoinsaCec7AlarmStatus", + "sensor_descr": "Alarm", + "group": "CEC7", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "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": "\\LibreNMS\\OS\\HimoinsaGensets::cec7CommAlarmStatus", + "state_name": "HimoinsaCec7AlarmStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.41809.1.55.1.28.0", + "sensor_index": "cec7_comm.0", + "sensor_type": "HimoinsaCec7CommStatus", + "sensor_descr": "Commutator Mode", + "group": "CEC7", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 64, + "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": "\\LibreNMS\\OS\\HimoinsaGensets::cec7CommStatus", + "state_name": "HimoinsaCec7CommStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.41809.1.55.1.28.0", + "sensor_index": "cec7_mode.0", + "sensor_type": "HimoinsaCec7ModeStatus", + "sensor_descr": "Mode", + "group": "CEC7", + "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": "\\LibreNMS\\OS\\HimoinsaGensets::cec7ModeStatus", + "state_name": "HimoinsaCec7ModeStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.41809.1.46.0", + "sensor_index": "comm", + "sensor_type": "HimoinsaCommStatus", + "sensor_descr": "Commutator Mode", + "group": "CEA7/CEM7", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "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": "\\LibreNMS\\OS\\HimoinsaGensets::commStatus", + "state_name": "HimoinsaCommStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.41809.1.46.0", + "sensor_index": "mode", + "sensor_type": "HimoinsaModeStatus", + "sensor_descr": "Mode", + "group": "CEA7/CEM7", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 4, + "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": "\\LibreNMS\\OS\\HimoinsaGensets::modeStatus", + "state_name": "HimoinsaModeStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.41809.1.46.0", + "sensor_index": "motor", + "sensor_type": "HimoinsaMotorStatus", + "sensor_descr": "Motor", + "group": "CEA7/CEM7", + "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": "\\LibreNMS\\OS\\HimoinsaGensets::motorStatus", + "state_name": "HimoinsaMotorStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.41809.1.46.0", + "sensor_index": "transfer_pump", + "sensor_type": "HimoinsaTransferPumpStatus", + "sensor_descr": "Transfer Pump", + "group": "CEA7/CEM7", + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "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": "\\LibreNMS\\OS\\HimoinsaGensets::transferPumpStatus", + "state_name": "HimoinsaTransferPumpStatus" + }, { "sensor_deleted": 0, "sensor_class": "voltage", @@ -346,10 +538,10 @@ "group": "Mains", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 411, - "sensor_limit": 472.65, + "sensor_current": 416, + "sensor_limit": 478.4, "sensor_limit_warn": null, - "sensor_limit_low": 349.35, + "sensor_limit_low": 353.6, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -370,10 +562,10 @@ "group": "Mains", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 409, - "sensor_limit": 470.35, + "sensor_current": 417, + "sensor_limit": 479.55, "sensor_limit_warn": null, - "sensor_limit_low": 347.65, + "sensor_limit_low": 354.45, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -394,10 +586,10 @@ "group": "Mains", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 237, - "sensor_limit": 272.55, + "sensor_current": 241, + "sensor_limit": 277.15, "sensor_limit_warn": null, - "sensor_limit_low": 201.45, + "sensor_limit_low": 204.85, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -418,10 +610,10 @@ "group": "Mains", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 237, - "sensor_limit": 272.55, + "sensor_current": 239, + "sensor_limit": 274.85, "sensor_limit_warn": null, - "sensor_limit_low": 201.45, + "sensor_limit_low": 203.15, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -442,10 +634,10 @@ "group": "Mains", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 235, - "sensor_limit": 270.25, + "sensor_current": 239, + "sensor_limit": 274.85, "sensor_limit_warn": null, - "sensor_limit_low": 199.75, + "sensor_limit_low": 203.15, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -456,7 +648,183 @@ "state_name": null } ], - "state_indexes": [] + "state_indexes": [ + { + "state_name": "HimoinsaAlarmStatus", + "state_descr": "No Alarm", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 0 + }, + { + "state_name": "HimoinsaAlarmStatus", + "state_descr": "Alarm", + "state_draw_graph": 0, + "state_value": 128, + "state_generic_value": 2 + }, + { + "state_name": "HimoinsaCec7AlarmStatus", + "state_descr": "No Alarm", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 0 + }, + { + "state_name": "HimoinsaCec7AlarmStatus", + "state_descr": "Alarm", + "state_draw_graph": 0, + "state_value": 1, + "state_generic_value": 2 + }, + { + "state_name": "HimoinsaCec7CommStatus", + "state_descr": "Unknown", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 3 + }, + { + "state_name": "HimoinsaCec7CommStatus", + "state_descr": "Genset", + "state_draw_graph": 0, + "state_value": 32, + "state_generic_value": 2 + }, + { + "state_name": "HimoinsaCec7CommStatus", + "state_descr": "Mains", + "state_draw_graph": 0, + "state_value": 64, + "state_generic_value": 0 + }, + { + "state_name": "HimoinsaCec7ModeStatus", + "state_descr": "Unknown", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 3 + }, + { + "state_name": "HimoinsaCec7ModeStatus", + "state_descr": "Auto", + "state_draw_graph": 0, + "state_value": 2, + "state_generic_value": 0 + }, + { + "state_name": "HimoinsaCec7ModeStatus", + "state_descr": "Manual", + "state_draw_graph": 0, + "state_value": 4, + "state_generic_value": 2 + }, + { + "state_name": "HimoinsaCec7ModeStatus", + "state_descr": "Test", + "state_draw_graph": 0, + "state_value": 8, + "state_generic_value": 1 + }, + { + "state_name": "HimoinsaCec7ModeStatus", + "state_descr": "Blocked", + "state_draw_graph": 0, + "state_value": 16, + "state_generic_value": 2 + }, + { + "state_name": "HimoinsaCommStatus", + "state_descr": "Unknown", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 3 + }, + { + "state_name": "HimoinsaCommStatus", + "state_descr": "Mains", + "state_draw_graph": 0, + "state_value": 256, + "state_generic_value": 0 + }, + { + "state_name": "HimoinsaCommStatus", + "state_descr": "Genset", + "state_draw_graph": 0, + "state_value": 512, + "state_generic_value": 2 + }, + { + "state_name": "HimoinsaModeStatus", + "state_descr": "Unknown", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 3 + }, + { + "state_name": "HimoinsaModeStatus", + "state_descr": "Auto", + "state_draw_graph": 0, + "state_value": 4, + "state_generic_value": 0 + }, + { + "state_name": "HimoinsaModeStatus", + "state_descr": "Manual", + "state_draw_graph": 0, + "state_value": 8, + "state_generic_value": 2 + }, + { + "state_name": "HimoinsaModeStatus", + "state_descr": "Test", + "state_draw_graph": 0, + "state_value": 16, + "state_generic_value": 1 + }, + { + "state_name": "HimoinsaModeStatus", + "state_descr": "Blocked", + "state_draw_graph": 0, + "state_value": 32, + "state_generic_value": 2 + }, + { + "state_name": "HimoinsaMotorStatus", + "state_descr": "Unknown", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 3 + }, + { + "state_name": "HimoinsaMotorStatus", + "state_descr": "Running", + "state_draw_graph": 0, + "state_value": 1, + "state_generic_value": 2 + }, + { + "state_name": "HimoinsaMotorStatus", + "state_descr": "Stopped", + "state_draw_graph": 0, + "state_value": 2, + "state_generic_value": 0 + }, + { + "state_name": "HimoinsaTransferPumpStatus", + "state_descr": "Off", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 0 + }, + { + "state_name": "HimoinsaTransferPumpStatus", + "state_descr": "On", + "state_draw_graph": 0, + "state_value": 64, + "state_generic_value": 1 + } + ] }, "poller": "matches discovery" } diff --git a/tests/snmpsim/himoinsa-gensets.snmprec b/tests/snmpsim/himoinsa-gensets.snmprec index 982e7ac933..27b0e81ab3 100644 --- a/tests/snmpsim/himoinsa-gensets.snmprec +++ b/tests/snmpsim/himoinsa-gensets.snmprec @@ -1,2 +1,147 @@ 1.3.6.1.2.1.1.1.0|4|C2LAN SNMP 1.3.6.1.2.1.1.2.0|6|.0.0 +1.3.6.1.2.1.1.3.0|67|2961397636 +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.2.2.1.1.1|2|0 +1.3.6.1.2.1.2.2.1.2.1|4| +1.3.6.1.2.1.2.2.1.3.1|2|6 +1.3.6.1.2.1.2.2.1.4.1|2|1500 +1.3.6.1.2.1.2.2.1.5.1|66|10000000 +1.3.6.1.2.1.2.2.1.6.1|4x|70B3D592C3A6 +1.3.6.1.2.1.2.2.1.7.1|2|1 +1.3.6.1.2.1.2.2.1.8.1|2|1 +1.3.6.1.2.1.2.2.1.9.1|67|0 +1.3.6.1.2.1.2.2.1.10.1|65|2026130231 +1.3.6.1.2.1.2.2.1.11.1|65|190819 +1.3.6.1.2.1.2.2.1.12.1|65|21553941 +1.3.6.1.2.1.2.2.1.13.1|65|0 +1.3.6.1.2.1.2.2.1.14.1|65|0 +1.3.6.1.2.1.2.2.1.15.1|65|0 +1.3.6.1.2.1.2.2.1.16.1|65|857931682 +1.3.6.1.2.1.2.2.1.17.1|65|190937 +1.3.6.1.2.1.2.2.1.18.1|65|5916971 +1.3.6.1.2.1.2.2.1.19.1|65|0 +1.3.6.1.2.1.2.2.1.20.1|65|0 +1.3.6.1.2.1.2.2.1.21.1|66|0 +1.3.6.1.2.1.2.2.1.22.1|6|0.0 +1.3.6.1.2.1.4.3.0|65|12259909 +1.3.6.1.2.1.4.4.0|65|0 +1.3.6.1.2.1.4.5.0|65|59 +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|12259849 +1.3.6.1.2.1.4.10.0|65|6042904 +1.3.6.1.2.1.4.11.0|65|0 +1.3.6.1.2.1.4.12.0|65|0 +1.3.6.1.2.1.4.14.0|65|0 +1.3.6.1.2.1.4.15.0|65|0 +1.3.6.1.2.1.4.16.0|65|0 +1.3.6.1.2.1.4.17.0|65|0 +1.3.6.1.2.1.4.18.0|65|0 +1.3.6.1.2.1.4.19.0|65|0 +1.3.6.1.2.1.4.20.1.2.172.20.21.7|2|1 +1.3.6.1.2.1.4.20.1.3.172.20.21.7|64|255.255.255.0 +1.3.6.1.2.1.4.22.1.2.1.0.0.0.0|4x|C47D4FC446FF +1.3.6.1.2.1.4.22.1.2.1.172.20.21.1|4x|C47D4FC446FF +1.3.6.1.2.1.4.22.1.2.1.172.20.21.7|4x|000000000000 +1.3.6.1.2.1.5.1.0|65|12259881 +1.3.6.1.2.1.5.2.0|65|0 +1.3.6.1.2.1.5.3.0|65|6 +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 +1.3.6.1.2.1.5.7.0|65|0 +1.3.6.1.2.1.5.8.0|65|82725 +1.3.6.1.2.1.5.9.0|65|0 +1.3.6.1.2.1.5.10.0|65|0 +1.3.6.1.2.1.5.11.0|65|0 +1.3.6.1.2.1.5.12.0|65|0 +1.3.6.1.2.1.5.13.0|65|0 +1.3.6.1.2.1.5.14.0|65|82725 +1.3.6.1.2.1.5.15.0|65|0 +1.3.6.1.2.1.5.16.0|65|0 +1.3.6.1.2.1.5.17.0|65|0 +1.3.6.1.2.1.5.18.0|65|0 +1.3.6.1.2.1.5.19.0|65|0 +1.3.6.1.2.1.5.20.0|65|0 +1.3.6.1.2.1.5.21.0|65|0 +1.3.6.1.2.1.5.22.0|65|82725 +1.3.6.1.2.1.5.23.0|65|0 +1.3.6.1.2.1.5.24.0|65|0 +1.3.6.1.2.1.5.25.0|65|0 +1.3.6.1.2.1.5.26.0|65|0 +1.3.6.1.2.1.6.5.0|65|0 +1.3.6.1.2.1.6.6.0|65|22 +1.3.6.1.2.1.6.7.0|65|0 +1.3.6.1.2.1.6.8.0|65|0 +1.3.6.1.2.1.6.9.0|66|0 +1.3.6.1.2.1.6.10.0|65|175 +1.3.6.1.2.1.6.11.0|65|228 +1.3.6.1.2.1.6.12.0|65|2 +1.3.6.1.2.1.6.14.0|65|0 +1.3.6.1.2.1.6.15.0|65|0 +1.3.6.1.2.1.7.1.0|65|43046 +1.3.6.1.2.1.7.2.0|65|12133942 +1.3.6.1.2.1.7.3.0|65|0 +1.3.6.1.2.1.7.4.0|65|5959993 +1.3.6.1.2.1.11.1.0|65|43017 +1.3.6.1.2.1.11.2.0|65|43017 +1.3.6.1.2.1.11.3.0|65|0 +1.3.6.1.2.1.11.4.0|65|0 +1.3.6.1.2.1.11.5.0|65|0 +1.3.6.1.2.1.11.6.0|65|0 +1.3.6.1.2.1.11.8.0|65|0 +1.3.6.1.2.1.11.9.0|65|0 +1.3.6.1.2.1.11.10.0|65|0 +1.3.6.1.2.1.11.11.0|65|0 +1.3.6.1.2.1.11.12.0|65|0 +1.3.6.1.2.1.11.13.0|65|130273 +1.3.6.1.2.1.11.14.0|65|0 +1.3.6.1.2.1.11.15.0|65|39539 +1.3.6.1.2.1.11.16.0|65|2202 +1.3.6.1.2.1.11.17.0|65|0 +1.3.6.1.2.1.11.18.0|65|0 +1.3.6.1.2.1.11.19.0|65|0 +1.3.6.1.2.1.11.20.0|65|0 +1.3.6.1.2.1.11.21.0|65|0 +1.3.6.1.2.1.11.22.0|65|0 +1.3.6.1.2.1.11.24.0|65|0 +1.3.6.1.2.1.11.25.0|65|0 +1.3.6.1.2.1.11.26.0|65|0 +1.3.6.1.2.1.11.27.0|65|0 +1.3.6.1.2.1.11.28.0|65|43041 +1.3.6.1.2.1.11.29.0|65|0 +1.3.6.1.4.1.33118.1.1.1.0|2|420 +1.3.6.1.4.1.41809.1.27.0|2|1000 +1.3.6.1.4.1.41809.1.28.0|2|0 +1.3.6.1.4.1.41809.1.29.0|2|137 +1.3.6.1.4.1.41809.1.46.0|66|6 +1.3.6.1.4.1.41809.1.55.1.2.0|2|500 +1.3.6.1.4.1.41809.1.55.1.3.0|2|416 +1.3.6.1.4.1.41809.1.55.1.5.0|2|417 +1.3.6.1.4.1.41809.1.55.1.6.0|2|241 +1.3.6.1.4.1.41809.1.55.1.7.0|2|239 +1.3.6.1.4.1.41809.1.55.1.8.0|2|239 +1.3.6.1.4.1.41809.1.55.1.9.0|2|0 +1.3.6.1.4.1.41809.1.55.1.10.0|2|0 +1.3.6.1.4.1.41809.1.55.1.11.0|2|0 +1.3.6.1.4.1.41809.1.55.1.12.0|2|0 +1.3.6.1.4.1.41809.1.55.1.14.0|2|0 +1.3.6.1.4.1.41809.1.55.1.15.0|2|0 +1.3.6.1.4.1.41809.1.55.1.16.0|2|0 +1.3.6.1.4.1.41809.1.55.1.17.0|2|0 +1.3.6.1.4.1.41809.1.55.1.18.0|2|0 +1.3.6.1.4.1.41809.1.55.1.19.0|66|320 +1.3.6.1.4.1.41809.1.55.1.20.0|2|0 +1.3.6.1.4.1.41809.1.55.1.21.0|2|1 +1.3.6.1.4.1.41809.1.55.1.22.0|2|1 +1.3.6.1.4.1.41809.1.55.1.23.0|2|1 +1.3.6.1.4.1.41809.1.55.1.25.0|2|0 +1.3.6.1.4.1.41809.1.55.1.26.0|2|0 +1.3.6.1.4.1.41809.1.55.1.27.0|2|0 +1.3.6.1.4.1.41809.1.55.1.28.0|66|66 +1.3.6.1.4.1.41809.1.55.1.29.0|66|0 +1.3.6.1.4.1.41809.2.51|2|210 diff --git a/tests/snmpsim/himoinsa-gensets_v14.snmprec b/tests/snmpsim/himoinsa-gensets_v14.snmprec deleted file mode 100644 index 97d68e655c..0000000000 --- a/tests/snmpsim/himoinsa-gensets_v14.snmprec +++ /dev/null @@ -1,147 +0,0 @@ -1.3.6.1.2.1.1.1.0|4|C2LAN SNMP -1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.41809 -1.3.6.1.2.1.1.3.0|67|2797809756 -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.2.2.1.1.1|2|0 -1.3.6.1.2.1.2.2.1.2.1|4| -1.3.6.1.2.1.2.2.1.3.1|2|6 -1.3.6.1.2.1.2.2.1.4.1|2|1500 -1.3.6.1.2.1.2.2.1.5.1|66|10000000 -1.3.6.1.2.1.2.2.1.6.1|4x|70B3D592C3A6 -1.3.6.1.2.1.2.2.1.7.1|2|1 -1.3.6.1.2.1.2.2.1.8.1|2|1 -1.3.6.1.2.1.2.2.1.9.1|67|0 -1.3.6.1.2.1.2.2.1.10.1|65|1890445988 -1.3.6.1.2.1.2.2.1.11.1|65|25848 -1.3.6.1.2.1.2.2.1.12.1|65|20562615 -1.3.6.1.2.1.2.2.1.13.1|65|0 -1.3.6.1.2.1.2.2.1.14.1|65|0 -1.3.6.1.2.1.2.2.1.15.1|65|0 -1.3.6.1.2.1.2.2.1.16.1|65|796136058 -1.3.6.1.2.1.2.2.1.17.1|65|25946 -1.3.6.1.2.1.2.2.1.18.1|65|5590122 -1.3.6.1.2.1.2.2.1.19.1|65|0 -1.3.6.1.2.1.2.2.1.20.1|65|0 -1.3.6.1.2.1.2.2.1.21.1|66|0 -1.3.6.1.2.1.2.2.1.22.1|6|0.0 -1.3.6.1.2.1.4.3.0|65|11284933 -1.3.6.1.2.1.4.4.0|65|0 -1.3.6.1.2.1.4.5.0|65|59 -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|11284873 -1.3.6.1.2.1.4.10.0|65|5607004 -1.3.6.1.2.1.4.11.0|65|0 -1.3.6.1.2.1.4.12.0|65|0 -1.3.6.1.2.1.4.14.0|65|0 -1.3.6.1.2.1.4.15.0|65|0 -1.3.6.1.2.1.4.16.0|65|0 -1.3.6.1.2.1.4.17.0|65|0 -1.3.6.1.2.1.4.18.0|65|0 -1.3.6.1.2.1.4.19.0|65|0 -1.3.6.1.2.1.4.20.1.2.172.20.21.7|2|1 -1.3.6.1.2.1.4.20.1.3.172.20.21.7|64|255.255.255.0 -1.3.6.1.2.1.4.22.1.2.1.0.0.0.0|4x|C47D4FC446FF -1.3.6.1.2.1.4.22.1.2.1.172.20.21.1|4x|C47D4FC446FF -1.3.6.1.2.1.4.22.1.2.1.172.20.21.7|4x|000000000000 -1.3.6.1.2.1.5.1.0|65|11284928 -1.3.6.1.2.1.5.2.0|65|0 -1.3.6.1.2.1.5.3.0|65|6 -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 -1.3.6.1.2.1.5.7.0|65|0 -1.3.6.1.2.1.5.8.0|65|11383 -1.3.6.1.2.1.5.9.0|65|0 -1.3.6.1.2.1.5.10.0|65|0 -1.3.6.1.2.1.5.11.0|65|0 -1.3.6.1.2.1.5.12.0|65|0 -1.3.6.1.2.1.5.13.0|65|0 -1.3.6.1.2.1.5.14.0|65|11383 -1.3.6.1.2.1.5.15.0|65|0 -1.3.6.1.2.1.5.16.0|65|0 -1.3.6.1.2.1.5.17.0|65|0 -1.3.6.1.2.1.5.18.0|65|0 -1.3.6.1.2.1.5.19.0|65|0 -1.3.6.1.2.1.5.20.0|65|0 -1.3.6.1.2.1.5.21.0|65|0 -1.3.6.1.2.1.5.22.0|65|11383 -1.3.6.1.2.1.5.23.0|65|0 -1.3.6.1.2.1.5.24.0|65|0 -1.3.6.1.2.1.5.25.0|65|0 -1.3.6.1.2.1.5.26.0|65|0 -1.3.6.1.2.1.6.5.0|65|0 -1.3.6.1.2.1.6.6.0|65|22 -1.3.6.1.2.1.6.7.0|65|0 -1.3.6.1.2.1.6.8.0|65|0 -1.3.6.1.2.1.6.9.0|66|0 -1.3.6.1.2.1.6.10.0|65|175 -1.3.6.1.2.1.6.11.0|65|228 -1.3.6.1.2.1.6.12.0|65|2 -1.3.6.1.2.1.6.14.0|65|0 -1.3.6.1.2.1.6.15.0|65|0 -1.3.6.1.2.1.7.1.0|65|5343 -1.3.6.1.2.1.7.2.0|65|11267997 -1.3.6.1.2.1.7.3.0|65|0 -1.3.6.1.2.1.7.4.0|65|5595421 -1.3.6.1.2.1.11.1.0|65|5328 -1.3.6.1.2.1.11.2.0|65|5327 -1.3.6.1.2.1.11.3.0|65|0 -1.3.6.1.2.1.11.4.0|65|0 -1.3.6.1.2.1.11.5.0|65|0 -1.3.6.1.2.1.11.6.0|65|0 -1.3.6.1.2.1.11.8.0|65|0 -1.3.6.1.2.1.11.9.0|65|0 -1.3.6.1.2.1.11.10.0|65|0 -1.3.6.1.2.1.11.11.0|65|0 -1.3.6.1.2.1.11.12.0|65|0 -1.3.6.1.2.1.11.13.0|65|11049 -1.3.6.1.2.1.11.14.0|65|0 -1.3.6.1.2.1.11.15.0|65|2922 -1.3.6.1.2.1.11.16.0|65|2181 -1.3.6.1.2.1.11.17.0|65|0 -1.3.6.1.2.1.11.18.0|65|0 -1.3.6.1.2.1.11.19.0|65|0 -1.3.6.1.2.1.11.20.0|65|0 -1.3.6.1.2.1.11.21.0|65|0 -1.3.6.1.2.1.11.22.0|65|0 -1.3.6.1.2.1.11.24.0|65|0 -1.3.6.1.2.1.11.25.0|65|0 -1.3.6.1.2.1.11.26.0|65|0 -1.3.6.1.2.1.11.27.0|65|0 -1.3.6.1.2.1.11.28.0|65|5329 -1.3.6.1.2.1.11.29.0|65|0 -1.3.6.1.2.1.11.30.0|2|0 -1.3.6.1.4.1.33118.1.1.1.0|2|420 -1.3.6.1.4.1.41809.1.27.0|2|777 -1.3.6.1.4.1.41809.1.28.0|2|0 -1.3.6.1.4.1.41809.1.29.0|2|137 -1.3.6.1.4.1.41809.1.55.1.2.0|2|500 -1.3.6.1.4.1.41809.1.55.1.3.0|2|411 -1.3.6.1.4.1.41809.1.55.1.5.0|2|409 -1.3.6.1.4.1.41809.1.55.1.6.0|2|237 -1.3.6.1.4.1.41809.1.55.1.7.0|2|237 -1.3.6.1.4.1.41809.1.55.1.8.0|2|235 -1.3.6.1.4.1.41809.1.55.1.9.0|2|0 -1.3.6.1.4.1.41809.1.55.1.10.0|2|0 -1.3.6.1.4.1.41809.1.55.1.11.0|2|0 -1.3.6.1.4.1.41809.1.55.1.12.0|2|0 -1.3.6.1.4.1.41809.1.55.1.14.0|2|0 -1.3.6.1.4.1.41809.1.55.1.15.0|2|0 -1.3.6.1.4.1.41809.1.55.1.16.0|2|0 -1.3.6.1.4.1.41809.1.55.1.17.0|2|0 -1.3.6.1.4.1.41809.1.55.1.18.0|2|0 -1.3.6.1.4.1.41809.1.55.1.19.0|66|10304 -1.3.6.1.4.1.41809.1.55.1.20.0|2|0 -1.3.6.1.4.1.41809.1.55.1.21.0|2|1 -1.3.6.1.4.1.41809.1.55.1.22.0|2|1 -1.3.6.1.4.1.41809.1.55.1.23.0|2|1 -1.3.6.1.4.1.41809.1.55.1.25.0|2|0 -1.3.6.1.4.1.41809.1.55.1.26.0|2|0 -1.3.6.1.4.1.41809.1.55.1.27.0|2|0 -1.3.6.1.4.1.41809.1.55.1.28.0|66|66 -1.3.6.1.4.1.41809.1.55.1.29.0|66|0 -1.3.6.1.4.1.41809.2.51|2|210