From a8dc640e9621abe3f8f453b536e2ddda10845f21 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 4 Feb 2017 04:02:39 -0600 Subject: [PATCH] newdevice: Improved HPE Procurve/OfficeConnect discovery (#5763) This is needed as some of this detection will break with new HPE firmwares. --- includes/definitions/procurve.yaml | 12 ++---------- tests/OSDiscoveryTest.php | 13 ++++++------- .../{procurve-2620.snmprec => procurve-131.snmprec} | 1 + tests/snmpsim/procurve-151.snmprec | 2 ++ tests/snmpsim/procurve-167-hp.snmprec | 2 ++ tests/snmpsim/procurve-167-hpe.snmprec | 2 ++ tests/snmpsim/procurve-1820.snmprec | 1 - tests/snmpsim/procurve-2530.snmprec | 1 - tests/snmpsim/procurve-50-procurve.snmprec | 2 ++ tests/snmpsim/procurve-5402r.snmprec | 1 - ...procurve-1800-8g.snmprec => procurve-66.snmprec} | 0 tests/snmpsim/procurve-ecos-100.snmprec | 1 - tests/snmpsim/procurve.snmprec | 3 ++- tests/snmpsim/procurve1.snmprec | 2 -- 14 files changed, 19 insertions(+), 24 deletions(-) rename tests/snmpsim/{procurve-2620.snmprec => procurve-131.snmprec} (78%) create mode 100644 tests/snmpsim/procurve-151.snmprec create mode 100644 tests/snmpsim/procurve-167-hp.snmprec create mode 100644 tests/snmpsim/procurve-167-hpe.snmprec delete mode 100644 tests/snmpsim/procurve-1820.snmprec delete mode 100644 tests/snmpsim/procurve-2530.snmprec create mode 100644 tests/snmpsim/procurve-50-procurve.snmprec delete mode 100644 tests/snmpsim/procurve-5402r.snmprec rename tests/snmpsim/{procurve-1800-8g.snmprec => procurve-66.snmprec} (100%) delete mode 100644 tests/snmpsim/procurve-ecos-100.snmprec delete mode 100644 tests/snmpsim/procurve1.snmprec diff --git a/includes/definitions/procurve.yaml b/includes/definitions/procurve.yaml index 65bc80b3e3..c917862f87 100644 --- a/includes/definitions/procurve.yaml +++ b/includes/definitions/procurve.yaml @@ -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. \ No newline at end of file + - .1.3.6.1.4.1.11.2.3.7.8.5. + - .1.3.6.1.4.1.11.2.3.7.11. diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php index 4fe4f8e2f2..e5cae35dac 100644 --- a/tests/OSDiscoveryTest.php +++ b/tests/OSDiscoveryTest.php @@ -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() diff --git a/tests/snmpsim/procurve-2620.snmprec b/tests/snmpsim/procurve-131.snmprec similarity index 78% rename from tests/snmpsim/procurve-2620.snmprec rename to tests/snmpsim/procurve-131.snmprec index c87543f52d..d19f371c9b 100644 --- a/tests/snmpsim/procurve-2620.snmprec +++ b/tests/snmpsim/procurve-131.snmprec @@ -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 diff --git a/tests/snmpsim/procurve-151.snmprec b/tests/snmpsim/procurve-151.snmprec new file mode 100644 index 0000000000..9c0132c466 --- /dev/null +++ b/tests/snmpsim/procurve-151.snmprec @@ -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 diff --git a/tests/snmpsim/procurve-167-hp.snmprec b/tests/snmpsim/procurve-167-hp.snmprec new file mode 100644 index 0000000000..b3e842406e --- /dev/null +++ b/tests/snmpsim/procurve-167-hp.snmprec @@ -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 diff --git a/tests/snmpsim/procurve-167-hpe.snmprec b/tests/snmpsim/procurve-167-hpe.snmprec new file mode 100644 index 0000000000..a32cf225e3 --- /dev/null +++ b/tests/snmpsim/procurve-167-hpe.snmprec @@ -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 diff --git a/tests/snmpsim/procurve-1820.snmprec b/tests/snmpsim/procurve-1820.snmprec deleted file mode 100644 index af2e6138d6..0000000000 --- a/tests/snmpsim/procurve-1820.snmprec +++ /dev/null @@ -1 +0,0 @@ -1.3.6.1.2.1.1.1.0|4|HP 1820 diff --git a/tests/snmpsim/procurve-2530.snmprec b/tests/snmpsim/procurve-2530.snmprec deleted file mode 100644 index f7397fecc0..0000000000 --- a/tests/snmpsim/procurve-2530.snmprec +++ /dev/null @@ -1 +0,0 @@ -1.3.6.1.2.1.1.1.0|4|HP 2530 Something diff --git a/tests/snmpsim/procurve-50-procurve.snmprec b/tests/snmpsim/procurve-50-procurve.snmprec new file mode 100644 index 0000000000..ac553a29a6 --- /dev/null +++ b/tests/snmpsim/procurve-50-procurve.snmprec @@ -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 diff --git a/tests/snmpsim/procurve-5402r.snmprec b/tests/snmpsim/procurve-5402r.snmprec deleted file mode 100644 index a0a7cfa6ac..0000000000 --- a/tests/snmpsim/procurve-5402r.snmprec +++ /dev/null @@ -1 +0,0 @@ -1.3.6.1.2.1.1.1.0|4|HP 5402R Something diff --git a/tests/snmpsim/procurve-1800-8g.snmprec b/tests/snmpsim/procurve-66.snmprec similarity index 100% rename from tests/snmpsim/procurve-1800-8g.snmprec rename to tests/snmpsim/procurve-66.snmprec diff --git a/tests/snmpsim/procurve-ecos-100.snmprec b/tests/snmpsim/procurve-ecos-100.snmprec deleted file mode 100644 index a18d324e77..0000000000 --- a/tests/snmpsim/procurve-ecos-100.snmprec +++ /dev/null @@ -1 +0,0 @@ -1.3.6.1.2.1.1.1.0|4|eCos-100 diff --git a/tests/snmpsim/procurve.snmprec b/tests/snmpsim/procurve.snmprec index b756a961cf..a47f5856c5 100644 --- a/tests/snmpsim/procurve.snmprec +++ b/tests/snmpsim/procurve.snmprec @@ -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 diff --git a/tests/snmpsim/procurve1.snmprec b/tests/snmpsim/procurve1.snmprec deleted file mode 100644 index 69998a3d74..0000000000 --- a/tests/snmpsim/procurve1.snmprec +++ /dev/null @@ -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 \ No newline at end of file