From c7c1ca2c5a2d5394cba3e42481db585c835e4c7a Mon Sep 17 00:00:00 2001 From: PipoCanaja <38363551+PipoCanaja@users.noreply.github.com> Date: Thu, 7 Feb 2019 21:58:56 +0100 Subject: [PATCH] Support for DKT Comega FTTx devices (#9732) * DKT Comega device support * DKT Comega device support * DKT Comega device support * DKT Comega device support --- html/images/os/dkt.png | Bin 0 -> 9250 bytes includes/definitions/discovery/dkt.yaml | 23 + includes/definitions/dkt.yaml | 11 + includes/polling/os/dkt.inc.php | 5 + mibs/dkt/DKT-CATV-MIB | 60 + mibs/dkt/DKT-FE-MIB | 1415 +++++++++++++++++++ mibs/dkt/DKT-GE-MIB | 1239 +++++++++++++++++ mibs/dkt/DKT-GENERIC-MIB | 61 + mibs/dkt/DKT-MIB | 18 + mibs/dkt/DKT-RMON-MIB | 1642 +++++++++++++++++++++++ mibs/dkt/IDKT-F2-MIB | 377 ++++++ tests/data/dkt.json | 125 ++ tests/snmpsim/dkt.snmprec | 41 + 13 files changed, 5017 insertions(+) create mode 100644 html/images/os/dkt.png create mode 100644 includes/definitions/discovery/dkt.yaml create mode 100644 includes/definitions/dkt.yaml create mode 100644 includes/polling/os/dkt.inc.php create mode 100644 mibs/dkt/DKT-CATV-MIB create mode 100644 mibs/dkt/DKT-FE-MIB create mode 100644 mibs/dkt/DKT-GE-MIB create mode 100644 mibs/dkt/DKT-GENERIC-MIB create mode 100644 mibs/dkt/DKT-MIB create mode 100644 mibs/dkt/DKT-RMON-MIB create mode 100644 mibs/dkt/IDKT-F2-MIB create mode 100644 tests/data/dkt.json create mode 100644 tests/snmpsim/dkt.snmprec diff --git a/html/images/os/dkt.png b/html/images/os/dkt.png new file mode 100644 index 0000000000000000000000000000000000000000..f546cb3b2c6f94f6045d051b9b4a1e4639c3a490 GIT binary patch literal 9250 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", + "sysObjectID": ".1.3.6.1.4.1.27304.3.2.10", + "sysDescr": "This is a DKTCOMEGA CPE FTTH gateway (GbE)", + "sysContact": null, + "version": null, + "hardware": null, + "features": null, + "os": "dkt", + "type": "network", + "serial": null, + "icon": "dkt.png", + "location": null + } + ] + }, + "poller": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.27304.3.2.10", + "sysDescr": "This is a DKTCOMEGA CPE FTTH gateway (GbE)", + "sysContact": "", + "version": "DKT_F2_Firmware_v05_29", + "hardware": "DKT F2_1 1", + "features": null, + "os": "dkt", + "type": "network", + "serial": null, + "icon": "dkt.png", + "location": "" + } + ] + } + }, + "sensors": { + "discovery": { + "sensors": [ + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.27304.11.3.0", + "sensor_index": "0", + "sensor_type": "catvSignalDetect", + "sensor_descr": "CATV Signal Detect", + "group": "", + "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": null, + "state_name": "catvSignalDetect" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.27304.11.2.0", + "sensor_index": "0", + "sensor_type": "catvSwitch", + "sensor_descr": "CATV Module", + "group": "", + "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": "catvSwitch" + } + ], + "state_indexes": [ + { + "state_name": "catvSignalDetect", + "state_descr": "No Signal", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 3 + }, + { + "state_name": "catvSignalDetect", + "state_descr": "Signal Ok", + "state_draw_graph": 0, + "state_value": 1, + "state_generic_value": 0 + }, + { + "state_name": "catvSwitch", + "state_descr": "Not powered", + "state_draw_graph": 0, + "state_value": 0, + "state_generic_value": 3 + }, + { + "state_name": "catvSwitch", + "state_descr": "Powered", + "state_draw_graph": 0, + "state_value": 1, + "state_generic_value": 0 + } + ] + }, + "poller": "matches discovery" + } +} diff --git a/tests/snmpsim/dkt.snmprec b/tests/snmpsim/dkt.snmprec new file mode 100644 index 0000000000..bebb4564a6 --- /dev/null +++ b/tests/snmpsim/dkt.snmprec @@ -0,0 +1,41 @@ +1.3.6.1.2.1.1.1.0|4|This is a DKTCOMEGA CPE FTTH gateway (GbE) +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.27304.3.2.10 +1.3.6.1.2.1.1.3.0|67|225312661 +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.11.1.0|65|233904 +1.3.6.1.2.1.11.2.0|65|233903 +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|1347627 +1.3.6.1.2.1.11.14.0|65|0 +1.3.6.1.2.1.11.15.0|65|140483 +1.3.6.1.2.1.11.16.0|65|108 +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|233905 +1.3.6.1.2.1.11.29.0|65|0 +1.3.6.1.2.1.11.30.0|2|2 +1.3.6.1.2.1.11.31.0|65|0 +1.3.6.1.2.1.11.32.0|65|0 +1.3.6.1.4.1.2021.13.14.1.0|2|1 +1.3.6.1.4.1.27304.10.1.0|4|F2_1 1 +1.3.6.1.4.1.27304.10.2.0|4|DKT_F2_Firmware_v05_29 +1.3.6.1.4.1.27304.11.2.0|2|1 +1.3.6.1.4.1.27304.11.3.0|2|0