mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

newdevice: Improved HPE Procurve/OfficeConnect discovery (#5763)

Browse Source 
This is needed as some of this detection will break with new HPE firmwares.
This commit is contained in:
Tony Murray
2017-02-04 10:02:39 +00:00
committed by Neil Lathwood
parent 03f09118c1
commit a8dc640e96
14 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/definitions/procurve.yaml
+2 -10
View File
@@ -9,14 +9,6 @@ over:
mib_dir:
- hp
discovery:
- sysDescr:
- 'ProCurve'
- 'PROCURVE'
- 'HP 1820'
- sysDescr_regex:
- '/eCos-[0-9.]+/'
- '/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.
- .1.3.6.1.4.1.11.2.3.7.8.5.
- .1.3.6.1.4.1.11.2.3.7.11.
tests/OSDiscoveryTest.php
+6 -7
View File
@@ -1238,13 +1238,12 @@ 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');
$this->checkOS('procurve', 'procurve-2530');
$this->checkOS('procurve', 'procurve-2620');
$this->checkOS('procurve', 'procurve-5402r');
$this->checkOS('procurve', 'procurve-131');
$this->checkOS('procurve', 'procurve-151');
$this->checkOS('procurve', 'procurve-167-hp');
$this->checkOS('procurve', 'procurve-167-hpe');
$this->checkOS('procurve', 'procurve-50-procurve');
$this->checkOS('procurve', 'procurve-66');
}
public function testProxim()
tests/snmpsim/procurve-2620.snmprec → tests/snmpsim/procurve-131.snmprec
+1
View File
@@ -1 +1,2 @@
1.3.6.1.2.1.1.1.0|4|HP J9625A 2620-24-PoEP Switch, revision RA.16.02.0012, ROM RA.15.13 (/ws/swbuildm/rel_spokane_qaoff/code/build/xform(swbuildm_rel_spokane_qaoff_rel_spokane))
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11.2.3.7.11.131
tests/snmpsim/procurve-151.snmprec
+2
View File
@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|HP 1810-24G, PL.1.9, eCos-3.0, 1_12_8-customized-h
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11.2.3.7.11.151
tests/snmpsim/procurve-167-hp.snmprec
+2
View File
@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|HP 1820-8G Switch J9979A, PT.01.14, Linux 3.6.5-79c95a77, U-Boot 2012.10-00116-g3ab515c (Jul 30 2014 - 10:52:01)
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11.2.3.7.11.167
tests/snmpsim/procurve-167-hpe.snmprec
+2
View File
@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|HPE OfficeConnect Switch 1820 8G J9979A, PT.02.01, Linux 3.6.5-79c95a77, U-Boot 2012.10-00116-g3ab515c (Jul 30 2014 - 10:52:01)
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11.2.3.7.11.167
tests/snmpsim/procurve-1820.snmprec
-1
View File
@@ -1 +0,0 @@
1.3.6.1.2.1.1.1.0|4|HP 1820
tests/snmpsim/procurve-2530.snmprec
-1
View File
@@ -1 +0,0 @@
1.3.6.1.2.1.1.1.0|4|HP 2530 Something
tests/snmpsim/procurve-50-procurve.snmprec
+2
View File
@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|ProCurve J8697A Switch 5406zl, revision K.15.04.0007, ROM K.15.13 (/sw/code/build/btm(K_15_04))
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11.2.3.7.11.50
tests/snmpsim/procurve-5402r.snmprec
-1
View File
@@ -1 +0,0 @@
1.3.6.1.2.1.1.1.0|4|HP 5402R Something
tests/snmpsim/procurve-1800-8g.snmprec → tests/snmpsim/procurve-66.snmprec
View File
tests/snmpsim/procurve-ecos-100.snmprec
-1
View File
@@ -1 +0,0 @@
1.3.6.1.2.1.1.1.0|4|eCos-100
tests/snmpsim/procurve.snmprec
+2 -1
View File
@@ -1 +1,2 @@
1.3.6.1.2.1.1.1.0|4|ProCurve
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
tests/snmpsim/procurve1.snmprec
-2
View File
@@ -1,2 +0,0 @@
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