device: Improved detection for dlink and dlinkap devices (#8447)

includes/definitions/dlink.yaml

@@ -4,12 +4,11 @@ type: network
 icon: dlink
 ifname: 1
 discovery:
-    - sysDescr:
+    -
-        - 'D-Link DES-'
+        sysObjectID_except:
-        - 'Dlink DES-'
+            - .1.3.6.1.4.1.171.10.37.
-    - sysDescr_regex:
+        sysObjectID:
-        - '/^DES-/'
+            - .1.3.6.1.4.1.171.10.
-        - '/^DGS-/'
 good_if:
     - po
     - vlan

includes/definitions/dlinkap.yaml

@@ -3,7 +3,5 @@ text: 'D-Link Access Point'
 type: wireless
 icon: dlink
 discovery:
-    - sysDescr:
+    - sysObjectID:
-        - 'D-Link DAP-'
+        - .1.3.6.1.4.1.171.10.37.
-        - 'D-Link Access Point'
-    - sysDescr_regex: '/D-Link .* AP/'

tests/data/dlink.json

@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.171.10.153.7.1",
+                    "sysDescr": "WS6-DGS-1210-52/F1 6.10.007",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "dlink",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "dlink.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.171.10.153.7.1",
+                    "sysDescr": "WS6-DGS-1210-52/F1 6.10.007",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "WS6-DGS-1210-52/F1 Rev. ",
+                    "features": null,
+                    "location": null,
+                    "os": "dlink",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "dlink.svg"
+                }
+            ]
+        }
+    }
+}

tests/data/dlink_dgs-1210-52mp.json

@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.171.10.153.10.1",
+                    "sysDescr": "WS6-DGS-1210-52MP/F1 6.10.007",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "dlink",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "dlink.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "",
+                    "sysObjectID": ".1.3.6.1.4.1.171.10.153.10.1",
+                    "sysDescr": "WS6-DGS-1210-52MP/F1 6.10.007",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "WS6-DGS-1210-52MP/F1 Rev. ",
+                    "features": null,
+                    "location": null,
+                    "os": "dlink",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "dlink.svg"
+                }
+            ]
+        }
+    }
+}

tests/snmpsim/dlink.snmprec

@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|WS6-DGS-1210-52/F1 6.10.007
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.153.7.1

tests/snmpsim/dlink_des1.snmprec

@@ -1 +1,2 @@
 1.3.6.1.2.1.1.1.0|4|Dlink DES-
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.63.10

tests/snmpsim/dlink_dgs-1210-52mp.snmprec

@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|WS6-DGS-1210-52MP/F1 6.10.007
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.153.10.1

tests/snmpsim/dlink_dgs.snmprec

@@ -1,2 +1,2 @@
 1.3.6.1.2.1.1.1.0|4|DGS-1100-18 Gigabit Ethernet Switch
-1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.171
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.134.1

tests/snmpsim/dlinkap_2.snmprec

@@ -1 +1,2 @@
 1.3.6.1.2.1.1.1.0|4|D-Link Access Point
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.171.10.37.30