From b9898273c7931cb72f78972292c104a2fcf18706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= <sorenrosiak@gmail.com>
Date: Fri, 7 Sep 2018 00:06:23 +0200
Subject: [PATCH] Added HPE iLO Version Polling (#9146)

* Add HPE iLO Version Polling

* Added json test data

* Fix style
---
 includes/polling/os/hpe-ilo.inc.php |  7 +++--
 tests/data/hpe-ilo.json             | 40 +++++++++++++++++++++++++++++
 tests/snmpsim/hpe-ilo.snmprec       |  7 +++++
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 tests/data/hpe-ilo.json

diff --git a/includes/polling/os/hpe-ilo.inc.php b/includes/polling/os/hpe-ilo.inc.php
index e64f29de79..e91eeb4a12 100644
--- a/includes/polling/os/hpe-ilo.inc.php
+++ b/includes/polling/os/hpe-ilo.inc.php
@@ -1,8 +1,7 @@
 <?php
 
-$oids = 'cpqSiProductName.0 cpqSiSysSerialNum.0';
-
-$data = snmp_get_multi($device, $oids, '-OQUs', 'CPQSINFO-MIB');
-
+$data = snmp_get_multi($device, 'cpqSiProductName.0 cpqSiSysSerialNum.0 cpqHoFwVerVersion.0', '-OQUs', 'CPQSINFO-MIB:CPQHOST-MIB');
 $hardware = trim($data[0]['cpqSiProductName'], '"');
 $serial = trim($data[0]['cpqSiSysSerialNum'], '"');
+$version  = stristr($data[0]['cpqHoFwVerVersion'], ' ', true);
+unset($data);
diff --git a/tests/data/hpe-ilo.json b/tests/data/hpe-ilo.json
new file mode 100644
index 0000000000..7a793f6986
--- /dev/null
+++ b/tests/data/hpe-ilo.json
@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.232.9.4.10",
+                    "sysDescr": "Integrated Lights-Out 4 2.50 Sep 23 2016",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": null,
+                    "features": null,
+                    "location": null,
+                    "os": "hpe-ilo",
+                    "type": "appliance",
+                    "serial": null,
+                    "icon": "hpe.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.232.9.4.10",
+                    "sysDescr": "Integrated Lights-Out 4 2.50 Sep 23 2016",
+                    "sysContact": "<private>",
+                    "version": "2.50",
+                    "hardware": "ProLiant ML350 Gen9",
+                    "features": null,
+                    "location": "<private>",
+                    "os": "hpe-ilo",
+                    "type": "appliance",
+                    "serial": "AB123456CD",
+                    "icon": "hpe.svg"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/snmpsim/hpe-ilo.snmprec b/tests/snmpsim/hpe-ilo.snmprec
index 989e2ee182..cdfa8b88dc 100644
--- a/tests/snmpsim/hpe-ilo.snmprec
+++ b/tests/snmpsim/hpe-ilo.snmprec
@@ -1,2 +1,9 @@
 1.3.6.1.2.1.1.1.0|4|Integrated Lights-Out 4 2.50 Sep 23 2016
 1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.232.9.4.10
+1.3.6.1.2.1.1.3.0|67|3282141998
+1.3.6.1.2.1.1.4.0|4|<private>
+1.3.6.1.2.1.1.5.0|4|<private>
+1.3.6.1.2.1.1.6.0|4|<private>
+1.3.6.1.4.1.232.2.2.2.1.0|4|AB123456CD
+1.3.6.1.4.1.232.2.2.4.2.0|4|ProLiant ML350 Gen9
+1.3.6.1.4.1.232.11.2.14.1.1.5.0|4|2.50 Sep 23 2016