mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Set mibs explicitly in SnmpQuery (#15199)
* Set mibs explicitly in SnmpQuery Always override system mibs, so we have consistency New method to control mibs * Lint fixes
This commit is contained in:
@@ -35,10 +35,10 @@ class SnmpTranslateTest extends TestCase
|
||||
$actual = \SnmpQuery::numeric()->translate('IF-MIB::ifTable');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('ifTable', 'IF-MIB');
|
||||
$actual = \SnmpQuery::numeric()->mibs(['IF-MIB'], append: false)->translate('ifTable');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('ifTable', 'ALL');
|
||||
$actual = \SnmpQuery::numeric()->mibs(['ALL'], append: false)->translate('ifTable');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('IF-MIB::ifTable');
|
||||
@@ -47,29 +47,29 @@ class SnmpTranslateTest extends TestCase
|
||||
$actual = \SnmpQuery::numeric()->translate('.1.3.6.1.2.1.2.2');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('.1.3.6.1.2.1.2.2', 'IF-MIB');
|
||||
$actual = \SnmpQuery::mibs(['IF-MIB'])->translate('.1.3.6.1.2.1.2.2');
|
||||
$this->assertEquals('IF-MIB::ifTable', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('1.3.6.1.2.1.2.2');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('.1.3.6.1.2.1.2.2', 'ALL');
|
||||
$actual = \SnmpQuery::mibs(['ALL'], append: false)->translate('.1.3.6.1.2.1.2.2');
|
||||
$this->assertEquals('RFC1213-MIB::ifTable', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('ifTable', 'IP-MIB');
|
||||
$actual = \SnmpQuery::numeric()->mibs(['IP-MIB'])->translate('ifTable');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('ifTable', 'IP-MIB');
|
||||
$actual = \SnmpQuery::mibs(['IP-MIB'])->translate('ifTable');
|
||||
$this->assertEquals('IF-MIB::ifTable', $actual);
|
||||
|
||||
// with index
|
||||
$actual = \SnmpQuery::numeric()->translate('IF-MIB::ifTable.0');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2.0', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('ifTable.0', 'IF-MIB');
|
||||
$actual = \SnmpQuery::numeric()->mibs(['IF-MIB'])->translate('ifTable.0');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2.0', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('ifTable.0', 'ALL');
|
||||
$actual = \SnmpQuery::numeric()->mibs(['ALL'], append: false)->translate('ifTable.0');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2.0', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('IF-MIB::ifTable.0');
|
||||
@@ -78,66 +78,72 @@ class SnmpTranslateTest extends TestCase
|
||||
$actual = \SnmpQuery::numeric()->translate('.1.3.6.1.2.1.2.2.0');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2.0', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('.1.3.6.1.2.1.2.2.0', 'IF-MIB');
|
||||
$actual = \SnmpQuery::mibs(['IF-MIB'])->translate('.1.3.6.1.2.1.2.2.0');
|
||||
$this->assertEquals('IF-MIB::ifTable.0', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('1.3.6.1.2.1.2.2.0');
|
||||
$this->assertEquals('.1.3.6.1.2.1.2.2.0', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('.1.3.6.1.2.1.2.2.0', 'ALL');
|
||||
$actual = \SnmpQuery::mibs(['ALL'], append: false)->translate('.1.3.6.1.2.1.2.2.0');
|
||||
$this->assertEquals('RFC1213-MIB::ifTable.0', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('ifTable.0', 'IP-MIB');
|
||||
$actual = \SnmpQuery::mibs(['IP-MIB'])->translate('ifTable.0');
|
||||
$this->assertEquals('IF-MIB::ifTable.0', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('iso.3.6.1.2.1.1.1.0', 'SNMPv2-MIB');
|
||||
$actual = \SnmpQuery::mibs(['SNMPv2-MIB'])->translate('iso.3.6.1.2.1.1.1.0');
|
||||
$this->assertEquals('SNMPv2-MIB::sysDescr.0', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('iso.3.6.1.2.1.1.1.0', 'SNMPv2-MIB');
|
||||
$actual = \SnmpQuery::numeric()->mibs(['SNMPv2-MIB'])->translate('iso.3.6.1.2.1.1.1.0');
|
||||
$this->assertEquals('.1.3.6.1.2.1.1.1.0', $actual);
|
||||
}
|
||||
|
||||
public function testFailedInput(): void
|
||||
{
|
||||
$actual = \SnmpQuery::numeric()->translate('ifTable');
|
||||
$this->assertEquals('', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('ifTable');
|
||||
$this->assertEquals('IF-MIB::ifTable', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->mibs([], append: false)->translate('ifTable');
|
||||
$this->assertEquals('', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('ifTable', 'ASDF-MIB:SNMPv2-MIB');
|
||||
$actual = \SnmpQuery::mibs([], append: false)->translate('ifTable');
|
||||
$this->assertEquals('', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('ifTable');
|
||||
$actual = \SnmpQuery::numeric()->mibs(['ASDF-MIB', 'SNMPv2-MIB'], append: false)->translate('ifTable');
|
||||
$this->assertEquals('', $actual);
|
||||
|
||||
$actual = \SnmpQuery::numeric()->translate('ifTable');
|
||||
$actual = \SnmpQuery::mibs([], append: false)->translate('ifTable');
|
||||
$this->assertEquals('', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('ifTable');
|
||||
$actual = \SnmpQuery::numeric()->mibs([], append: false)->translate('ifTable');
|
||||
$this->assertEquals('', $actual);
|
||||
|
||||
$actual = \SnmpQuery::mibs([], append: false)->translate('ifTable');
|
||||
$this->assertEquals('', $actual);
|
||||
}
|
||||
|
||||
public function testComplexInput(): void
|
||||
{
|
||||
$actual = \SnmpQuery::translate('.1.3.6.1.2.1.2.2', 'RFC1213-MIB:IF-MIB');
|
||||
$actual = \SnmpQuery::mibs(['RFC1213-MIB', 'IF-MIB'], append: false)->translate('.1.3.6.1.2.1.2.2');
|
||||
$this->assertEquals('RFC1213-MIB::ifTable', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('.1.3.6.1.2.1.2.2', 'IF-MIB:RFC1213-MIB');
|
||||
$actual = \SnmpQuery::mibs(['IF-MIB', 'RFC1213-MIB'], append: false)->translate('.1.3.6.1.2.1.2.2');
|
||||
$this->assertEquals('IF-MIB::ifTable', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('ifTable', 'RFC1213-MIB:IF-MIB');
|
||||
$actual = \SnmpQuery::translate('ifTable');
|
||||
$this->assertEquals('IF-MIB::ifTable', $actual);
|
||||
|
||||
$actual = \SnmpQuery::mibs(['RFC1213-MIB', 'IF-MIB'], append: false)->translate('ifTable');
|
||||
$this->assertEquals('RFC1213-MIB::ifTable', $actual);
|
||||
|
||||
$actual = \SnmpQuery::translate('ifTable', 'IF-MIB:RFC1213-MIB');
|
||||
$actual = \SnmpQuery::mibs(['IF-MIB', 'RFC1213-MIB'], append: false)->translate('ifTable');
|
||||
$this->assertEquals('IF-MIB::ifTable', $actual);
|
||||
|
||||
// partial numeric
|
||||
$device = Device::factory()->make(['os' => 'dlink']);
|
||||
$actual = \SnmpQuery::device($device)->numeric()->translate('.1.3.6.1.4.1.171.14.5.1.4.1.4.1.dram', 'EQUIPMENT-MIB:DLINKSW-ENTITY-EXT-MIB');
|
||||
$actual = \SnmpQuery::device($device)->numeric()->mibs(['EQUIPMENT-MIB', 'DLINKSW-ENTITY-EXT-MIB'], append: false)->translate('.1.3.6.1.4.1.171.14.5.1.4.1.4.1.dram');
|
||||
$this->assertEquals('.1.3.6.1.4.1.171.14.5.1.4.1.4.1.1', $actual);
|
||||
|
||||
$actual = \SnmpQuery::device($device)->numeric()->translate('iso.3.6.1.4.1.171.14.5.1.4.1.4.1.dram', 'EQUIPMENT-MIB:DLINKSW-ENTITY-EXT-MIB');
|
||||
$actual = \SnmpQuery::device($device)->numeric()->mibs(['EQUIPMENT-MIB', 'DLINKSW-ENTITY-EXT-MIB'], append: false)->translate('iso.3.6.1.4.1.171.14.5.1.4.1.4.1.dram');
|
||||
$this->assertEquals('.1.3.6.1.4.1.171.14.5.1.4.1.4.1.1', $actual);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user