From d3f4fcfd30752fc6fee57a4cef553fdcaa154779 Mon Sep 17 00:00:00 2001 From: pjordanovic <116586981+pjordanovic@users.noreply.github.com> Date: Mon, 11 Mar 2024 22:49:06 +0100 Subject: [PATCH] device - EPSON DS-860 + Network Interface Unit DSBXNW1 (#15420) * Create epson-scanner.yaml add support for epson network scanner * Create epson-scanner.yaml add discovery info * Add files via upload epson_scanner_ds-860.snmprec * Update epson-scanner.yaml added snmp_bulk: false * Update epson-scanner.yaml * Update epson_scanner_ds-860.snmprec change from snmbulkwalk to snmpwalk * fix epson_scanner_ds-860.snmprec * Rename epson_scanner_ds-860.snmprec to epson-scanner_ds-860.snmprec * Create epson-scanner_ds-860.json --------- Co-authored-by: PipoCanaja <38363551+PipoCanaja@users.noreply.github.com> --- .../definitions/discovery/epson-scanner.yaml | 5 + includes/definitions/epson-scanner.yaml | 11 + tests/data/epson-scanner_ds-860.json | 233 ++++++++++++++++++ tests/snmpsim/epson-scanner_ds-860.snmprec | 63 +++++ 4 files changed, 312 insertions(+) create mode 100644 includes/definitions/discovery/epson-scanner.yaml create mode 100644 includes/definitions/epson-scanner.yaml create mode 100644 tests/data/epson-scanner_ds-860.json create mode 100644 tests/snmpsim/epson-scanner_ds-860.snmprec diff --git a/includes/definitions/discovery/epson-scanner.yaml b/includes/definitions/discovery/epson-scanner.yaml new file mode 100644 index 0000000000..c96edb6afd --- /dev/null +++ b/includes/definitions/discovery/epson-scanner.yaml @@ -0,0 +1,5 @@ +modules: + os: + serial: SNMPv2-SMI::enterprises.1248.1.1.3.1.1.1.0 + version: SNMPv2-SMI::enterprises.1248.1.1.3.1.21.1.1.2.1 + hardware: HOST-RESOURCES-MIB::hrDeviceDescr.1 diff --git a/includes/definitions/epson-scanner.yaml b/includes/definitions/epson-scanner.yaml new file mode 100644 index 0000000000..10d2f68412 --- /dev/null +++ b/includes/definitions/epson-scanner.yaml @@ -0,0 +1,11 @@ +os: epson-scanner +text: 'Epson Scanner' +type: printer +icon: epson +group: epson +snmp_bulk: false +bad_iftype: + - softwareLoopback +discovery: + - sysObjectID: + - .1.3.6.1.4.1.1248.1.1.2.1.3.22.78.101.116.119.111.114.107.32.73.110.116.101.114.102.97.99.101.32.85.110.105.116 diff --git a/tests/data/epson-scanner_ds-860.json b/tests/data/epson-scanner_ds-860.json new file mode 100644 index 0000000000..6ae455c58b --- /dev/null +++ b/tests/data/epson-scanner_ds-860.json @@ -0,0 +1,233 @@ +{ + "os": { + "discovery": { + "devices": [ + { + "sysName": null, + "sysObjectID": ".1.3.6.1.4.1.1248.1.1.2.1.3.22.78.101.116.119.111.114.107.32.73.110.116.101.114.102.97.99.101.32.85.110.105.116", + "sysDescr": "EPSON 10/100/1000 Ethernet USB Ext. Scan Server", + "sysContact": "", + "version": "02.03", + "hardware": "DS-860", + "features": null, + "location": "", + "os": "epson-scanner", + "type": "printer", + "serial": "EP335FDCENSN08", + "icon": "epson.svg" + } + ] + }, + "poller": "matches discovery" + }, + "ports": { + "discovery": { + "ports": [ + { + "port_descr_type": null, + "port_descr_descr": null, + "port_descr_circuit": null, + "port_descr_speed": null, + "port_descr_notes": null, + "ifDescr": "Network Interface Unit Hard Ver.1.00 Firm Ver.2.03", + "ifName": "Network Interface Unit Hard Ver.1.00 Firm Ver.2.03", + "portName": null, + "ifIndex": 1, + "ifSpeed": null, + "ifSpeed_prev": null, + "ifConnectorPresent": null, + "ifOperStatus": "up", + "ifOperStatus_prev": null, + "ifAdminStatus": null, + "ifAdminStatus_prev": null, + "ifDuplex": null, + "ifMtu": null, + "ifType": "ethernetCsmacd", + "ifAlias": "Network Interface Unit Hard Ver.1.00 Firm Ver.2.03", + "ifPhysAddress": null, + "ifLastChange": 0, + "ifVlan": null, + "ifTrunk": null, + "ignore": 0, + "disabled": 0, + "deleted": 0, + "pagpOperationMode": null, + "pagpPortState": null, + "pagpPartnerDeviceId": null, + "pagpPartnerLearnMethod": null, + "pagpPartnerIfIndex": null, + "pagpPartnerGroupIfIndex": null, + "pagpPartnerDeviceName": null, + "pagpEthcOperationMode": null, + "pagpDeviceId": null, + "pagpGroupIfIndex": null, + "ifInUcastPkts": null, + "ifInUcastPkts_prev": null, + "ifInUcastPkts_delta": null, + "ifInUcastPkts_rate": null, + "ifOutUcastPkts": null, + "ifOutUcastPkts_prev": null, + "ifOutUcastPkts_delta": null, + "ifOutUcastPkts_rate": null, + "ifInErrors": null, + "ifInErrors_prev": null, + "ifInErrors_delta": null, + "ifInErrors_rate": null, + "ifOutErrors": null, + "ifOutErrors_prev": null, + "ifOutErrors_delta": null, + "ifOutErrors_rate": null, + "ifInOctets": null, + "ifInOctets_prev": null, + "ifInOctets_delta": null, + "ifInOctets_rate": null, + "ifOutOctets": null, + "ifOutOctets_prev": null, + "ifOutOctets_delta": null, + "ifOutOctets_rate": null, + "poll_prev": null, + "ifInNUcastPkts": null, + "ifInNUcastPkts_prev": null, + "ifInNUcastPkts_delta": null, + "ifInNUcastPkts_rate": null, + "ifOutNUcastPkts": null, + "ifOutNUcastPkts_prev": null, + "ifOutNUcastPkts_delta": null, + "ifOutNUcastPkts_rate": null, + "ifInDiscards": null, + "ifInDiscards_prev": null, + "ifInDiscards_delta": null, + "ifInDiscards_rate": null, + "ifOutDiscards": null, + "ifOutDiscards_prev": null, + "ifOutDiscards_delta": null, + "ifOutDiscards_rate": null, + "ifInUnknownProtos": null, + "ifInUnknownProtos_prev": null, + "ifInUnknownProtos_delta": null, + "ifInUnknownProtos_rate": null, + "ifInBroadcastPkts": null, + "ifInBroadcastPkts_prev": null, + "ifInBroadcastPkts_delta": null, + "ifInBroadcastPkts_rate": null, + "ifOutBroadcastPkts": null, + "ifOutBroadcastPkts_prev": null, + "ifOutBroadcastPkts_delta": null, + "ifOutBroadcastPkts_rate": null, + "ifInMulticastPkts": null, + "ifInMulticastPkts_prev": null, + "ifInMulticastPkts_delta": null, + "ifInMulticastPkts_rate": null, + "ifOutMulticastPkts": null, + "ifOutMulticastPkts_prev": null, + "ifOutMulticastPkts_delta": null, + "ifOutMulticastPkts_rate": null + } + ] + }, + "poller": { + "ports": [ + { + "port_descr_type": null, + "port_descr_descr": null, + "port_descr_circuit": null, + "port_descr_speed": null, + "port_descr_notes": null, + "ifDescr": "Network Interface Unit Hard Ver.1.00 Firm Ver.2.03", + "ifName": "Network Interface Unit Hard Ver.1.00 Firm Ver.2.03", + "portName": null, + "ifIndex": 1, + "ifSpeed": 1000000000, + "ifSpeed_prev": null, + "ifConnectorPresent": null, + "ifOperStatus": "up", + "ifOperStatus_prev": "up", + "ifAdminStatus": "up", + "ifAdminStatus_prev": null, + "ifDuplex": null, + "ifMtu": 1500, + "ifType": "ethernetCsmacd", + "ifAlias": "Network Interface Unit Hard Ver.1.00 Firm Ver.2.03", + "ifPhysAddress": "ac1826335fdc", + "ifLastChange": 0, + "ifVlan": null, + "ifTrunk": null, + "ignore": 0, + "disabled": 0, + "deleted": 0, + "pagpOperationMode": null, + "pagpPortState": null, + "pagpPartnerDeviceId": null, + "pagpPartnerLearnMethod": null, + "pagpPartnerIfIndex": null, + "pagpPartnerGroupIfIndex": null, + "pagpPartnerDeviceName": null, + "pagpEthcOperationMode": null, + "pagpDeviceId": null, + "pagpGroupIfIndex": null, + "ifInUcastPkts": 257845, + "ifInUcastPkts_prev": 0, + "ifInUcastPkts_delta": null, + "ifInUcastPkts_rate": null, + "ifOutUcastPkts": 2980, + "ifOutUcastPkts_prev": 0, + "ifOutUcastPkts_delta": null, + "ifOutUcastPkts_rate": null, + "ifInErrors": 0, + "ifInErrors_prev": 0, + "ifInErrors_delta": null, + "ifInErrors_rate": null, + "ifOutErrors": 0, + "ifOutErrors_prev": 0, + "ifOutErrors_delta": null, + "ifOutErrors_rate": null, + "ifInOctets": 32645141, + "ifInOctets_prev": 0, + "ifInOctets_delta": null, + "ifInOctets_rate": null, + "ifOutOctets": 309959, + "ifOutOctets_prev": 0, + "ifOutOctets_delta": null, + "ifOutOctets_rate": null, + "poll_prev": null, + "ifInNUcastPkts": 0, + "ifInNUcastPkts_prev": 0, + "ifInNUcastPkts_delta": null, + "ifInNUcastPkts_rate": null, + "ifOutNUcastPkts": 0, + "ifOutNUcastPkts_prev": 0, + "ifOutNUcastPkts_delta": null, + "ifOutNUcastPkts_rate": null, + "ifInDiscards": 0, + "ifInDiscards_prev": 0, + "ifInDiscards_delta": null, + "ifInDiscards_rate": null, + "ifOutDiscards": 0, + "ifOutDiscards_prev": 0, + "ifOutDiscards_delta": null, + "ifOutDiscards_rate": null, + "ifInUnknownProtos": 0, + "ifInUnknownProtos_prev": 0, + "ifInUnknownProtos_delta": null, + "ifInUnknownProtos_rate": null, + "ifInBroadcastPkts": 0, + "ifInBroadcastPkts_prev": 0, + "ifInBroadcastPkts_delta": null, + "ifInBroadcastPkts_rate": null, + "ifOutBroadcastPkts": 0, + "ifOutBroadcastPkts_prev": 0, + "ifOutBroadcastPkts_delta": null, + "ifOutBroadcastPkts_rate": null, + "ifInMulticastPkts": 0, + "ifInMulticastPkts_prev": 0, + "ifInMulticastPkts_delta": null, + "ifInMulticastPkts_rate": null, + "ifOutMulticastPkts": 0, + "ifOutMulticastPkts_prev": 0, + "ifOutMulticastPkts_delta": null, + "ifOutMulticastPkts_rate": null + } + ] + } + } +} \ No newline at end of file diff --git a/tests/snmpsim/epson-scanner_ds-860.snmprec b/tests/snmpsim/epson-scanner_ds-860.snmprec new file mode 100644 index 0000000000..42b91dfda1 --- /dev/null +++ b/tests/snmpsim/epson-scanner_ds-860.snmprec @@ -0,0 +1,63 @@ +1.3.6.1.2.1.1.1.0|4|EPSON 10/100/1000 Ethernet USB Ext. Scan Server +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1248.1.1.2.1.3.22.78.101.116.119.111.114.107.32.73.110.116.101.114.102.97.99.101.32.85.110.105.116 +1.3.6.1.2.1.1.4.0|4| +1.3.6.1.2.1.1.6.0|4| +1.3.6.1.2.1.2.2.1.1.1|2|1 +1.3.6.1.2.1.2.2.1.1.2|2|2 +1.3.6.1.2.1.2.2.1.2.1|4|Network Interface Unit Hard Ver.1.00 Firm Ver.2.03 +1.3.6.1.2.1.2.2.1.2.2|4|Network Interface Unit Hard Ver.1.00 Firm Ver.2.03 +1.3.6.1.2.1.2.2.1.3.1|2|6 +1.3.6.1.2.1.2.2.1.3.2|2|24 +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|16436 +1.3.6.1.2.1.2.2.1.5.1|66|1000000000 +1.3.6.1.2.1.2.2.1.5.2|66|1000000000 +1.3.6.1.2.1.2.2.1.6.1|4x|AC1826335FDC +1.3.6.1.2.1.2.2.1.6.2|4| +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.8.1|2|1 +1.3.6.1.2.1.2.2.1.8.2|2|1 +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.10.1|65|32645141 +1.3.6.1.2.1.2.2.1.10.2|65|0 +1.3.6.1.2.1.2.2.1.11.1|65|257845 +1.3.6.1.2.1.2.2.1.11.2|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.13.1|65|0 +1.3.6.1.2.1.2.2.1.13.2|65|0 +1.3.6.1.2.1.2.2.1.14.1|65|0 +1.3.6.1.2.1.2.2.1.14.2|65|0 +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.16.1|65|309959 +1.3.6.1.2.1.2.2.1.16.2|65|0 +1.3.6.1.2.1.2.2.1.17.1|65|2980 +1.3.6.1.2.1.2.2.1.17.2|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.19.1|65|0 +1.3.6.1.2.1.2.2.1.19.2|65|0 +1.3.6.1.2.1.2.2.1.20.1|65|0 +1.3.6.1.2.1.2.2.1.20.2|65|0 +1.3.6.1.2.1.2.2.1.21.1|66|0 +1.3.6.1.2.1.2.2.1.21.2|66|0 +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.4.20.1.2.10.31.10.59|2|1 +1.3.6.1.2.1.4.20.1.3.10.31.10.59|64|255.255.255.0 +1.3.6.1.2.1.25.1.1.0|67|657200 +1.3.6.1.2.1.25.1.5.0|66|0 +1.3.6.1.2.1.25.1.6.0|66|96 +1.3.6.1.2.1.25.1.7.0|2|0 +1.3.6.1.2.1.25.2.2.0|2|127280 +1.3.6.1.2.1.25.3.2.1.1.1|2|1 +1.3.6.1.2.1.25.3.2.1.2.1|6|1.3.6.1.2.1.25.3.1.1 +1.3.6.1.2.1.25.3.2.1.3.1|4|DS-860 +1.3.6.1.2.1.25.3.2.1.4.1|6|1.3.6.1.4.1.1248.1.2.1.6.68.83.45.56.54.48 +1.3.6.1.2.1.25.3.2.1.5.1|2|2 +1.3.6.1.2.1.25.3.2.1.6.1|65|0 +1.3.6.1.4.1.1248.1.1.3.1.1.1.0|4|EP335FDCENSN08 +1.3.6.1.4.1.1248.1.1.3.1.21.1.1.2.1|4|02.03