From 3cf5a6ceae716e4b6be8a7d4e8dacd845cbe1f33 Mon Sep 17 00:00:00 2001
From: Wooboy <github@wooboy.me>
Date: Thu, 2 Nov 2023 12:03:45 +0800
Subject: [PATCH] Add definition fujifilmprinter (#15381)

* Add support for Fujifilm printer

* Add support for Fujifilm printer

* fix Fujifilmprinter.yaml

* Add Fujifilm printer test unit

* remove snmprec supply descr contains utf8 character

* fix discovery yaml
---
 html/images/logos/fujifilm.svg                |  61 ++
 html/images/os/fujifilm.svg                   |  61 ++
 .../discovery/fujifilmprinter.yaml            |   4 +
 includes/definitions/fujifilmprinter.yaml     |  13 +
 tests/data/fujifilmprinter_c7580.json         | 753 ++++++++++++++++++
 tests/data/fujifilmprinter_c810.json          | 142 ++++
 tests/snmpsim/fujifilmprinter_c7580.snmprec   | 189 +++++
 tests/snmpsim/fujifilmprinter_c810.snmprec    |  59 ++
 8 files changed, 1282 insertions(+)
 create mode 100644 html/images/logos/fujifilm.svg
 create mode 100644 html/images/os/fujifilm.svg
 create mode 100644 includes/definitions/discovery/fujifilmprinter.yaml
 create mode 100644 includes/definitions/fujifilmprinter.yaml
 create mode 100644 tests/data/fujifilmprinter_c7580.json
 create mode 100644 tests/data/fujifilmprinter_c810.json
 create mode 100644 tests/snmpsim/fujifilmprinter_c7580.snmprec
 create mode 100644 tests/snmpsim/fujifilmprinter_c810.snmprec

diff --git a/html/images/logos/fujifilm.svg b/html/images/logos/fujifilm.svg
new file mode 100644
index 0000000000..44325fed61
--- /dev/null
+++ b/html/images/logos/fujifilm.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="レイヤー_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 180 50" enable-background="new 0 0 180 50" xml:space="preserve">
+<g>
+	<path d="M136.2,1l0,23c0,1.5,0.7,2.3,2.2,2.3c0,0,7.6,0,7.6,0v2.6c0,0.3-0.2,0.5-0.5,0.5h-12.3c-3.8,0-4.4-2.1-4.4-4V2.6
+		c0-1.1,0.4-1.6,1.7-1.6H136.2"/>
+	<path d="M122.1,1l0,26.9c0,1.2-0.5,1.5-1.5,1.5h-5.8V2.5c0-0.9,0.3-1.5,1.6-1.5H122.1"/>
+	<path d="M1.7,4.9c0-2.2,0-3.9,3.6-3.9h15.6v2.7c0,0.2-0.1,0.4-0.4,0.4c0,0-9.4,0-9.4,0C9.9,4.1,9.3,4.7,9.3,6c0,0,0,7.2,0,7.2h11
+		l0,2.9c0,0.3-0.2,0.4-0.4,0.4H9.3v11.4c0,1.1-0.6,1.5-1.8,1.5H1.7V4.9"/>
+	<path d="M32.2,1v21.7c0,1.9,0.3,3.2,1.6,3.9c1.7,1,4.7,1,6.5,0c1.2-0.7,1.7-1.8,1.7-3.9V2.4C42,1.5,42.3,1,43.6,1h5.7l0,21
+		c0,4.9-3.1,6.9-5.8,7.6c-3.6,1-9.1,1-12.5,0c-4.1-1.2-6-3.6-6-7.6l0-19.6c0-0.9,0.3-1.5,1.4-1.5H32.2"/>
+	<path d="M169.9,1c-1.4,0-2.3,0.7-2.6,2l-4.6,19.6l-0.1,0L157.7,1h-6.5c-1.3,0-1.7,0.6-1.7,1.7v26.8h2.8c0.4,0,0.6-0.2,0.6-0.7V6.3
+		h0.4l5.9,23.1h3.9c1.5,0,2-0.6,2.4-2l5.3-21.1h0.4l0,23.1l5.2,0c1.3,0,1.8-0.5,1.8-1.7V1L169.9,1"/>
+	<path d="M83.8,16.4h-7.3v13h5.8c1,0,1.5-0.3,1.5-1.5C83.8,27.9,83.8,22.4,83.8,16.4"/>
+	<path fill="#FB0020" d="M83.4,10.9c0.3-0.2,0.4-0.4,0.4-0.8V1h-5.7c-1.3,0-1.6,0.6-1.6,1.5v13.8L83.4,10.9"/>
+	<path d="M58.4,27.2c3.2-0.4,4.2-2.3,4.2-5.1V2.5c0-1.2,0.6-1.5,1.4-1.5h5.8v18.5c0,4.5-1,6.8-3.6,8.8c-1.4,1-3.8,2.2-9.2,2.2
+		c-3,0-4.4-0.2-4.6-0.2c-0.3-0.1-0.4-0.2-0.4-0.4v-2.4C53.5,27.4,56.3,27.5,58.4,27.2"/>
+	<path d="M94.9,1c-3.6,0-3.6,1.8-3.6,3.9v7.3c0,0.2-0.1,0.2-0.1,0.3l-5,3.9h5.1v13h5.8c1.2,0,1.8-0.4,1.8-1.5V16.4h10.6
+		c0.2,0,0.4-0.1,0.4-0.4l0-2.9h-11c0,0,0-7.2,0-7.2c0-1.3,0.6-1.9,1.9-1.9c0,0,9.4,0,9.4,0c0.3,0,0.4-0.2,0.4-0.4V1H94.9"/>
+	<path d="M10.8,37.9l3.4,7.5l3.2-7.5H19l-4.5,10.6c-0.1,0.3-0.4,0.4-0.6,0.4h-0.7L8.4,38.3c-0.1-0.2,0.1-0.4,0.3-0.4H10.8"/>
+	<path d="M29.9,48.4c0,0.2-0.2,0.4-0.4,0.4h-1.9V37.2c0-0.2,0.2-0.4,0.4-0.4h1.9V48.4"/>
+	<path d="M94.9,38.4c0-0.2,0.2-0.4,0.5-0.4h2.1v10.4c0,0.2-0.2,0.5-0.4,0.5h-2.1V38.4"/>
+	<path d="M128.6,40.5l2.3,5.1l2.3-5.1h1.6l-3.7,8.1c-0.1,0.2-0.4,0.4-0.6,0.4h-0.6l-3.6-8.1c-0.1-0.2,0.1-0.4,0.3-0.4H128.6"/>
+	<path d="M150.5,41.1c0-0.2,0.2-0.5,0.4-0.5h1.9v7.8c0,0.2-0.2,0.4-0.4,0.4h-1.9V41.1"/>
+	<path d="M64.8,40.4c-0.7,0-1.5,0.4-2.1,0.9v-0.7h-1.9c-0.2,0-0.5,0.2-0.5,0.5v7.8h1.9c0.2,0,0.5-0.2,0.5-0.5v-5.5v-0.1
+		c1.4-1.4,2.8-0.7,3.5-0.1v-1.9C65.9,40.6,65.6,40.4,64.8,40.4"/>
+	<path d="M23.2,47c0-0.8,0-1.9,0-2.7c-1.6,0.5-2.3,1.5-2.3,2.3c0,0.5,0.3,1.1,0.9,1.1C22.5,47.6,22.9,47.2,23.2,47 M22.3,40.4
+		c2.6,0,3.2,1.2,3.2,2.2v5.7c0,0.2-0.2,0.4-0.5,0.4h-1.9v-0.7v-0.1c-0.7,0.7-1.7,0.9-2.2,0.9c-0.5,0-2.4-0.2-2.4-2.2
+		c0-2.2,2.8-3,4.7-3.5v0c0-0.6,0-0.8-0.1-1.2c-0.1-0.4-0.7-0.5-0.9-0.5c-1,0-2.1,0.3-3.1,0.8v-1.1C20,40.8,21.2,40.4,22.3,40.4"/>
+	<path d="M58.3,38.3c0.6,0,1,0,1.6,0.2v-1.1c-0.6-0.2-1.2-0.2-1.8-0.2c-1,0-3.2,0.4-3.2,2.3v1.1h-1.5v1h1.5v7.2h1.9
+		c0.2,0,0.4-0.2,0.4-0.4v-6.8h1.9v-1h-1.9v-0.5c0-0.6,0-0.8,0.1-1.2C57.6,38.5,58.1,38.3,58.3,38.3"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M40.4,45c0,2.1,1.8,4,4,4c1.3,0,2.3-0.7,2.9-1.3c0.5-0.5,0.9-1.1,1-2h-1.2
+		c-0.1,0.4-0.7,1.7-2.2,1.7c-1.8,0-2.1-1.7-2.1-2.8h5.4c0.1-2.3-1.2-4-3.6-4.1C42.3,40.4,40.4,42.1,40.4,45z M44,41.5
+		c0.7,0,1.4,0.5,1.4,2.2h-2.7C42.8,43,42.9,41.5,44,41.5z"/>
+	<path d="M70.6,41.4c-0.8,0.1-1.8,1.4-1.3,4.2c0.3,1.8,1.2,2.4,1.9,2.4c0.7,0,1.5-1,1.5-2.7C72.7,41.8,71.2,41.3,70.6,41.4
+		 M75.2,44.6c0,2.3-1.8,4.4-4.3,4.4c-2.4,0-4.3-1.8-4.3-4.2s1.7-4.3,4.3-4.3C73.4,40.4,75.2,42.2,75.2,44.6"/>
+	<path d="M121.2,41.4c-0.8,0.1-1.8,1.4-1.3,4.2c0.3,1.8,1.2,2.4,1.9,2.4c0.7,0,1.5-1,1.5-2.7C123.3,41.8,121.8,41.3,121.2,41.4
+		 M125.8,44.6c0,2.3-1.8,4.4-4.3,4.4c-2.4,0-4.3-1.8-4.3-4.2s1.7-4.3,4.3-4.3C123.9,40.4,125.8,42.2,125.8,44.6"/>
+	<path d="M158.4,41.4c-0.8,0.1-1.8,1.4-1.3,4.2c0.3,1.8,1.2,2.4,1.9,2.4c0.7,0,1.5-1,1.5-2.7C160.5,41.8,159.1,41.3,158.4,41.4
+		 M163.1,44.6c0,2.3-1.8,4.4-4.3,4.4c-2.4,0-4.3-1.8-4.3-4.2s1.7-4.3,4.3-4.3C161.2,40.4,163.1,42.2,163.1,44.6"/>
+	<path d="M153,38.6c0,0.7-0.6,1.3-1.3,1.3c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3C152.4,37.3,153,37.9,153,38.6"/>
+	<path d="M34.2,40.6v5.8c0,0.5,0.4,1.2,1.1,1.2c0.4,0,0.9-0.5,1.3-1v-5.5c0-0.2,0.2-0.4,0.5-0.4H39v7.8c0,0.2-0.2,0.4-0.5,0.4h-1.9
+		v-0.8c-0.3,0.3-0.6,0.5-1,0.7c-0.3,0.2-0.7,0.2-1,0.2c-1.6,0-2.7-1.3-2.7-2.6v-5.3c0-0.2,0.2-0.4,0.5-0.4H34.2"/>
+	<path d="M144.7,40.6v-2.1c0-0.2,0.2-0.5,0.4-0.5h1.9v2.6h1.9v1H147v5.3c0,0.2,0,0.3,0.1,0.4c0.1,0.1,0.3,0.2,0.5,0.2
+		c0.5,0,1.2-0.4,1.3-0.6v1.2c-0.5,0.4-1.3,0.9-2.3,0.9c-1.5,0-2-1.1-2-2v-5.4h-1.2v-1H144.7"/>
+	<path d="M111,42.8c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9c0.2,0,0.4-0.2,0.4-0.4v-5.4c0-1.5-1.3-2.5-2.4-2.5
+		c-1.2,0-2,0.5-2.4,0.8v-0.6h-1.9c-0.2,0-0.5,0.2-0.5,0.4v7.8h1.9c0.2,0,0.5-0.2,0.5-0.4V42.8z"/>
+	<path d="M166.9,42.8c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9c0.2,0,0.4-0.2,0.4-0.4v-5.4c0-1.5-1.3-2.5-2.4-2.5
+		c-1.2,0-2,0.5-2.4,0.8v-0.6H165c-0.2,0-0.4,0.2-0.4,0.4v7.8h1.9c0.2,0,0.4-0.2,0.4-0.4V42.8z"/>
+	<path d="M135.9,41.1v1.1c0.9-0.4,2.1-0.8,3.1-0.8c0.2,0,0.8,0.1,0.9,0.5c0.1,0.4,0.1,0.6,0.1,1.2v0c-1.9,0.5-4.7,1.3-4.7,3.5
+		c0,2,1.9,2.2,2.4,2.2c0.5,0,1.5-0.1,2.2-0.9v0.1v0.7h1.9c0.2,0,0.5-0.2,0.5-0.4v-5.7c0-1-0.6-2.2-3.2-2.2
+		C138,40.4,136.8,40.8,135.9,41.1 M138.6,47.6c-0.6,0-0.9-0.6-0.9-1.1c0-0.7,0.7-1.7,2.3-2.3c0,0.8,0,1.9,0,2.7
+		C139.7,47.2,139.3,47.6,138.6,47.6"/>
+	<path d="M102,42.8c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9c0.2,0,0.4-0.2,0.4-0.4v-5.4c0-1.5-1.3-2.5-2.4-2.5
+		c-1.2,0-2,0.5-2.4,0.8v-0.6h-1.9c-0.2,0-0.5,0.2-0.5,0.4v7.8h1.9c0.2,0,0.5-0.2,0.5-0.4V42.8z"/>
+	<path d="M86.3,40.4c-1.2,0-2.1,0.5-2.8,1c-0.5-0.8-1.4-1-2-1c-1.2,0-2,0.5-2.4,0.8v-0.6h-1.9c-0.2,0-0.4,0.2-0.4,0.4v7.8h1.9
+		c0.2,0,0.5-0.2,0.5-0.4v-5.6c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9h0c0.2,0,0.4-0.2,0.4-0.4v-5.6
+		c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9c0.2,0,0.4-0.2,0.4-0.4v-5.4C88.6,41.4,87.4,40.4,86.3,40.4"/>
+</g>
+</svg>
diff --git a/html/images/os/fujifilm.svg b/html/images/os/fujifilm.svg
new file mode 100644
index 0000000000..44325fed61
--- /dev/null
+++ b/html/images/os/fujifilm.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="レイヤー_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 180 50" enable-background="new 0 0 180 50" xml:space="preserve">
+<g>
+	<path d="M136.2,1l0,23c0,1.5,0.7,2.3,2.2,2.3c0,0,7.6,0,7.6,0v2.6c0,0.3-0.2,0.5-0.5,0.5h-12.3c-3.8,0-4.4-2.1-4.4-4V2.6
+		c0-1.1,0.4-1.6,1.7-1.6H136.2"/>
+	<path d="M122.1,1l0,26.9c0,1.2-0.5,1.5-1.5,1.5h-5.8V2.5c0-0.9,0.3-1.5,1.6-1.5H122.1"/>
+	<path d="M1.7,4.9c0-2.2,0-3.9,3.6-3.9h15.6v2.7c0,0.2-0.1,0.4-0.4,0.4c0,0-9.4,0-9.4,0C9.9,4.1,9.3,4.7,9.3,6c0,0,0,7.2,0,7.2h11
+		l0,2.9c0,0.3-0.2,0.4-0.4,0.4H9.3v11.4c0,1.1-0.6,1.5-1.8,1.5H1.7V4.9"/>
+	<path d="M32.2,1v21.7c0,1.9,0.3,3.2,1.6,3.9c1.7,1,4.7,1,6.5,0c1.2-0.7,1.7-1.8,1.7-3.9V2.4C42,1.5,42.3,1,43.6,1h5.7l0,21
+		c0,4.9-3.1,6.9-5.8,7.6c-3.6,1-9.1,1-12.5,0c-4.1-1.2-6-3.6-6-7.6l0-19.6c0-0.9,0.3-1.5,1.4-1.5H32.2"/>
+	<path d="M169.9,1c-1.4,0-2.3,0.7-2.6,2l-4.6,19.6l-0.1,0L157.7,1h-6.5c-1.3,0-1.7,0.6-1.7,1.7v26.8h2.8c0.4,0,0.6-0.2,0.6-0.7V6.3
+		h0.4l5.9,23.1h3.9c1.5,0,2-0.6,2.4-2l5.3-21.1h0.4l0,23.1l5.2,0c1.3,0,1.8-0.5,1.8-1.7V1L169.9,1"/>
+	<path d="M83.8,16.4h-7.3v13h5.8c1,0,1.5-0.3,1.5-1.5C83.8,27.9,83.8,22.4,83.8,16.4"/>
+	<path fill="#FB0020" d="M83.4,10.9c0.3-0.2,0.4-0.4,0.4-0.8V1h-5.7c-1.3,0-1.6,0.6-1.6,1.5v13.8L83.4,10.9"/>
+	<path d="M58.4,27.2c3.2-0.4,4.2-2.3,4.2-5.1V2.5c0-1.2,0.6-1.5,1.4-1.5h5.8v18.5c0,4.5-1,6.8-3.6,8.8c-1.4,1-3.8,2.2-9.2,2.2
+		c-3,0-4.4-0.2-4.6-0.2c-0.3-0.1-0.4-0.2-0.4-0.4v-2.4C53.5,27.4,56.3,27.5,58.4,27.2"/>
+	<path d="M94.9,1c-3.6,0-3.6,1.8-3.6,3.9v7.3c0,0.2-0.1,0.2-0.1,0.3l-5,3.9h5.1v13h5.8c1.2,0,1.8-0.4,1.8-1.5V16.4h10.6
+		c0.2,0,0.4-0.1,0.4-0.4l0-2.9h-11c0,0,0-7.2,0-7.2c0-1.3,0.6-1.9,1.9-1.9c0,0,9.4,0,9.4,0c0.3,0,0.4-0.2,0.4-0.4V1H94.9"/>
+	<path d="M10.8,37.9l3.4,7.5l3.2-7.5H19l-4.5,10.6c-0.1,0.3-0.4,0.4-0.6,0.4h-0.7L8.4,38.3c-0.1-0.2,0.1-0.4,0.3-0.4H10.8"/>
+	<path d="M29.9,48.4c0,0.2-0.2,0.4-0.4,0.4h-1.9V37.2c0-0.2,0.2-0.4,0.4-0.4h1.9V48.4"/>
+	<path d="M94.9,38.4c0-0.2,0.2-0.4,0.5-0.4h2.1v10.4c0,0.2-0.2,0.5-0.4,0.5h-2.1V38.4"/>
+	<path d="M128.6,40.5l2.3,5.1l2.3-5.1h1.6l-3.7,8.1c-0.1,0.2-0.4,0.4-0.6,0.4h-0.6l-3.6-8.1c-0.1-0.2,0.1-0.4,0.3-0.4H128.6"/>
+	<path d="M150.5,41.1c0-0.2,0.2-0.5,0.4-0.5h1.9v7.8c0,0.2-0.2,0.4-0.4,0.4h-1.9V41.1"/>
+	<path d="M64.8,40.4c-0.7,0-1.5,0.4-2.1,0.9v-0.7h-1.9c-0.2,0-0.5,0.2-0.5,0.5v7.8h1.9c0.2,0,0.5-0.2,0.5-0.5v-5.5v-0.1
+		c1.4-1.4,2.8-0.7,3.5-0.1v-1.9C65.9,40.6,65.6,40.4,64.8,40.4"/>
+	<path d="M23.2,47c0-0.8,0-1.9,0-2.7c-1.6,0.5-2.3,1.5-2.3,2.3c0,0.5,0.3,1.1,0.9,1.1C22.5,47.6,22.9,47.2,23.2,47 M22.3,40.4
+		c2.6,0,3.2,1.2,3.2,2.2v5.7c0,0.2-0.2,0.4-0.5,0.4h-1.9v-0.7v-0.1c-0.7,0.7-1.7,0.9-2.2,0.9c-0.5,0-2.4-0.2-2.4-2.2
+		c0-2.2,2.8-3,4.7-3.5v0c0-0.6,0-0.8-0.1-1.2c-0.1-0.4-0.7-0.5-0.9-0.5c-1,0-2.1,0.3-3.1,0.8v-1.1C20,40.8,21.2,40.4,22.3,40.4"/>
+	<path d="M58.3,38.3c0.6,0,1,0,1.6,0.2v-1.1c-0.6-0.2-1.2-0.2-1.8-0.2c-1,0-3.2,0.4-3.2,2.3v1.1h-1.5v1h1.5v7.2h1.9
+		c0.2,0,0.4-0.2,0.4-0.4v-6.8h1.9v-1h-1.9v-0.5c0-0.6,0-0.8,0.1-1.2C57.6,38.5,58.1,38.3,58.3,38.3"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M40.4,45c0,2.1,1.8,4,4,4c1.3,0,2.3-0.7,2.9-1.3c0.5-0.5,0.9-1.1,1-2h-1.2
+		c-0.1,0.4-0.7,1.7-2.2,1.7c-1.8,0-2.1-1.7-2.1-2.8h5.4c0.1-2.3-1.2-4-3.6-4.1C42.3,40.4,40.4,42.1,40.4,45z M44,41.5
+		c0.7,0,1.4,0.5,1.4,2.2h-2.7C42.8,43,42.9,41.5,44,41.5z"/>
+	<path d="M70.6,41.4c-0.8,0.1-1.8,1.4-1.3,4.2c0.3,1.8,1.2,2.4,1.9,2.4c0.7,0,1.5-1,1.5-2.7C72.7,41.8,71.2,41.3,70.6,41.4
+		 M75.2,44.6c0,2.3-1.8,4.4-4.3,4.4c-2.4,0-4.3-1.8-4.3-4.2s1.7-4.3,4.3-4.3C73.4,40.4,75.2,42.2,75.2,44.6"/>
+	<path d="M121.2,41.4c-0.8,0.1-1.8,1.4-1.3,4.2c0.3,1.8,1.2,2.4,1.9,2.4c0.7,0,1.5-1,1.5-2.7C123.3,41.8,121.8,41.3,121.2,41.4
+		 M125.8,44.6c0,2.3-1.8,4.4-4.3,4.4c-2.4,0-4.3-1.8-4.3-4.2s1.7-4.3,4.3-4.3C123.9,40.4,125.8,42.2,125.8,44.6"/>
+	<path d="M158.4,41.4c-0.8,0.1-1.8,1.4-1.3,4.2c0.3,1.8,1.2,2.4,1.9,2.4c0.7,0,1.5-1,1.5-2.7C160.5,41.8,159.1,41.3,158.4,41.4
+		 M163.1,44.6c0,2.3-1.8,4.4-4.3,4.4c-2.4,0-4.3-1.8-4.3-4.2s1.7-4.3,4.3-4.3C161.2,40.4,163.1,42.2,163.1,44.6"/>
+	<path d="M153,38.6c0,0.7-0.6,1.3-1.3,1.3c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3C152.4,37.3,153,37.9,153,38.6"/>
+	<path d="M34.2,40.6v5.8c0,0.5,0.4,1.2,1.1,1.2c0.4,0,0.9-0.5,1.3-1v-5.5c0-0.2,0.2-0.4,0.5-0.4H39v7.8c0,0.2-0.2,0.4-0.5,0.4h-1.9
+		v-0.8c-0.3,0.3-0.6,0.5-1,0.7c-0.3,0.2-0.7,0.2-1,0.2c-1.6,0-2.7-1.3-2.7-2.6v-5.3c0-0.2,0.2-0.4,0.5-0.4H34.2"/>
+	<path d="M144.7,40.6v-2.1c0-0.2,0.2-0.5,0.4-0.5h1.9v2.6h1.9v1H147v5.3c0,0.2,0,0.3,0.1,0.4c0.1,0.1,0.3,0.2,0.5,0.2
+		c0.5,0,1.2-0.4,1.3-0.6v1.2c-0.5,0.4-1.3,0.9-2.3,0.9c-1.5,0-2-1.1-2-2v-5.4h-1.2v-1H144.7"/>
+	<path d="M111,42.8c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9c0.2,0,0.4-0.2,0.4-0.4v-5.4c0-1.5-1.3-2.5-2.4-2.5
+		c-1.2,0-2,0.5-2.4,0.8v-0.6h-1.9c-0.2,0-0.5,0.2-0.5,0.4v7.8h1.9c0.2,0,0.5-0.2,0.5-0.4V42.8z"/>
+	<path d="M166.9,42.8c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9c0.2,0,0.4-0.2,0.4-0.4v-5.4c0-1.5-1.3-2.5-2.4-2.5
+		c-1.2,0-2,0.5-2.4,0.8v-0.6H165c-0.2,0-0.4,0.2-0.4,0.4v7.8h1.9c0.2,0,0.4-0.2,0.4-0.4V42.8z"/>
+	<path d="M135.9,41.1v1.1c0.9-0.4,2.1-0.8,3.1-0.8c0.2,0,0.8,0.1,0.9,0.5c0.1,0.4,0.1,0.6,0.1,1.2v0c-1.9,0.5-4.7,1.3-4.7,3.5
+		c0,2,1.9,2.2,2.4,2.2c0.5,0,1.5-0.1,2.2-0.9v0.1v0.7h1.9c0.2,0,0.5-0.2,0.5-0.4v-5.7c0-1-0.6-2.2-3.2-2.2
+		C138,40.4,136.8,40.8,135.9,41.1 M138.6,47.6c-0.6,0-0.9-0.6-0.9-1.1c0-0.7,0.7-1.7,2.3-2.3c0,0.8,0,1.9,0,2.7
+		C139.7,47.2,139.3,47.6,138.6,47.6"/>
+	<path d="M102,42.8c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9c0.2,0,0.4-0.2,0.4-0.4v-5.4c0-1.5-1.3-2.5-2.4-2.5
+		c-1.2,0-2,0.5-2.4,0.8v-0.6h-1.9c-0.2,0-0.5,0.2-0.5,0.4v7.8h1.9c0.2,0,0.5-0.2,0.5-0.4V42.8z"/>
+	<path d="M86.3,40.4c-1.2,0-2.1,0.5-2.8,1c-0.5-0.8-1.4-1-2-1c-1.2,0-2,0.5-2.4,0.8v-0.6h-1.9c-0.2,0-0.4,0.2-0.4,0.4v7.8h1.9
+		c0.2,0,0.5-0.2,0.5-0.4v-5.6c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9h0c0.2,0,0.4-0.2,0.4-0.4v-5.6
+		c0.1-0.1,0.9-0.9,1.6-0.9c0.5,0,0.8,0.6,0.8,1.3v5.6h1.9c0.2,0,0.4-0.2,0.4-0.4v-5.4C88.6,41.4,87.4,40.4,86.3,40.4"/>
+</g>
+</svg>
diff --git a/includes/definitions/discovery/fujifilmprinter.yaml b/includes/definitions/discovery/fujifilmprinter.yaml
new file mode 100644
index 0000000000..4913e3c4e4
--- /dev/null
+++ b/includes/definitions/discovery/fujifilmprinter.yaml
@@ -0,0 +1,4 @@
+modules:
+    os:
+        sysDescr_regex: '/FUJIFILM (?<hardware>[^;]+)/'
+        serial: Printer-MIB::prtGeneralSerialNumber.1
diff --git a/includes/definitions/fujifilmprinter.yaml b/includes/definitions/fujifilmprinter.yaml
new file mode 100644
index 0000000000..c9d8c5a663
--- /dev/null
+++ b/includes/definitions/fujifilmprinter.yaml
@@ -0,0 +1,13 @@
+os: fujifilmprinter
+text: 'Fujifilm Printer'
+type: printer
+icon: fujifilm
+over:
+    - { graph: device_toner, text: Toner }
+discovery:
+    - sysObjectID:
+        - .1.3.6.1.4.1.297.1.11.93.2.1
+discovery_modules:
+    printer-supplies:   true
+poller_modules:
+    printer-supplies:   true
diff --git a/tests/data/fujifilmprinter_c7580.json b/tests/data/fujifilmprinter_c7580.json
new file mode 100644
index 0000000000..633e715a3b
--- /dev/null
+++ b/tests/data/fujifilmprinter_c7580.json
@@ -0,0 +1,753 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": null,
+                    "sysObjectID": ".1.3.6.1.4.1.297.1.11.93.2.1.2.3.5",
+                    "sysDescr": "FUJIFILM Apeos C7580",
+                    "sysContact": "<private>",
+                    "version": null,
+                    "hardware": "Apeos C7580",
+                    "features": null,
+                    "location": "<private>",
+                    "os": "fujifilmprinter",
+                    "type": "printer",
+                    "serial": "TC101642170085",
+                    "icon": "fujifilm.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": "Ethernet Controller",
+                    "ifName": "Ethernet Controller",
+                    "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": "iso88023Csmacd",
+                    "ifAlias": "Ethernet Controller",
+                    "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": "Ethernet Controller",
+                    "ifName": "Ethernet Controller",
+                    "portName": null,
+                    "ifIndex": 1,
+                    "ifSpeed": 1000000000,
+                    "ifSpeed_prev": null,
+                    "ifConnectorPresent": null,
+                    "ifOperStatus": "up",
+                    "ifOperStatus_prev": "up",
+                    "ifAdminStatus": "up",
+                    "ifAdminStatus_prev": null,
+                    "ifDuplex": null,
+                    "ifMtu": 1518,
+                    "ifType": "iso88023Csmacd",
+                    "ifAlias": "Ethernet Controller",
+                    "ifPhysAddress": "1c7d2265c850",
+                    "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": 5473311,
+                    "ifInUcastPkts_prev": 0,
+                    "ifInUcastPkts_delta": null,
+                    "ifInUcastPkts_rate": null,
+                    "ifOutUcastPkts": 132375,
+                    "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": 991248024,
+                    "ifInOctets_prev": 0,
+                    "ifInOctets_delta": null,
+                    "ifInOctets_rate": null,
+                    "ifOutOctets": 326237814,
+                    "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": 122576,
+                    "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
+                }
+            ]
+        }
+    },
+    "mempools": {
+        "discovery": {
+            "mempools": [
+                {
+                    "mempool_index": "1",
+                    "entPhysicalIndex": null,
+                    "mempool_type": "hrstorage",
+                    "mempool_class": "system",
+                    "mempool_precision": 1024,
+                    "mempool_descr": "RAM Memory",
+                    "mempool_perc": 58,
+                    "mempool_perc_oid": null,
+                    "mempool_used": 2504478720,
+                    "mempool_used_oid": ".1.3.6.1.2.1.25.2.3.1.6.1",
+                    "mempool_free": 1790488576,
+                    "mempool_free_oid": null,
+                    "mempool_total": 4294967296,
+                    "mempool_total_oid": null,
+                    "mempool_largestfree": null,
+                    "mempool_lowestfree": null,
+                    "mempool_deleted": 0,
+                    "mempool_perc_warn": 90
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    },
+    "storage": {
+        "discovery": {
+            "storage": [
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "10",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0i/)",
+                    "storage_size": 11400757248,
+                    "storage_units": 1024,
+                    "storage_used": 631336960,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "11",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0j/)",
+                    "storage_size": 42141548544,
+                    "storage_units": 1024,
+                    "storage_used": 2214477824,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "15",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0o/)",
+                    "storage_size": 1889234944,
+                    "storage_units": 1024,
+                    "storage_used": 117329920,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "16",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0p/)",
+                    "storage_size": 3778502656,
+                    "storage_units": 1024,
+                    "storage_used": 219799552,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "17",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0l/)",
+                    "storage_size": 3778502656,
+                    "storage_units": 1024,
+                    "storage_used": 249290752,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "18",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0z/)",
+                    "storage_size": 1442316288,
+                    "storage_units": 1024,
+                    "storage_used": 95895552,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "2",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0a/)",
+                    "storage_size": 3778502656,
+                    "storage_units": 1024,
+                    "storage_used": 221265920,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "3",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0b/)",
+                    "storage_size": 5633245184,
+                    "storage_units": 1024,
+                    "storage_used": 321200128,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "4",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0c/)",
+                    "storage_size": 15246213120,
+                    "storage_units": 1024,
+                    "storage_used": 886411264,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "5",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0d/)",
+                    "storage_size": 3778502656,
+                    "storage_units": 1024,
+                    "storage_used": 219836416,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "6",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0e/)",
+                    "storage_size": 15246213120,
+                    "storage_units": 1024,
+                    "storage_used": 836218880,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "7",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0f/)",
+                    "storage_size": 1889234944,
+                    "storage_units": 1024,
+                    "storage_used": 117383168,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "8",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0g/)",
+                    "storage_size": 2816606208,
+                    "storage_units": 1024,
+                    "storage_used": 167563264,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "9",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0h/)",
+                    "storage_size": 6207111168,
+                    "storage_units": 1024,
+                    "storage_used": 496164864,
+                    "storage_free": 0,
+                    "storage_perc": 0,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                }
+            ]
+        },
+        "poller": {
+            "storage": [
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "10",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0i/)",
+                    "storage_size": 11400757248,
+                    "storage_units": 1024,
+                    "storage_used": 631336960,
+                    "storage_free": 10769420288,
+                    "storage_perc": 6,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "11",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0j/)",
+                    "storage_size": 42141548544,
+                    "storage_units": 1024,
+                    "storage_used": 2214477824,
+                    "storage_free": 39927070720,
+                    "storage_perc": 5,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "15",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0o/)",
+                    "storage_size": 1889234944,
+                    "storage_units": 1024,
+                    "storage_used": 117329920,
+                    "storage_free": 1771905024,
+                    "storage_perc": 6,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "16",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0p/)",
+                    "storage_size": 3778502656,
+                    "storage_units": 1024,
+                    "storage_used": 219799552,
+                    "storage_free": 3558703104,
+                    "storage_perc": 6,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "17",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0l/)",
+                    "storage_size": 3778502656,
+                    "storage_units": 1024,
+                    "storage_used": 249290752,
+                    "storage_free": 3529211904,
+                    "storage_perc": 7,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "18",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0z/)",
+                    "storage_size": 1442316288,
+                    "storage_units": 1024,
+                    "storage_used": 95895552,
+                    "storage_free": 1346420736,
+                    "storage_perc": 7,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "2",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0a/)",
+                    "storage_size": 3778502656,
+                    "storage_units": 1024,
+                    "storage_used": 221265920,
+                    "storage_free": 3557236736,
+                    "storage_perc": 6,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "3",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0b/)",
+                    "storage_size": 5633245184,
+                    "storage_units": 1024,
+                    "storage_used": 321200128,
+                    "storage_free": 5312045056,
+                    "storage_perc": 6,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "4",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0c/)",
+                    "storage_size": 15246213120,
+                    "storage_units": 1024,
+                    "storage_used": 886411264,
+                    "storage_free": 14359801856,
+                    "storage_perc": 6,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "5",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0d/)",
+                    "storage_size": 3778502656,
+                    "storage_units": 1024,
+                    "storage_used": 219836416,
+                    "storage_free": 3558666240,
+                    "storage_perc": 6,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "6",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0e/)",
+                    "storage_size": 15246213120,
+                    "storage_units": 1024,
+                    "storage_used": 836218880,
+                    "storage_free": 14409994240,
+                    "storage_perc": 5,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "7",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0f/)",
+                    "storage_size": 1889234944,
+                    "storage_units": 1024,
+                    "storage_used": 117383168,
+                    "storage_free": 1771851776,
+                    "storage_perc": 6,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "8",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0g/)",
+                    "storage_size": 2816606208,
+                    "storage_units": 1024,
+                    "storage_used": 167563264,
+                    "storage_free": 2649042944,
+                    "storage_perc": 6,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                },
+                {
+                    "storage_mib": "hrstorage",
+                    "storage_index": "9",
+                    "storage_type": "hrStorageFixedDisk",
+                    "storage_descr": "Storage (//ide0h/)",
+                    "storage_size": 6207111168,
+                    "storage_units": 1024,
+                    "storage_used": 496164864,
+                    "storage_free": 5710946304,
+                    "storage_perc": 8,
+                    "storage_perc_warn": 60,
+                    "storage_deleted": 0
+                }
+            ]
+        }
+    },
+    "printer-supplies": {
+        "discovery": {
+            "printer_supplies": [
+                {
+                    "supply_index": 2,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.2",
+                    "supply_descr": "Yellow Toner",
+                    "supply_capacity": 25000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.2"
+                },
+                {
+                    "supply_index": 3,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.3",
+                    "supply_descr": "Magenta Toner",
+                    "supply_capacity": 25000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.3"
+                },
+                {
+                    "supply_index": 30,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.30",
+                    "supply_descr": "Black Toner 1",
+                    "supply_capacity": 23000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.30"
+                },
+                {
+                    "supply_index": 31,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.31",
+                    "supply_descr": "Black Toner 2",
+                    "supply_capacity": 23000,
+                    "supply_current": 90,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.31"
+                },
+                {
+                    "supply_index": 4,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.4",
+                    "supply_descr": "Cyan Toner",
+                    "supply_capacity": 25000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.4"
+                },
+                {
+                    "supply_index": 5,
+                    "supply_type": "wasteToner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.5",
+                    "supply_descr": "Waste Toner Container",
+                    "supply_capacity": 100,
+                    "supply_current": 50,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.5"
+                },
+                {
+                    "supply_index": 6,
+                    "supply_type": "opc",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.6",
+                    "supply_descr": "Black Drum Cartridge",
+                    "supply_capacity": 290000,
+                    "supply_current": 99,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.6"
+                },
+                {
+                    "supply_index": 7,
+                    "supply_type": "opc",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.7",
+                    "supply_descr": "Yellow Drum Cartridge",
+                    "supply_capacity": 290000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.7"
+                },
+                {
+                    "supply_index": 8,
+                    "supply_type": "opc",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.8",
+                    "supply_descr": "Magenta Drum Cartridge",
+                    "supply_capacity": 290000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.8"
+                },
+                {
+                    "supply_index": 9,
+                    "supply_type": "opc",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.9",
+                    "supply_descr": "Cyan Drum Cartridge",
+                    "supply_capacity": 290000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.9"
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    },
+    "availability": {
+        "poller": {
+            "availability": [
+                {
+                    "duration": 86400,
+                    "availability_perc": "100.000000"
+                },
+                {
+                    "duration": 604800,
+                    "availability_perc": "100.000000"
+                },
+                {
+                    "duration": 2592000,
+                    "availability_perc": "100.000000"
+                },
+                {
+                    "duration": 31536000,
+                    "availability_perc": "100.000000"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data/fujifilmprinter_c810.json b/tests/data/fujifilmprinter_c810.json
new file mode 100644
index 0000000000..67a7e7213c
--- /dev/null
+++ b/tests/data/fujifilmprinter_c810.json
@@ -0,0 +1,142 @@
+{
+    "availability": {
+        "poller": {
+            "availability": [
+                {
+                    "duration": 86400,
+                    "availability_perc": "100.000000"
+                },
+                {
+                    "duration": 604800,
+                    "availability_perc": "100.000000"
+                },
+                {
+                    "duration": 2592000,
+                    "availability_perc": "100.000000"
+                },
+                {
+                    "duration": 31536000,
+                    "availability_perc": "100.000000"
+                }
+            ]
+        }
+    },
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": null,
+                    "sysObjectID": ".1.3.6.1.4.1.297.1.11.93.2.1.3.5.5",
+                    "sysDescr": "FUJIFILM ApeosPro C810",
+                    "sysContact": "<private>",
+                    "version": null,
+                    "hardware": "ApeosPro C810",
+                    "features": null,
+                    "location": "<private>",
+                    "os": "fujifilmprinter",
+                    "type": "printer",
+                    "serial": "TC101630131338",
+                    "icon": "fujifilm.svg"
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    },
+    "printer-supplies": {
+        "discovery": {
+            "printer_supplies": [
+                {
+                    "supply_index": 2,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.2",
+                    "supply_descr": "Yellow Toner",
+                    "supply_capacity": 25000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.2"
+                },
+                {
+                    "supply_index": 3,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.3",
+                    "supply_descr": "Magenta Toner",
+                    "supply_capacity": 25000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.3"
+                },
+                {
+                    "supply_index": 30,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.30",
+                    "supply_descr": "Black Toner 1",
+                    "supply_capacity": 23000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.30"
+                },
+                {
+                    "supply_index": 31,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.31",
+                    "supply_descr": "Black Toner 2",
+                    "supply_capacity": 23000,
+                    "supply_current": 90,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.31"
+                },
+                {
+                    "supply_index": 4,
+                    "supply_type": "toner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.4",
+                    "supply_descr": "Cyan Toner",
+                    "supply_capacity": 25000,
+                    "supply_current": 100,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.4"
+                },
+                {
+                    "supply_index": 5,
+                    "supply_type": "wasteToner",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.5",
+                    "supply_descr": "Waste Toner Container",
+                    "supply_capacity": 100,
+                    "supply_current": 50,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.5"
+                },
+                {
+                    "supply_index": 6,
+                    "supply_type": "opc",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.6",
+                    "supply_descr": "Black Drum Cartridge",
+                    "supply_capacity": 163000,
+                    "supply_current": 99,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.6"
+                },
+                {
+                    "supply_index": 7,
+                    "supply_type": "opc",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.7",
+                    "supply_descr": "Yellow Drum Cartridge",
+                    "supply_capacity": 163000,
+                    "supply_current": 99,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.7"
+                },
+                {
+                    "supply_index": 8,
+                    "supply_type": "opc",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.8",
+                    "supply_descr": "Magenta Drum Cartridge",
+                    "supply_capacity": 163000,
+                    "supply_current": 99,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.8"
+                },
+                {
+                    "supply_index": 9,
+                    "supply_type": "opc",
+                    "supply_oid": ".1.3.6.1.2.1.43.11.1.1.9.1.9",
+                    "supply_descr": "Cyan Drum Cartridge",
+                    "supply_capacity": 163000,
+                    "supply_current": 99,
+                    "supply_capacity_oid": ".1.3.6.1.2.1.43.11.1.1.8.1.9"
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    }
+}
diff --git a/tests/snmpsim/fujifilmprinter_c7580.snmprec b/tests/snmpsim/fujifilmprinter_c7580.snmprec
new file mode 100644
index 0000000000..ef0bc07b59
--- /dev/null
+++ b/tests/snmpsim/fujifilmprinter_c7580.snmprec
@@ -0,0 +1,189 @@
+1.3.6.1.2.1.1.1.0|4|FUJIFILM Apeos C7580
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.297.1.11.93.2.1.2.3.5
+1.3.6.1.2.1.1.4.0|4|<private>
+1.3.6.1.2.1.1.6.0|4|<private>
+1.3.6.1.2.1.2.2.1.1.1|2|1
+1.3.6.1.2.1.2.2.1.2.1|4|Ethernet Controller
+1.3.6.1.2.1.2.2.1.3.1|2|7
+1.3.6.1.2.1.2.2.1.4.1|2|1518
+1.3.6.1.2.1.2.2.1.5.1|66|1000000000
+1.3.6.1.2.1.2.2.1.6.1|4x|1C7D2265C850
+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|991248024
+1.3.6.1.2.1.2.2.1.11.1|65|5473311
+1.3.6.1.2.1.2.2.1.12.1|65|0
+1.3.6.1.2.1.2.2.1.13.1|65|122576
+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|326237814
+1.3.6.1.2.1.2.2.1.17.1|65|132375
+1.3.6.1.2.1.2.2.1.18.1|65|0
+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.20.1.2.127.0.0.1|2|5
+1.3.6.1.2.1.4.20.1.2.192.168.0.53|2|1
+1.3.6.1.2.1.4.20.1.3.127.0.0.1|64|255.0.0.0
+1.3.6.1.2.1.25.1.5.0|66|0
+1.3.6.1.2.1.25.1.6.0|66|0
+1.3.6.1.2.1.25.1.7.0|2|0
+1.3.6.1.2.1.25.2.2.0|2|4194304
+1.3.6.1.2.1.25.2.3.1.1.1|2|1
+1.3.6.1.2.1.25.2.3.1.1.2|2|2
+1.3.6.1.2.1.25.2.3.1.1.3|2|3
+1.3.6.1.2.1.25.2.3.1.1.4|2|4
+1.3.6.1.2.1.25.2.3.1.1.5|2|5
+1.3.6.1.2.1.25.2.3.1.1.6|2|6
+1.3.6.1.2.1.25.2.3.1.1.7|2|7
+1.3.6.1.2.1.25.2.3.1.1.8|2|8
+1.3.6.1.2.1.25.2.3.1.1.9|2|9
+1.3.6.1.2.1.25.2.3.1.1.10|2|10
+1.3.6.1.2.1.25.2.3.1.1.11|2|11
+1.3.6.1.2.1.25.2.3.1.1.15|2|15
+1.3.6.1.2.1.25.2.3.1.1.16|2|16
+1.3.6.1.2.1.25.2.3.1.1.17|2|17
+1.3.6.1.2.1.25.2.3.1.1.18|2|18
+1.3.6.1.2.1.25.2.3.1.2.1|6|1.3.6.1.2.1.25.2.1.2
+1.3.6.1.2.1.25.2.3.1.2.2|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.3|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.4|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.5|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.6|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.7|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.8|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.9|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.10|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.11|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.15|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.16|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.17|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.2.18|6|1.3.6.1.2.1.25.2.1.4
+1.3.6.1.2.1.25.2.3.1.3.1|4|RAM Memory
+1.3.6.1.2.1.25.2.3.1.3.2|4|Storage (//ide0a/)
+1.3.6.1.2.1.25.2.3.1.3.3|4|Storage (//ide0b/)
+1.3.6.1.2.1.25.2.3.1.3.4|4|Storage (//ide0c/)
+1.3.6.1.2.1.25.2.3.1.3.5|4|Storage (//ide0d/)
+1.3.6.1.2.1.25.2.3.1.3.6|4|Storage (//ide0e/)
+1.3.6.1.2.1.25.2.3.1.3.7|4|Storage (//ide0f/)
+1.3.6.1.2.1.25.2.3.1.3.8|4|Storage (//ide0g/)
+1.3.6.1.2.1.25.2.3.1.3.9|4|Storage (//ide0h/)
+1.3.6.1.2.1.25.2.3.1.3.10|4|Storage (//ide0i/)
+1.3.6.1.2.1.25.2.3.1.3.11|4|Storage (//ide0j/)
+1.3.6.1.2.1.25.2.3.1.3.15|4|Storage (//ide0o/)
+1.3.6.1.2.1.25.2.3.1.3.16|4|Storage (//ide0p/)
+1.3.6.1.2.1.25.2.3.1.3.17|4|Storage (//ide0l/)
+1.3.6.1.2.1.25.2.3.1.3.18|4|Storage (//ide0z/)
+1.3.6.1.2.1.25.2.3.1.4.1|2|1024
+1.3.6.1.2.1.25.2.3.1.4.2|2|1024
+1.3.6.1.2.1.25.2.3.1.4.3|2|1024
+1.3.6.1.2.1.25.2.3.1.4.4|2|1024
+1.3.6.1.2.1.25.2.3.1.4.5|2|1024
+1.3.6.1.2.1.25.2.3.1.4.6|2|1024
+1.3.6.1.2.1.25.2.3.1.4.7|2|1024
+1.3.6.1.2.1.25.2.3.1.4.8|2|1024
+1.3.6.1.2.1.25.2.3.1.4.9|2|1024
+1.3.6.1.2.1.25.2.3.1.4.10|2|1024
+1.3.6.1.2.1.25.2.3.1.4.11|2|1024
+1.3.6.1.2.1.25.2.3.1.4.15|2|1024
+1.3.6.1.2.1.25.2.3.1.4.16|2|1024
+1.3.6.1.2.1.25.2.3.1.4.17|2|1024
+1.3.6.1.2.1.25.2.3.1.4.18|2|1024
+1.3.6.1.2.1.25.2.3.1.5.1|2|4194304
+1.3.6.1.2.1.25.2.3.1.5.2|2|3689944
+1.3.6.1.2.1.25.2.3.1.5.3|2|5501216
+1.3.6.1.2.1.25.2.3.1.5.4|2|14888880
+1.3.6.1.2.1.25.2.3.1.5.5|2|3689944
+1.3.6.1.2.1.25.2.3.1.5.6|2|14888880
+1.3.6.1.2.1.25.2.3.1.5.7|2|1844956
+1.3.6.1.2.1.25.2.3.1.5.8|2|2750592
+1.3.6.1.2.1.25.2.3.1.5.9|2|6061632
+1.3.6.1.2.1.25.2.3.1.5.10|2|11133552
+1.3.6.1.2.1.25.2.3.1.5.11|2|41153856
+1.3.6.1.2.1.25.2.3.1.5.15|2|1844956
+1.3.6.1.2.1.25.2.3.1.5.16|2|3689944
+1.3.6.1.2.1.25.2.3.1.5.17|2|3689944
+1.3.6.1.2.1.25.2.3.1.5.18|2|1408512
+1.3.6.1.2.1.25.2.3.1.6.1|2|2445780
+1.3.6.1.2.1.25.2.3.1.6.2|2|216080
+1.3.6.1.2.1.25.2.3.1.6.3|2|313672
+1.3.6.1.2.1.25.2.3.1.6.4|2|865636
+1.3.6.1.2.1.25.2.3.1.6.5|2|214684
+1.3.6.1.2.1.25.2.3.1.6.6|2|816620
+1.3.6.1.2.1.25.2.3.1.6.7|2|114632
+1.3.6.1.2.1.25.2.3.1.6.8|2|163636
+1.3.6.1.2.1.25.2.3.1.6.9|2|484536
+1.3.6.1.2.1.25.2.3.1.6.10|2|616540
+1.3.6.1.2.1.25.2.3.1.6.11|2|2162576
+1.3.6.1.2.1.25.2.3.1.6.15|2|114580
+1.3.6.1.2.1.25.2.3.1.6.16|2|214648
+1.3.6.1.2.1.25.2.3.1.6.17|2|243448
+1.3.6.1.2.1.25.2.3.1.6.18|2|93648
+1.3.6.1.2.1.25.2.3.1.7.1|65|0
+1.3.6.1.2.1.25.2.3.1.7.2|65|0
+1.3.6.1.2.1.25.2.3.1.7.3|65|0
+1.3.6.1.2.1.25.2.3.1.7.4|65|0
+1.3.6.1.2.1.25.2.3.1.7.5|65|0
+1.3.6.1.2.1.25.2.3.1.7.6|65|0
+1.3.6.1.2.1.25.2.3.1.7.7|65|0
+1.3.6.1.2.1.25.2.3.1.7.8|65|0
+1.3.6.1.2.1.25.2.3.1.7.9|65|0
+1.3.6.1.2.1.25.2.3.1.7.10|65|0
+1.3.6.1.2.1.25.2.3.1.7.11|65|0
+1.3.6.1.2.1.25.2.3.1.7.15|65|0
+1.3.6.1.2.1.25.2.3.1.7.16|65|0
+1.3.6.1.2.1.25.2.3.1.7.17|65|0
+1.3.6.1.2.1.25.2.3.1.7.18|65|0
+1.3.6.1.2.1.43.5.1.1.17.1|4|TC101642170085
+1.3.6.1.2.1.43.8.2.1.9.1.1|2|600
+1.3.6.1.2.1.43.8.2.1.9.1.2|2|600
+1.3.6.1.2.1.43.8.2.1.9.1.3|2|980
+1.3.6.1.2.1.43.8.2.1.9.1.4|2|1420
+1.3.6.1.2.1.43.8.2.1.9.1.5|2|180
+1.3.6.1.2.1.43.8.2.1.10.1.1|2|450
+1.3.6.1.2.1.43.8.2.1.10.1.2|2|450
+1.3.6.1.2.1.43.8.2.1.10.1.3|2|735
+1.3.6.1.2.1.43.8.2.1.10.1.4|2|710
+1.3.6.1.2.1.43.8.2.1.10.1.5|2|0
+1.3.6.1.2.1.43.11.1.1.5.1.2|2|3
+1.3.6.1.2.1.43.11.1.1.5.1.3|2|3
+1.3.6.1.2.1.43.11.1.1.5.1.4|2|3
+1.3.6.1.2.1.43.11.1.1.5.1.5|2|4
+1.3.6.1.2.1.43.11.1.1.5.1.6|2|9
+1.3.6.1.2.1.43.11.1.1.5.1.7|2|9
+1.3.6.1.2.1.43.11.1.1.5.1.8|2|9
+1.3.6.1.2.1.43.11.1.1.5.1.9|2|9
+1.3.6.1.2.1.43.11.1.1.5.1.30|2|3
+1.3.6.1.2.1.43.11.1.1.5.1.31|2|3
+1.3.6.1.2.1.43.11.1.1.6.1.2|4|Yellow Toner
+1.3.6.1.2.1.43.11.1.1.6.1.3|4|Magenta Toner
+1.3.6.1.2.1.43.11.1.1.6.1.4|4|Cyan Toner
+1.3.6.1.2.1.43.11.1.1.6.1.5|4|Waste Toner Container
+1.3.6.1.2.1.43.11.1.1.6.1.6|4|Black Drum Cartridge
+1.3.6.1.2.1.43.11.1.1.6.1.7|4|Yellow Drum Cartridge
+1.3.6.1.2.1.43.11.1.1.6.1.8|4|Magenta Drum Cartridge
+1.3.6.1.2.1.43.11.1.1.6.1.9|4|Cyan Drum Cartridge
+1.3.6.1.2.1.43.11.1.1.6.1.30|4|Black Toner 1
+1.3.6.1.2.1.43.11.1.1.6.1.31|4|Black Toner 2
+1.3.6.1.2.1.43.11.1.1.8.1.2|2|25000
+1.3.6.1.2.1.43.11.1.1.8.1.3|2|25000
+1.3.6.1.2.1.43.11.1.1.8.1.4|2|25000
+1.3.6.1.2.1.43.11.1.1.8.1.5|2|-2
+1.3.6.1.2.1.43.11.1.1.8.1.6|2|290000
+1.3.6.1.2.1.43.11.1.1.8.1.7|2|290000
+1.3.6.1.2.1.43.11.1.1.8.1.8|2|290000
+1.3.6.1.2.1.43.11.1.1.8.1.9|2|290000
+1.3.6.1.2.1.43.11.1.1.8.1.30|2|23000
+1.3.6.1.2.1.43.11.1.1.8.1.31|2|23000
+1.3.6.1.2.1.43.11.1.1.9.1.2|2|25000
+1.3.6.1.2.1.43.11.1.1.9.1.3|2|25000
+1.3.6.1.2.1.43.11.1.1.9.1.4|2|25000
+1.3.6.1.2.1.43.11.1.1.9.1.5|2|-3
+1.3.6.1.2.1.43.11.1.1.9.1.6|2|287100
+1.3.6.1.2.1.43.11.1.1.9.1.7|2|290000
+1.3.6.1.2.1.43.11.1.1.9.1.8|2|290000
+1.3.6.1.2.1.43.11.1.1.9.1.9|2|290000
+1.3.6.1.2.1.43.11.1.1.9.1.30|2|23000
+1.3.6.1.2.1.43.11.1.1.9.1.31|2|20700
diff --git a/tests/snmpsim/fujifilmprinter_c810.snmprec b/tests/snmpsim/fujifilmprinter_c810.snmprec
new file mode 100644
index 0000000000..de14157012
--- /dev/null
+++ b/tests/snmpsim/fujifilmprinter_c810.snmprec
@@ -0,0 +1,59 @@
+1.3.6.1.2.1.1.1.0|4|FUJIFILM ApeosPro C810
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.297.1.11.93.2.1.3.5.5
+1.3.6.1.2.1.1.4.0|4|<private>
+1.3.6.1.2.1.1.6.0|4|<private>
+1.3.6.1.2.1.4.20.1.2.127.0.0.1|2|3
+1.3.6.1.2.1.4.20.1.2.192.168.0.57|2|1
+1.3.6.1.2.1.4.20.1.3.127.0.0.1|64|255.0.0.0
+1.3.6.1.2.1.25.2.3.1.6.1|2|2358740
+1.3.6.1.2.1.43.5.1.1.17.1|4|TC101630131338
+1.3.6.1.2.1.43.8.2.1.9.1.1|2|540
+1.3.6.1.2.1.43.8.2.1.9.1.2|2|540
+1.3.6.1.2.1.43.8.2.1.9.1.3|2|890
+1.3.6.1.2.1.43.8.2.1.9.1.4|2|1280
+1.3.6.1.2.1.43.8.2.1.9.1.5|2|250
+1.3.6.1.2.1.43.8.2.1.10.1.1|2|270
+1.3.6.1.2.1.43.8.2.1.10.1.2|2|540
+1.3.6.1.2.1.43.8.2.1.10.1.3|2|222
+1.3.6.1.2.1.43.8.2.1.10.1.4|2|640
+1.3.6.1.2.1.43.8.2.1.10.1.5|2|-3
+1.3.6.1.2.1.43.11.1.1.5.1.2|2|3
+1.3.6.1.2.1.43.11.1.1.5.1.3|2|3
+1.3.6.1.2.1.43.11.1.1.5.1.4|2|3
+1.3.6.1.2.1.43.11.1.1.5.1.5|2|4
+1.3.6.1.2.1.43.11.1.1.5.1.6|2|9
+1.3.6.1.2.1.43.11.1.1.5.1.7|2|9
+1.3.6.1.2.1.43.11.1.1.5.1.8|2|9
+1.3.6.1.2.1.43.11.1.1.5.1.9|2|9
+1.3.6.1.2.1.43.11.1.1.5.1.30|2|3
+1.3.6.1.2.1.43.11.1.1.5.1.31|2|3
+1.3.6.1.2.1.43.11.1.1.6.1.2|4|Yellow Toner
+1.3.6.1.2.1.43.11.1.1.6.1.3|4|Magenta Toner
+1.3.6.1.2.1.43.11.1.1.6.1.4|4|Cyan Toner
+1.3.6.1.2.1.43.11.1.1.6.1.5|4|Waste Toner Container
+1.3.6.1.2.1.43.11.1.1.6.1.6|4|Black Drum Cartridge
+1.3.6.1.2.1.43.11.1.1.6.1.7|4|Yellow Drum Cartridge
+1.3.6.1.2.1.43.11.1.1.6.1.8|4|Magenta Drum Cartridge
+1.3.6.1.2.1.43.11.1.1.6.1.9|4|Cyan Drum Cartridge
+1.3.6.1.2.1.43.11.1.1.6.1.30|4|Black Toner 1
+1.3.6.1.2.1.43.11.1.1.6.1.31|4|Black Toner 2
+1.3.6.1.2.1.43.11.1.1.8.1.2|2|25000
+1.3.6.1.2.1.43.11.1.1.8.1.3|2|25000
+1.3.6.1.2.1.43.11.1.1.8.1.4|2|25000
+1.3.6.1.2.1.43.11.1.1.8.1.5|2|-2
+1.3.6.1.2.1.43.11.1.1.8.1.6|2|163000
+1.3.6.1.2.1.43.11.1.1.8.1.7|2|163000
+1.3.6.1.2.1.43.11.1.1.8.1.8|2|163000
+1.3.6.1.2.1.43.11.1.1.8.1.9|2|163000
+1.3.6.1.2.1.43.11.1.1.8.1.30|2|23000
+1.3.6.1.2.1.43.11.1.1.8.1.31|2|23000
+1.3.6.1.2.1.43.11.1.1.9.1.2|2|25000
+1.3.6.1.2.1.43.11.1.1.9.1.3|2|25000
+1.3.6.1.2.1.43.11.1.1.9.1.4|2|25000
+1.3.6.1.2.1.43.11.1.1.9.1.5|2|-3
+1.3.6.1.2.1.43.11.1.1.9.1.6|2|161370
+1.3.6.1.2.1.43.11.1.1.9.1.7|2|161370
+1.3.6.1.2.1.43.11.1.1.9.1.8|2|161370
+1.3.6.1.2.1.43.11.1.1.9.1.9|2|161370
+1.3.6.1.2.1.43.11.1.1.9.1.30|2|23000
+1.3.6.1.2.1.43.11.1.1.9.1.31|2|20700