Merge remote-tracking branch 'origin/dev' into dev

inexio · Jun 9, 2021 · e9d76ff · e9d76ff
2 parents 193dadf + ec5cd29
commit e9d76ff
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/config/device-classes/generic/timos.yaml b/config/device-classes/generic/timos.yaml
@@ -6,4 +6,29 @@ match:
       type: SysObjectID
       values:
         - ".1.3.6.1.4.1.6527"
-  logical_operator: OR
+  logical_operator: OR
+
+identify:
+  properties:
+    serial_number:
+      - detection: snmpget
+        oid: ".1.3.6.1.4.1.6527.3.1.2.2.1.8.1.5.1.50331649"
+    vendor:
+      - detection: constant
+        value: "Nokia"
+    os_version:
+      - detection: snmpget
+        oid: ".1.3.6.1.4.1.6527.3.1.2.2.1.8.1.21.1.134217729"
+        operators:
+          - type: modify
+            modify_method: regexSubmatch
+            regex: '^TiMOS-([^, ]+)'
+            format: "$1"
+    model:
+      - detection: snmpget
+        oid: ".1.3.6.1.4.1.6527.3.1.2.2.1.8.1.21.1.134217729"
+        operators:
+          - type: modify
+            modify_method: regexSubmatch
+            regex: '^(([^, ]+) ){3}([\D,\d]+) Copyright'
+            format: "$3"
diff --git a/config/device-classes/generic/timos/sas.yaml b/config/device-classes/generic/timos/sas.yaml
@@ -6,4 +6,23 @@ match:
       type: SysObjectID
       values:
         - ".1.3.6.1.4.1.6527.6.2"
-  logical_operator: OR
+  logical_operator: OR
+
+identify:
+  properties:
+    model:
+      - detection: snmpget
+        oid: ".1.3.6.1.4.1.6527.3.1.2.2.1.8.1.21.1.134217729"
+        operators:
+          - type: modify
+            modify_method: regexSubmatch
+            regex: '([\D,\d ])+ Nokia ([^, ]+) '
+            format: "$2"
+    model_series:
+      - detection: snmpget
+        oid: ".1.3.6.1.4.1.6527.3.1.2.2.1.8.1.21.1.134217729"
+        operators:
+          - type: modify
+            modify_method: regexSubmatch
+            regex: '([\D,\d ])+ ([^, ]+) Copyright'
+            format: "$2"