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

Use CISCO-VRF-MIB for vrfs on non MPLS cisco devices (#8756)

Browse Source 
* Add vrf for non mpls cisco devices, add mib and test data

* Fix custom_where in vrf module

* Better VRF module test data collection

* Update ios_6500.json

* don't include ifVrf in ports

* update all ports add dependencies to pre-commit.php

* new json files
This commit is contained in:
vivia11
2018-05-25 23:27:54 -05:00
committed by Tony Murray
parent 216c554b7f
commit 94693b0d9e
42 changed files with 78651 additions and 1973 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreNMS/Util/ModuleTestHelper.php
+6 -6
View File
@@ -51,7 +51,7 @@ class ModuleTestHelper
// Definitions
// ignore these when dumping all modules
private $exclude_from_all = ['arp-table', 'fdb-table'];
private $module_deps = [
private static $module_deps = [
'arp-table' => ['ports', 'arp-table'],
'fdb-table' => ['ports', 'vlans', 'fdb-table'],
'vlans' => ['ports', 'vlans'],
@@ -70,7 +70,7 @@ class ModuleTestHelper
{
global $influxdb;
$this->modules = $this->resolveModuleDependencies((array)$modules);
$this->modules = self::resolveModuleDependencies((array)$modules);
$this->os = strtolower($os);
$this->variant = strtolower($variant);
@@ -251,7 +251,7 @@ class ModuleTestHelper
$os_list[$base_name] = [
$os,
$variant,
$valid_modules,
self::resolveModuleDependencies($valid_modules),
];
}
@@ -286,7 +286,7 @@ class ModuleTestHelper
* @return array
* @throws InvalidModuleException
*/
private function resolveModuleDependencies($modules)
private static function resolveModuleDependencies($modules)
{
// generate a full list of modules
$full_list = [];
@@ -296,8 +296,8 @@ class ModuleTestHelper
throw new InvalidModuleException("Invalid module name: $module");
}
if (isset($this->module_deps[$module])) {
$full_list = array_merge($full_list, $this->module_deps[$module]);
if (isset(self::$module_deps[$module])) {
$full_list = array_merge($full_list, self::$module_deps[$module]);
} else {
$full_list[] = $module;
}