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

Added Wireless discovery to Huawei Vrp (#9516)

Browse Source 
* HUAWEI Wireless MIB files

* Adding support for Wireless Controller capabilities of Huawei VRP Switches

* CodeClimate Fixes

* Add clientPerRadio polling for VRP

* Cache snmpwalk_group and  snmpwalk_cache_oid separately

* Travis

* Travis

* Cleaning sensors not available

* isset corrected

* tests

* clean

* default value for depth

* Update Vrp.php

* Update Vrp.php

* Update vrp.inc.php

* Update vrp_ac6605-26.json
This commit is contained in:
PipoCanaja
2019-05-19 06:00:53 +02:00
committed by Tony Murray
parent 953f26d4d5
commit 393b0e688f
19 changed files with 48816 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
LibreNMS/OS.php
View File

@@ -116,12 +116,12 @@ class OS implements ProcessorDiscovery
return null;
}
if (!isset($this->cache[$oid])) {
if (!isset($this->cache['cache_oid'][$oid])) {
$data = snmpwalk_cache_oid($this->getDevice(), $oid, array(), $mib, null, $snmpflags);
$this->cache[$oid] = array_map('current', $data);
$this->cache['cache_oid'][$oid] = array_map('current', $data);
}
return $this->cache[$oid];
return $this->cache['cache_oid'][$oid];
}
/**
@@ -130,21 +130,22 @@ class OS implements ProcessorDiscovery
* DO NOT use numeric oids with this function! The snmp result must contain only one oid.
*
* @param string $oid textual oid
* @param string $mib mib for this oid
* @param string $mib mib for this oid (optional)
* @param string $depth depth for snmpwalk_group (optional)
* @return array array indexed by the snmp index with the value as the data returned by snmp
*/
public function getCacheTable($oid, $mib = null)
public function getCacheTable($oid, $mib = null, $depth = 1)
{
if (str_contains($oid, '.')) {
echo "Error: don't use this with numeric oids!\n";
return null;
}
if (!isset($this->cache[$oid])) {
$this->cache[$oid] = snmpwalk_group($this->getDevice(), $oid, $mib);
if (!isset($this->cache['group'][$depth][$oid])) {
$this->cache['group'][$depth][$oid] = snmpwalk_group($this->getDevice(), $oid, $mib, $depth);
}
return $this->cache[$oid];
return $this->cache['group'][$depth][$oid];
}
/**
@@ -155,7 +156,7 @@ class OS implements ProcessorDiscovery
*/
public function isCached($oid)
{
return isset($this->cache[$oid]);
return isset($this->cache['cache_oid'][$oid]);
}
/**