From d1759501413df395b37a3059da2ad2a3b95d9670 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Thu, 10 Jan 2019 12:55:21 -0600
Subject: [PATCH] topvision - forgot json file (#9640)

Added software version from sysDescr while I was at it
---
 includes/polling/os/topvision.inc.php | 11 +++++++-
 tests/data/topvision.json             | 40 +++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tests/data/topvision.json

diff --git a/includes/polling/os/topvision.inc.php b/includes/polling/os/topvision.inc.php
index a71bb8c536..8cd28a75ae 100644
--- a/includes/polling/os/topvision.inc.php
+++ b/includes/polling/os/topvision.inc.php
@@ -1,3 +1,12 @@
 <?php
 $serial = snmp_getnext($device, ".1.3.6.1.4.1.32285.11.1.1.2.1.1.1.16", "-OQv");
-$hardware = snmp_getnext($device, ".1.3.6.1.4.1.32285.11.1.1.2.1.1.1.18", "-OQv");
+
+preg_match('/hardware version:V([^;]+);software version:V([^;]+);/', $device['sysDescr'], $tv_matches);
+if (isset($tv_matches[2])) {
+    $version = $tv_matches[2];
+}
+if (isset($tv_matches[1])) {
+    $hardware = $tv_matches[1];
+} else {
+    $hardware = snmp_getnext($device, ".1.3.6.1.4.1.32285.11.1.1.2.1.1.1.18", "-OQv");
+}
diff --git a/tests/data/topvision.json b/tests/data/topvision.json
new file mode 100644
index 0000000000..a96a9a9a33
--- /dev/null
+++ b/tests/data/topvision.json
@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.32285.11.1.1.1.4.1",
+                    "sysDescr": "CC8800D-E;hardware version:V2.2.4;software version:V2.3.0.54-C.BT;firm-Software version:430B3-V2.3.0.17BT;Chip version:BCM3218 2.44, 0.1.13, 0.2.2, 0.2.2",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": null,
+                    "features": null,
+                    "os": "topvision",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "sumavision.png",
+                    "location": null
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.32285.11.1.1.1.4.1",
+                    "sysDescr": "CC8800D-E;hardware version:V2.2.4;software version:V2.3.0.54-C.BT;firm-Software version:430B3-V2.3.0.17BT;Chip version:BCM3218 2.44, 0.1.13, 0.2.2, 0.2.2",
+                    "sysContact": "<private>",
+                    "version": "2.3.0.54-C.BT",
+                    "hardware": "2.2.4",
+                    "features": null,
+                    "os": "topvision",
+                    "type": "network",
+                    "serial": "1705CC8800D360039",
+                    "icon": "sumavision.png",
+                    "location": "<private>"
+                }
+            ]
+        }
+    }
+}