From 4caa73089ddf30c6f580c260a6696d5e2ffcf3e2 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sun, 31 May 2020 10:18:54 -0500 Subject: [PATCH] Set primary device in module test helper (#11749) * Set primary device in module test helper * unneeded one --- LibreNMS/Util/ModuleTestHelper.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/LibreNMS/Util/ModuleTestHelper.php b/LibreNMS/Util/ModuleTestHelper.php index 27ea1e6158..1480201f5d 100644 --- a/LibreNMS/Util/ModuleTestHelper.php +++ b/LibreNMS/Util/ModuleTestHelper.php @@ -25,7 +25,7 @@ namespace LibreNMS\Util; -use App\Facades\DeviceCache; +use DeviceCache; use Illuminate\Support\Str; use LibreNMS\Config; use LibreNMS\Exceptions\FileNotFoundException; @@ -145,6 +145,7 @@ class ModuleTestHelper $snmp_oids = $this->collectOids($device_id); $device = device_by_id_cache($device_id, true); + DeviceCache::setPrimary($device_id); $snmprec_data = []; foreach ($snmp_oids as $oid_data) { @@ -174,6 +175,7 @@ class ModuleTestHelper global $debug, $vdebug, $device; $device = device_by_id_cache($device_id); + DeviceCache::setPrimary($device_id); // Run discovery ob_start(); @@ -520,7 +522,6 @@ class ModuleTestHelper try { Config::set('snmp.community', [$this->file_name]); $device_id = addHost($snmpsim->getIp(), 'v2c', $snmpsim->getPort()); - DeviceCache::setPrimary($device_id); // disable to block normal pollers dbUpdate(['disabled' => 1], 'devices', 'device_id=?', [$device_id]); @@ -533,6 +534,7 @@ class ModuleTestHelper // Populate the device variable $device = device_by_id_cache($device_id, true); + DeviceCache::setPrimary($device_id); $data = []; // array to hold dumped data