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

Rename concrete SnmpQuery class to avoid confusion (#13412)

Browse Source
This commit is contained in:
Tony Murray
2021-10-23 01:43:55 -05:00
committed by GitHub
parent 688ec422de
commit 5fafb11c8f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibreNMS/Data/Source/SnmpQuery.php → LibreNMS/Data/Source/NetSnmpQuery.php
View File

@@ -37,7 +37,7 @@ use LibreNMS\Util\Rewrite;
use Log;
use Symfony\Component\Process\Process;
class SnmpQuery implements SnmpQueryInterface
class NetSnmpQuery implements SnmpQueryInterface
{
/**
* @var array

6
app/Facades/FacadeAccessorSnmp.php
View File

@@ -26,15 +26,15 @@
namespace App\Facades;
use Illuminate\Support\Facades\Facade;
use LibreNMS\Data\Source\SnmpQuery;
use LibreNMS\Data\Source\NetSnmpQuery;
class FacadeAccessorSnmp extends Facade
{
protected static function getFacadeAccessor()
{
// always resolve a new instance
self::clearResolvedInstance(SnmpQuery::class);
self::clearResolvedInstance(NetSnmpQuery::class);
return SnmpQuery::class;
return NetSnmpQuery::class;
}
}

6
tests/Mocks/SnmpQueryMock.php
View File

@@ -29,7 +29,7 @@ use App\Models\Device;
use DeviceCache;
use Exception;
use Illuminate\Support\Str;
use LibreNMS\Data\Source\SnmpQuery;
use LibreNMS\Data\Source\NetSnmpQuery;
use LibreNMS\Data\Source\SnmpQueryInterface;
use LibreNMS\Data\Source\SnmpResponse;
use LibreNMS\Device\YamlDiscovery;
@@ -100,7 +100,7 @@ class SnmpQueryMock implements SnmpQueryInterface
$options[] = '-On';
}
return SnmpQuery::make()
return NetSnmpQuery::make()
->mibDir($this->mibDir)
->options($options)
->translate($oid, $mib);
@@ -286,7 +286,7 @@ class SnmpQueryMock implements SnmpQueryInterface
$options[] = "-m $mib";
}
$number = SnmpQuery::make()->mibDir($this->mibDir)
$number = NetSnmpQuery::make()->mibDir($this->mibDir)
->options(array_merge($options, $this->options))->numeric()->translate($oid)->value();
if (empty($number)) {

4
tests/OSDiscoveryTest.php
View File

@@ -28,7 +28,7 @@ namespace LibreNMS\Tests;
use App\Models\Device;
use Illuminate\Support\Str;
use LibreNMS\Config;
use LibreNMS\Data\Source\SnmpQuery;
use LibreNMS\Data\Source\NetSnmpQuery;
use LibreNMS\Modules\Core;
use LibreNMS\Tests\Mocks\SnmpQueryMock;
use LibreNMS\Util\Debug;
@@ -68,7 +68,7 @@ class OSDiscoveryTest extends TestCase
public function testOSDetection($os_name)
{
if (! getenv('SNMPSIM')) {
$this->app->bind(SnmpQuery::class, SnmpQueryMock::class);
$this->app->bind(NetSnmpQuery::class, SnmpQueryMock::class);
}
$glob = Config::get('install_dir') . "/tests/snmpsim/$os_name*.snmprec";