From 2e43adce375060bd207fa5b4a71fb0189e8f28cf Mon Sep 17 00:00:00 2001 From: Neil Lathwood Date: Mon, 19 Jun 2017 02:56:31 +0100 Subject: [PATCH] newdevice: Improved Cisco Unified CM detection and renamed to ucos (#6813) --- includes/definitions/{cucm.yaml => ucos.yaml} | 4 +++- includes/polling/os/{cucm.inc.php => ucos.inc.php} | 0 tests/snmpsim/{cucm.snmprec => ucos.snmprec} | 0 tests/snmpsim/ucos_1.snmprec | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) rename includes/definitions/{cucm.yaml => ucos.yaml} (93%) rename includes/polling/os/{cucm.inc.php => ucos.inc.php} (100%) rename tests/snmpsim/{cucm.snmprec => ucos.snmprec} (100%) create mode 100644 tests/snmpsim/ucos_1.snmprec diff --git a/includes/definitions/cucm.yaml b/includes/definitions/ucos.yaml similarity index 93% rename from includes/definitions/cucm.yaml rename to includes/definitions/ucos.yaml index 3f536e7e87..cc4d2212fd 100644 --- a/includes/definitions/cucm.yaml +++ b/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' \ No newline at end of file diff --git a/includes/polling/os/cucm.inc.php b/includes/polling/os/ucos.inc.php similarity index 100% rename from includes/polling/os/cucm.inc.php rename to includes/polling/os/ucos.inc.php diff --git a/tests/snmpsim/cucm.snmprec b/tests/snmpsim/ucos.snmprec similarity index 100% rename from tests/snmpsim/cucm.snmprec rename to tests/snmpsim/ucos.snmprec diff --git a/tests/snmpsim/ucos_1.snmprec b/tests/snmpsim/ucos_1.snmprec new file mode 100644 index 0000000000..f831c5882b --- /dev/null +++ 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 \ No newline at end of file