From f9da8ef2a1e98c7bf6bf2bb5f6cffb9aee085c70 Mon Sep 17 00:00:00 2001
From: vivia11 <nguyen_vivia@hotmail.com>
Date: Fri, 20 Apr 2018 06:12:24 -0400
Subject: [PATCH] device: Added dection for ibm-dpi os (#8541)

* Add ibm-dpi os support

* SNMP test data

* Remove blank space

* remove snmp_get

* Rename to dpi

* Add json test data and change text to IBM DPI

* Update json test
---
 includes/definitions/dpi.yaml   | 34 ++++++++++++++++++++++++++++
 includes/polling/os/dpi.inc.php |  3 +++
 tests/data/dpi.json             | 40 +++++++++++++++++++++++++++++++++
 tests/snmpsim/dpi.snmprec       |  7 ++++++
 4 files changed, 84 insertions(+)
 create mode 100644 includes/definitions/dpi.yaml
 create mode 100644 includes/polling/os/dpi.inc.php
 create mode 100644 tests/data/dpi.json
 create mode 100644 tests/snmpsim/dpi.snmprec

diff --git a/includes/definitions/dpi.yaml b/includes/definitions/dpi.yaml
new file mode 100644
index 0000000000..dffee59937
--- /dev/null
+++ b/includes/definitions/dpi.yaml
@@ -0,0 +1,34 @@
+os: dpi
+text: 'IBM DPI'
+type: power
+icon: ibmos
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+poller_modules:
+    hr-mib: 0
+    ucd-mib: 0
+    bgp-peers: 0
+    ucd-diskio: 0
+    wireless: 0
+    ospf: 0
+    entity-physical: 0
+    applications: 0
+    stp: 0
+    ntp: 0
+discovery_modules:
+    entity-physical: 0
+    cisco-vrf-lite: 0
+    ipv6-address: 0
+    storage: 0
+    hr-device: 0
+    discovery-protocols: 0
+    arp-table: 0
+    bgp-peers: 0
+    ucd-diskio: 0
+    services: 0
+    stp: 0
+    ntp: 0
+    wireless: 0
+discovery:
+    - 
+      sysDescr: IBM DPI
diff --git a/includes/polling/os/dpi.inc.php b/includes/polling/os/dpi.inc.php
new file mode 100644
index 0000000000..76ec6c0964
--- /dev/null
+++ b/includes/polling/os/dpi.inc.php
@@ -0,0 +1,3 @@
+<?php
+
+$version = end(explode(' ', $device['sysDescr']));
diff --git a/tests/data/dpi.json b/tests/data/dpi.json
new file mode 100644
index 0000000000..41859dc448
--- /dev/null
+++ b/tests/data/dpi.json
@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.2.6.223",
+                    "sysDescr": "IBM DPI V01.08.0003",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "dpi",
+                    "type": "power",
+                    "serial": null,
+                    "icon": "ibmos.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.2.6.223",
+                    "sysDescr": "IBM DPI V01.08.0003",
+                    "sysContact": "<private>",
+                    "version": "V01.08.0003",
+                    "hardware": "",
+                    "features": null,
+                    "location": "<private>",
+                    "os": "dpi",
+                    "type": "power",
+                    "serial": null,
+                    "icon": "ibmos.svg"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/snmpsim/dpi.snmprec b/tests/snmpsim/dpi.snmprec
new file mode 100644
index 0000000000..7dd760e95a
--- /dev/null
+++ b/tests/snmpsim/dpi.snmprec
@@ -0,0 +1,7 @@
+1.3.6.1.2.1.1.1.0|4|IBM DPI V01.08.0003
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2.6.223
+1.3.6.1.2.1.1.3.0|67|174262559
+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.6.3.10.2.1.3.0|2|1808161