From 3cd9b08d41773671d24e0be2bd4203382fa4bdce Mon Sep 17 00:00:00 2001 From: Neil Lathwood Date: Thu, 26 Jan 2017 02:37:09 +0000 Subject: [PATCH] newdevice: Added more detection for Procurve devices #5422 (#5607) --- includes/definitions/procurve.yaml | 2 ++ tests/OSDiscoveryTest.php | 1 + tests/snmpsim/procurve1.snmprec | 2 ++ 3 files changed, 5 insertions(+) create mode 100644 tests/snmpsim/procurve1.snmprec diff --git a/includes/definitions/procurve.yaml b/includes/definitions/procurve.yaml index b3c3616ffa..680281744d 100644 --- a/includes/definitions/procurve.yaml +++ b/includes/definitions/procurve.yaml @@ -18,3 +18,5 @@ discovery: - '/HP(.+)2530(.+)/' - '/HP(.+)54[0-1][2-6]R(.+)/' - '/^HP J96[0-9]{2}[A-B] [0-9]{4}(.*)/' + - sysObjectId: + - .1.3.6.1.4.1.11.2.3.7.8.5. \ No newline at end of file diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php index ecc4fcc03a..37df8492cf 100644 --- a/tests/OSDiscoveryTest.php +++ b/tests/OSDiscoveryTest.php @@ -1196,6 +1196,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase public function testProcurve() { $this->checkOS('procurve'); + $this->checkOS('procurve', 'procurve1'); $this->checkOS('procurve', 'procurve-1800-8g'); $this->checkOS('procurve', 'procurve-1820'); $this->checkOS('procurve', 'procurve-ecos-100'); diff --git a/tests/snmpsim/procurve1.snmprec b/tests/snmpsim/procurve1.snmprec new file mode 100644 index 0000000000..69998a3d74 --- /dev/null +++ b/tests/snmpsim/procurve1.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|HP Stack, revision KA.15.03.3004, ROM KA.15.05 (/sw/code/build/tam(KA_15_03)) +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11.2.3.7.8.5.2 \ No newline at end of file