Remove FortiAP hardware table (and use FAPversion with regex) (librenms#18460)

* WIP: Remove fortiap hardware table

* FortiAP use fapVersion (and regex) for hardware

there is the name of hardware on version and also update test

Author: alagoutte

LibreNMS/OS/Fortiap.php

@@ -14,71 +14,19 @@
 
 namespace LibreNMS\OS;
 
-use App\Models\Device;
 use LibreNMS\Device\WirelessSensor;
-use LibreNMS\Interfaces\Discovery\OSDiscovery;
 use LibreNMS\Interfaces\Discovery\Sensors\WirelessClientsDiscovery;
 use LibreNMS\Interfaces\Discovery\Sensors\WirelessFrequencyDiscovery;
 use LibreNMS\Interfaces\Discovery\Sensors\WirelessPowerDiscovery;
 use LibreNMS\Interfaces\Polling\Sensors\WirelessFrequencyPolling;
 use LibreNMS\OS\Shared\Fortinet;
 
 class Fortiap extends Fortinet implements
-    OSDiscovery,
     WirelessClientsDiscovery,
     WirelessFrequencyDiscovery,
     WirelessFrequencyPolling,
     WirelessPowerDiscovery
 {
-    protected function getHardwareName()
-    {
-        $rewrite_fortiap_hardware = [
-            '.1.3.6.1.4.1.12356.120.10.23112' => 'FAP-231F',
-            '.1.3.6.1.4.1.12356.120.10.23412' => 'FAP-234F',
-            '.1.3.6.1.4.1.12356.120.10.23912' => 'FAP-23JF',
-            '.1.3.6.1.4.1.12356.120.10.43112' => 'FAP-431F',
-            '.1.3.6.1.4.1.12356.120.10.43212' => 'FAP-432F',
-            '.1.3.6.1.4.1.12356.120.10.43312' => 'FAP-433F',
-            '.1.3.6.1.4.1.12356.120.10.83112' => 'FAP-831F',
-            '.1.3.6.1.4.1.12356.120.10.22111' => 'FAP-221E',
-            '.1.3.6.1.4.1.12356.120.10.22211' => 'FAP-222E',
-            '.1.3.6.1.4.1.12356.120.10.22311' => 'FAP-223E',
-            '.1.3.6.1.4.1.12356.120.10.22411' => 'FAP-224E',
-            '.1.3.6.1.4.1.12356.120.10.23111' => 'FAP-231E',
-            '.1.3.6.1.4.1.12356.120.10.32111' => 'FAP-321E',
-            '.1.3.6.1.4.1.12356.120.10.42111' => 'FAP-421E',
-            '.1.3.6.1.4.1.12356.120.10.42311' => 'FAP-423E',
-            '.1.3.6.1.4.1.12356.120.10.22131' => 'FAP-S221E',
-            '.1.3.6.1.4.1.12356.120.10.22331' => 'FAP-S223E',
-            '.1.3.6.1.4.1.12356.120.10.42131' => 'FAP-S421E',
-            '.1.3.6.1.4.1.12356.120.10.42231' => 'FAP-S422E',
-            '.1.3.6.1.4.1.12356.120.10.42331' => 'FAP-S423E',
-            '.1.3.6.1.4.1.12356.120.10.24941' => 'FAP-C24JE',
-            '.1.3.6.1.4.1.12356.120.10.22121' => 'FAP-U221EV',
-            '.1.3.6.1.4.1.12356.120.10.22321' => 'FAP-U223EV',
-            '.1.3.6.1.4.1.12356.120.10.24921' => 'FAP-U24JEV',
-            '.1.3.6.1.4.1.12356.120.10.32121' => 'FAP-U321EV',
-            '.1.3.6.1.4.1.12356.120.10.32321' => 'FAP-U323EV',
-            '.1.3.6.1.4.1.12356.120.10.42121' => 'FAP-U421EV',
-            '.1.3.6.1.4.1.12356.120.10.42221' => 'FAP-U422EV',
-            '.1.3.6.1.4.1.12356.120.10.42321' => 'FAP-U423EV',
-            '.1.3.6.1.4.1.12356.120.10.23122' => 'FAP-U231F',
-            '.1.3.6.1.4.1.12356.120.10.23422' => 'FAP-U234F',
-            '.1.3.6.1.4.1.12356.120.10.43122' => 'FAP-U431F',
-            '.1.3.6.1.4.1.12356.120.10.43222' => 'FAP-U432F',
-            '.1.3.6.1.4.1.12356.120.10.43322' => 'FAP-U433F',
-        ];
-
-        return $rewrite_fortiap_hardware[$this->getDevice()->sysObjectID] ?? null;
-    }
-
-    public function discoverOS(Device $device): void
-    {
-        parent::discoverOS($device); // yaml
-
-        $device->hardware = $device->hardware ?: $this->getHardwareName();
-    }
-
     public function discoverWirelessClients()
     {
         $fapVapStaInfoCounts = snmpwalk_cache_oid($this->getDeviceArray(), 'fapVapStaInfoCount', [], 'FORTINET-FORTIAP-MIB');

resources/definitions/os_discovery/fortiap.yaml

@@ -3,6 +3,10 @@ modules:
     os:
         version: FORTINET-FORTIAP-MIB::fapVersion.0
         serial: FORTINET-FORTIAP-MIB::fapSerialNum.0
+        hardware: FORTINET-FORTIAP-MIB::fapVersion.0
+        hardware_regex: '/(?<hardware>FP\d+[A-Z])/i'
+        hardware_replace: 
+            -   ['/FP/', 'FortiAP ']
     mempools:
         data:
             -

tests/data/fortiap_fap231g.json

@@ -8,7 +8,7 @@
                     "sysDescr": "DE-HIDDEN-DMN-OFF-OP-AP02",
                     "sysContact": "<private>",
                     "version": "FP231G-v7.4-build0771",
-                    "hardware": null,
+                    "hardware": "FortiAP 231G",
                     "features": null,
                     "location": "<private>",
                     "os": "fortiap",

tests/data/fortiap_fap831f.json

@@ -8,7 +8,7 @@
                     "sysDescr": "<private>",
                     "sysContact": "<private>",
                     "version": "FP831F-v7.0-build0127",
-                    "hardware": "FAP-831F",
+                    "hardware": "FortiAP 831F",
                     "features": null,
                     "location": null,
                     "os": "fortiap",