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

Merge pull request #4499 from murrant/fix-swos

Browse Source 
fix: swos os discovery fixes #3593
This commit is contained in:
Neil Lathwood
2016-09-20 14:28:09 +01:00
committed by GitHub
parent 7ad946f85d a7e9976f8f
commit c16b6e6674
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/discovery/os/swos.inc.php
View File

@@ -1,9 +1,7 @@
<?php <?php
if (!$os) { if (str_contains($sysDescr, array('RB260GS', 'RB250GS', 'RB260GSP'))) {
if (strstr(snmp_get($device, 'SNMPv2-MIB::sysName.0', '-Oqv', ''), 'MikroTik')) { if (str_contains(snmp_get($device, 'SNMPv2-MIB::sysName.0', '-Oqv', ''), 'MicroTik')) {
if (strstr(snmp_get($device, 'SNMPv2-MIB::sysDescr.0', '-Oqv', ''), 'RB260GS')) { $os = 'swos';
$os = 'swos';
}
} }
} }

10
tests/OSDiscoveryTest.php
View File

@@ -202,6 +202,16 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
$this->checkOS('sophos', 'Linux g63c0044'); $this->checkOS('sophos', 'Linux g63c0044');
} }
public function testSwos()
{
$mockSnmp = array(
'SNMPv2-MIB::sysName.0' => 'MicroTik'
);
$this->checkOS('swos', 'RB250GS', '', $mockSnmp);
$this->checkOS('swos', 'RB260GS', '', $mockSnmp);
$this->checkOS('swos', 'RB260GSP', '', $mockSnmp);
}
public function testUnifi() public function testUnifi()
{ {
$mockSnmp = array( $mockSnmp = array(