mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VRP: improving extraction of HW and Version (#9167)

Browse Source 
* VRP: improving extraction of HW and Version

* VRP: Improving extraction of HW and Version - CodeClimate update

* VRP: Improving extraction of HW and Version - Review and debug code cleaning

* VRP: Improving extraction of HW and Version - resolve OIDs and swap order of poll

* VRP: Improving extraction of HW and Version - resolve OIDs and swap order of poll

* Device: VRP: Update test data

* Device: VRP: Travis code clean

* Device: VRP: Update test data for variants

* Device: VRP: Update test data for variants
This commit is contained in:
PipoCanaja
2018-09-14 15:05:03 +02:00
committed by Tony Murray
parent cc225bd39c
commit 1041c640bb
6 changed files with 13547 additions and 13415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
includes/polling/os/vrp.inc.php
View File

@@ -1,6 +1,32 @@
<?php
$hardware = trim(snmp_get($device, '.1.3.6.1.4.1.2011.2.33.20.1.1.1.3.0', '-OQv'), '"');
//Huawei VRP devices are not providing the HW description in a unified way
preg_match("/Version .*\n/", $device['sysDescr'], $matches);
preg_match("/Version [^\s]*/m", $device['sysDescr'], $matches);
$version = trim(str_replace('Version ', '', $matches[0]));
preg_match("/\(([^\s]*) (V[0-9]{3}R[0-9]{3}[0-9A-Z]+)/m", $device['sysDescr'], $matches);
if (!empty($matches[2])) {
$version .= " (" . trim($matches[2]) . ")";
}
$oidList = [
'HUAWEI-ENTITY-EXTENT-MIB::hwEntityExtentMIB.6.5.0',
'HUAWEI-DEVICE-EXT-MIB::hwProductName.0',
'HUAWEI-MIB::hwDatacomm.183.1.25.1.5.1',
'HUAWEI-MIB::mlsr.20.1.1.1.3.0',
];
foreach ($oidList as $oid) {
$hardware_tmp = snmp_get($device, $oid, '-OQv');
if (!empty($hardware_tmp)) {
$hardware = "Huawei " . $hardware_tmp;
break;
}
}
// Let's use sysDescr if nothing else is found in the OIDs. sysDescr is less detailled than OIDs most of the time
if (empty($hardware_tmp) && !empty($matches[1])) {
$hardware = "Huawei " . trim($matches[1]);
}