newdevice: Improved Cisco Unified CM detection and renamed to ucos (#…

…6813)
librenms · Jun 19, 2017 · 2e43adc · 2e43adc
1 parent 283392c
commit 2e43adc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/includes/definitions/cucm.yaml → includes/definitions/ucos.yaml b/includes/definitions/cucm.yaml → includes/definitions/ucos.yaml
@@ -1,4 +1,4 @@
-os: cucm
+os: ucos
 text: 'Cisco Unified Communications Manager'
 type: collaboration
 icon: cisco
@@ -29,3 +29,5 @@ mib_dir:
 discovery:
     - sysObjectId:
         - .1.3.6.1.4.1.9.1.1348
+    - sysDescr:
+        - 'Software:UCOS'
diff --git a/includes/polling/os/cucm.inc.php → includes/polling/os/ucos.inc.php b/includes/polling/os/cucm.inc.php → includes/polling/os/ucos.inc.php
diff --git a/tests/snmpsim/cucm.snmprec → tests/snmpsim/ucos.snmprec b/tests/snmpsim/cucm.snmprec → tests/snmpsim/ucos.snmprec
diff --git a/tests/snmpsim/ucos_1.snmprec b/tests/snmpsim/ucos_1.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Hardware:VMware, 2 Intel(R) Xeon(R) CPU E7- 2860  @ 2.27GHz, 4096 MB Memory: Software:UCOS 4.0.0.0-40
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.99.1.1.3.28