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

New device:add code (#13842)

Browse Source 
* New device:add code
pre-requisite for updating other code paths
includes option to set display name
separate validation code from device creation

* remove duplicate community and v3 creds

* style fixes

* some lint fixes

* fix phpstan

* Exception cleanup
improved messages and translations

* port association mode to enum
well, pseudo enum

* defaults and cleanups

* fixed/improved validation messages

* fix tests

* fix stupid ide refactor mistake

* lint fixes
This commit is contained in:
Tony Murray
2022-03-12 16:14:32 -06:00
committed by GitHub
parent 6d3bf03074
commit 1bfd411995
27 changed files with 803 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Models/Device.php
View File

@@ -79,7 +79,7 @@ class Device extends BaseModel
// ---- Helper Functions ----
public static function findByHostname($hostname)
public static function findByHostname(string $hostname): ?Device
{
return static::where('hostname', $hostname)->first();
}
@@ -110,7 +110,7 @@ class Device extends BaseModel
return $overwrite_ip ?: $hostname;
}
public static function findByIp($ip)
public static function findByIp(?string $ip): ?Device
{
if (! IP::isValid($ip)) {
return null;
@@ -561,8 +561,8 @@ class Device extends BaseModel
return $query->whereIn(
$query->qualifyColumn('device_id'), function ($query) use ($deviceGroup) {
$query->select('device_id')
->from('device_group_device')
->where('device_group_id', $deviceGroup);
->from('device_group_device')
->where('device_group_id', $deviceGroup);
}
);
}
@@ -572,8 +572,8 @@ class Device extends BaseModel
return $query->whereNotIn(
$query->qualifyColumn('device_id'), function ($query) use ($deviceGroup) {
$query->select('device_id')
->from('device_group_device')
->where('device_group_id', $deviceGroup);
->from('device_group_device')
->where('device_group_id', $deviceGroup);
}
);
}
@@ -583,8 +583,8 @@ class Device extends BaseModel
return $query->whereIn(
$query->qualifyColumn('device_id'), function ($query) use ($serviceTemplate) {
$query->select('device_id')
->from('service_templates_device')
->where('service_template_id', $serviceTemplate);
->from('service_templates_device')
->where('service_template_id', $serviceTemplate);
}
);
}
@@ -594,8 +594,8 @@ class Device extends BaseModel
return $query->whereNotIn(
$query->qualifyColumn('device_id'), function ($query) use ($serviceTemplate) {
$query->select('device_id')
->from('service_templates_device')
->where('service_template_id', $serviceTemplate);
->from('service_templates_device')
->where('service_template_id', $serviceTemplate);
}
);
}