Fixed missing FW and Serials in Dlink (#10481)

* Fixed missing FW and Serials in Dlink * Added .snmprec data * Added jsons of test data
librenms · Aug 2, 2019 · 1a54bdc · 1a54bdc
1 parent c6e719b
commit 1a54bdc
Show file tree

Hide file tree

Showing 23 changed files with 112,533 additions and 5 deletions.
diff --git a/includes/polling/os/dlink.inc.php b/includes/polling/os/dlink.inc.php
@@ -3,10 +3,32 @@
 $Descr_string  = $device['sysDescr'];
 $Descr_chopper = preg_split('/[ ]+/', "$Descr_string");
 
-$hardware = $Descr_chopper[0].' Rev. '.str_replace('"', '', snmp_get($device, '.1.3.6.1.4.1.171.12.11.1.9.4.1.12.1', '-Oqv'));
-$version = snmp_get($device, '.1.3.6.1.4.1.171.12.11.1.9.4.1.11.1', '-Oqv');
-$serial = snmp_get($device, '.1.3.6.1.4.1.171.12.11.1.9.4.1.17.1', '-Oqv');
+$hardware = $Descr_chopper[0].' Rev. '.str_replace('"', '', snmp_get($device, '.1.3.6.1.2.1.16.19.3.0', '-Oqv'));
 
-if (!$version) {
-    $version = snmp_get($device, 'dEntityExtVersionRuntime.1', '-Oqv', 'DLINKSW-ENTITY-EXT-MIB');
+$versionOIDList = [
+     'DLINKSW-ENTITY-EXT-MIB::dEntityExtVersionRuntime.1',
+     '.1.3.6.1.2.1.16.19.2.0',
+     '.1.3.6.1.4.1.171.12.11.1.9.4.1.11.1',
+];
+
+foreach ($versionOIDList as $oid) {
+        $version_tmp = snmp_get($device, $oid, '-Oqv');
+
+    if (!empty($version_tmp)) {
+        $version = $version_tmp;
+        break;
+    }
+}
+
+$serialOIDList = [
+     '.1.3.6.1.4.1.171.12.11.1.9.4.1.17.1',
+     '.1.3.6.1.4.1.171.12.1.1.12.0',
+];
+
+foreach ($serialOIDList as $oid) {
+        $serial_tmp = snmp_get($device, $oid, '-Oqv');
+    if (!empty($serial_tmp)) {
+        $serial = $serial_tmp;
+        break;
+    }
 }
diff --git a/tests/data/dlink_des-3526.json b/tests/data/dlink_des-3526.json
diff --git a/tests/data/dlink_des-3528.json b/tests/data/dlink_des-3528.json
diff --git a/tests/data/dlink_des-3550.json b/tests/data/dlink_des-3550.json
diff --git a/tests/data/dlink_dgs-1510-28x-me.json b/tests/data/dlink_dgs-1510-28x-me.json
diff --git a/tests/data/dlink_dgs-1510-28xmp-me.json b/tests/data/dlink_dgs-1510-28xmp-me.json
diff --git a/tests/data/dlink_dgs-3000-28x.json b/tests/data/dlink_dgs-3000-28x.json
diff --git a/tests/data/dlink_dgs-3000-28xmp.json b/tests/data/dlink_dgs-3000-28xmp.json
diff --git a/tests/data/dlink_dgs-3120-24tc.json b/tests/data/dlink_dgs-3120-24tc.json
diff --git a/tests/data/dlink_dgs-3420-28tc.json b/tests/data/dlink_dgs-3420-28tc.json
diff --git a/tests/data/dlink_dgs-3620-28sc.json b/tests/data/dlink_dgs-3620-28sc.json
diff --git a/tests/data/dlink_dgs-3627g.json b/tests/data/dlink_dgs-3627g.json