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

ports ifPhysAddress use MAC helper (#15478)

Browse Source 
* Ports min polled period of 1
Prevent divide by 0
Use Mac utility

* fix bad snmprec for airos-af-ltu

* Update a large amount of invalid mac addresses
either the script is capturing them wrong or users are mangling them

* More updated test data

* Update test data with bad input

* Fix ones using encoded <private> and attempt to fix capture

* Update awplus data

* restore missing data

* update other DNOS

* Fix ones using encoded <private> and attempt to fix capture

* Fix ones using encoded <private> and attempt to fix capture

* fix typo

* Update some data

* update data

* update ruijie
This commit is contained in:
Tony Murray
2023-10-19 13:10:52 -05:00
committed by GitHub
parent 7bd1a57c3e
commit f0aa80e73d
118 changed files with 3322 additions and 3252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
LibreNMS/Util/ModuleTestHelper.php
View File

@@ -147,11 +147,11 @@ class ModuleTestHelper
$snmp_options = ['-OUneb', '-Ih', '-m', '+' . $oid_data['mib']];
if ($oid_data['method'] == 'walk') {
$data = \SnmpQuery::options($snmp_options)->context($context)->mibDir($oid_data['mibdir'])->walk($oid_data['oid']);
$data = \SnmpQuery::options($snmp_options)->context($context)->mibDir($oid_data['mibdir'] ?? null)->walk($oid_data['oid']);
} elseif ($oid_data['method'] == 'get') {
$data = \SnmpQuery::options($snmp_options)->context($context)->mibDir($oid_data['mibdir'])->get($oid_data['oid']);
$data = \SnmpQuery::options($snmp_options)->context($context)->mibDir($oid_data['mibdir'] ?? null)->get($oid_data['oid']);
} elseif ($oid_data['method'] == 'getnext') {
$data = \SnmpQuery::options($snmp_options)->context($context)->mibDir($oid_data['mibdir'])->next($oid_data['oid']);
$data = \SnmpQuery::options($snmp_options)->context($context)->mibDir($oid_data['mibdir'] ?? null)->next($oid_data['oid']);
}
if (isset($data) && $data->isValid()) {
@@ -203,7 +203,7 @@ class ModuleTestHelper
];
foreach ($snmp_matches[0] as $index => $line) {
preg_match("/'-m' '\+?([a-zA-Z0-9:\-]+)'/", $line, $mib_matches);
$mib = $mib_matches[1];
$mib = $mib_matches[1] ?? null;
preg_match("/'-M' '\+?([a-zA-Z0-9:\-\/]+)'/", $line, $mibdir_matches);
$mibdir = $mibdir_matches[1];
$method = $snmp_matches[1][$index];
@@ -512,6 +512,19 @@ class ModuleTestHelper
$data[$oid] = implode('|', $parts);
}
}
// IF-MIB::ifPhysAddress, Make sure it is in hex format
foreach ($data as $oid => $oid_data) {
if (str_starts_with($oid, '1.3.6.1.2.1.2.2.1.6.')) {
$parts = explode('|', $oid_data, 3);
$mac = Mac::parse($parts[2])->hex();
if ($mac) {
$parts[2] = $mac;
$parts[1] = '4x';
$data[$oid] = implode('|', $parts);
}
}
}
}
/**