newdevice: update zywall and zyxelnwa detection #5343

librenms · Jan 22, 2017 · f299692 · f299692
1 parent a0f5fe4
commit f299692
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/includes/definitions/zywall.yaml b/includes/definitions/zywall.yaml
@@ -6,7 +6,10 @@ over:
     - { graph: device_bits, text: Traffic }
 icon: zyxel
 discovery:
-    - sysObjectId:
-        - .1.3.6.1.4.1.890.1.6
-        - .1.3.6.1.4.1.890.1.15
+    -
+      sysObjectId:
+          - .1.3.6.1.4.1.890.1.6
+          - .1.3.6.1.4.1.890.1.15
+      sysDescr_regex:
+          - '/^ZyWALL/'
     - sysDescr_regex: '/^ZyWALL 2X/'
diff --git a/includes/definitions/zyxelnwa.yaml b/includes/definitions/zyxelnwa.yaml
@@ -4,5 +4,8 @@ group: zyxel
 type: network
 icon: zyxel
 discovery:
-    - sysDescr_regex:
-        - '/^NWA-/'
+    -
+      sysDescr_regex:
+          - '/^NWA/'
+      sysObjectId:
+          - '.1.3.6.1.4.1.890.1.15'
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
@@ -1538,5 +1538,6 @@ public function testZywall()
     public function testZyxelnwa()
     {
         $this->checkOS('zyxelnwa');
+        $this->checkOS('zyxelnwa', 'zyxelnwa1');
     }
 }
diff --git a/tests/snmpsim/zyxelnwa.snmprec b/tests/snmpsim/zyxelnwa.snmprec
@@ -1 +1,2 @@
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.890.1.15
 1.3.6.1.2.1.1.1.0|4|NWA-
diff --git a/tests/snmpsim/zyxelnwa1.snmprec b/tests/snmpsim/zyxelnwa1.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|NWA3560-N
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.890.1.15