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 NetSnmp to SnmpQuery (#13344)

Browse Source 
* Rename NetSnmp to SnmpQuery
Always resolve a new instance.  It was not expected to be a singleton, set options persisted.
This means numeric() works properly now

* fix snmpfetch call and style

* Ability to set device from device array
This commit is contained in:
Tony Murray
2021-10-07 17:03:53 -05:00
committed by GitHub
parent 0d9cd86350
commit 4e94c1e0a1
7 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
LibreNMS/Data/Source/SnmpQuery.php
View File

@@ -114,6 +114,23 @@ class SnmpQuery
return $this;
}
/**
* Specify a device by a device array.
* The device will be fetched from the cache if it is loaded, otherwise, it will fill the array into a new Device
*/
public function deviceArray(array $device): SnmpQuery
{
if (isset($device['device_id']) && DeviceCache::has($device['device_id'])) {
$this->device = DeviceCache::get($device['device_id']);
return $this;
}
$this->device = new Device($device);
return $this;
}
/**
* Set a context for the snmp query
* This is most commonly used to fetch alternate sets of data, such as different VRFs
@@ -139,15 +156,9 @@ class SnmpQuery
/**
* Output all OIDs numerically
*/
public function numeric(bool $enabled = true): SnmpQuery
public function numeric(): SnmpQuery
{
if ($enabled) {
$this->options = array_merge($this->options, ['-On']);
return $this;
}
$this->options = array_diff($this->options, ['-On']);
$this->options = array_merge($this->options, ['-On']);
return $this;
}