From c1239b50e1cb873e8bb3230fce8f3aea715c8705 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 2 Dec 2015 20:57:04 +0000
Subject: [PATCH] Pointed the snmp calls for Huawei to the correct folder!

---
 includes/discovery/mempools/vrp.inc.php   | 6 +++---
 includes/discovery/processors/vrp.inc.php | 6 +++---
 includes/polling/mempools/vrp.inc.php     | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/discovery/mempools/vrp.inc.php b/includes/discovery/mempools/vrp.inc.php
index ca06a851e8..794b36a3ba 100644
--- a/includes/discovery/mempools/vrp.inc.php
+++ b/includes/discovery/mempools/vrp.inc.php
@@ -3,9 +3,9 @@
 // Huawei VRP  mempools
 if ($device['os'] == 'vrp') {
     echo 'VRP : ';
-    $mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityMemUsage', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', $config['install_dir'].'/mibs');
-    $mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityMemSize', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', $config['install_dir'].'/mibs');
-    $mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityBomEnDesc', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', $config['install_dir'].'/mibs');
+    $mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityMemUsage', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/huawei');
+    $mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityMemSize', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/huawei');
+    $mempools_array = snmpwalk_cache_multi_oid($device, 'hwEntityBomEnDesc', $mempools_array, 'HUAWEI-ENTITY-EXTENT-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/huawei');
     d_echo($mempools_array);
 
     if (is_array($mempools_array)) {
diff --git a/includes/discovery/processors/vrp.inc.php b/includes/discovery/processors/vrp.inc.php
index 3cdbcdf2ed..3b37b8e91d 100644
--- a/includes/discovery/processors/vrp.inc.php
+++ b/includes/discovery/processors/vrp.inc.php
@@ -3,9 +3,9 @@
 // Huawei VRP Processors
 if ($device['os'] == 'vrp') {
     echo 'Huawei VRP ';
-    $processors_array = snmpwalk_cache_multi_oid($device, 'hwEntityCpuUsage', $processors_array, 'HUAWEI-ENTITY-EXTENT-MIB', '+'.$config['install_dir'].'/mibs');
-    $processors_array = snmpwalk_cache_multi_oid($device, 'hwEntityMemSize', $processors_array, 'HUAWEI-ENTITY-EXTENT-MIB', '+'.$config['install_dir'].'/mibs');
-    $processors_array = snmpwalk_cache_multi_oid($device, 'hwEntityBomEnDesc', $processors_array, 'HUAWEI-ENTITY-EXTENT-MIB', '+'.$config['install_dir'].'/mibs');
+    $processors_array = snmpwalk_cache_multi_oid($device, 'hwEntityCpuUsage', $processors_array, 'HUAWEI-ENTITY-EXTENT-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/huawei');
+    $processors_array = snmpwalk_cache_multi_oid($device, 'hwEntityMemSize', $processors_array, 'HUAWEI-ENTITY-EXTENT-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/huawei');
+    $processors_array = snmpwalk_cache_multi_oid($device, 'hwEntityBomEnDesc', $processors_array, 'HUAWEI-ENTITY-EXTENT-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/huawei');
     d_echo($processors_array);
 
     if (is_array($processors_array)) {
diff --git a/includes/polling/mempools/vrp.inc.php b/includes/polling/mempools/vrp.inc.php
index 5693a0e9a3..b434699778 100644
--- a/includes/polling/mempools/vrp.inc.php
+++ b/includes/polling/mempools/vrp.inc.php
@@ -8,8 +8,8 @@ if (!is_array($mempool_cache['vrp'])) {
     d_echo('caching');
 
     $mempool_cache['vrp'] = array();
-    $mempool_cache['vrp'] = snmpwalk_cache_multi_oid($device, 'hwEntityMemSize', $mempool_cache['vrp'], 'HUAWEI-ENTITY-EXTENT-MIB', $config['install_dir'].'/mibs');
-    $mempool_cache['vrp'] = snmpwalk_cache_multi_oid($device, 'hwEntityMemUsage', $mempool_cache['vrp'], 'HUAWEI-ENTITY-EXTENT-MIB', $config['install_dir'].'/mibs');
+    $mempool_cache['vrp'] = snmpwalk_cache_multi_oid($device, 'hwEntityMemSize', $mempool_cache['vrp'], 'HUAWEI-ENTITY-EXTENT-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/huawei');
+    $mempool_cache['vrp'] = snmpwalk_cache_multi_oid($device, 'hwEntityMemUsage', $mempool_cache['vrp'], 'HUAWEI-ENTITY-EXTENT-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/huawei');
     d_echo($mempool_cache);
 }