From 2d3b2f2ca7d9a7cc2f7558ea907d5b50c9d6cc7a Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 4 Feb 2017 04:06:54 -0600 Subject: [PATCH] newdevice: improve Brocade Network OS detection (#5756) --- includes/definitions/nos.yaml | 8 +++----- tests/OSDiscoveryTest.php | 1 - tests/snmpsim/nos.snmprec | 3 ++- tests/snmpsim/nos1.snmprec | 3 ++- tests/snmpsim/nos2.snmprec | 3 ++- tests/snmpsim/nos3.snmprec | 2 -- 6 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 tests/snmpsim/nos3.snmprec diff --git a/includes/definitions/nos.yaml b/includes/definitions/nos.yaml index f572f556a4..6f6e4c98d5 100644 --- a/includes/definitions/nos.yaml +++ b/includes/definitions/nos.yaml @@ -8,8 +8,6 @@ over: - { graph: device_mempool, text: 'Memory Usage' } icon: brocade discovery: - - sysObjectId: .1.3.6.1.4.1.1588.2.2.1.1 - - sysDescr: - - 'Brocade VDX' - - 'BR-VDX' - - 'VDX67' + - sysObjectId: + - .1.3.6.1.4.1.1588.2.2. + - .1.3.6.1.4.1.1588.3.3. diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php index 3debb6bdd3..8ad2e31b90 100644 --- a/tests/OSDiscoveryTest.php +++ b/tests/OSDiscoveryTest.php @@ -1089,7 +1089,6 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase $this->checkOS('nos'); $this->checkOS('nos', 'nos1'); $this->checkOS('nos', 'nos2'); - $this->checkOS('nos', 'nos3'); } public function testNrg() diff --git a/tests/snmpsim/nos.snmprec b/tests/snmpsim/nos.snmprec index 839dd0ca70..d3c92051bd 100644 --- a/tests/snmpsim/nos.snmprec +++ b/tests/snmpsim/nos.snmprec @@ -1 +1,2 @@ -1.3.6.1.2.1.1.1.0|4|Brocade VDX +1.3.6.1.2.1.1.1.0|4|Brocade VDX6740 Switch (FABM1-PA3 FABM2-PA3), BR-VDX6740, Network Operating System Software Version 6.0.1a. +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1588.3.3.1.131 diff --git a/tests/snmpsim/nos1.snmprec b/tests/snmpsim/nos1.snmprec index 3d0476a652..57f74cb753 100644 --- a/tests/snmpsim/nos1.snmprec +++ b/tests/snmpsim/nos1.snmprec @@ -1 +1,2 @@ -1.3.6.1.2.1.1.1.0|4|BR-VDX +1.3.6.1.2.1.1.1.0|4|Brocade-11, BR-VDX6710-54, Network Operating System Software Version 4.1.3b. +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1588.2.2.1.1.1.5 diff --git a/tests/snmpsim/nos2.snmprec b/tests/snmpsim/nos2.snmprec index 466c006759..27a3451f8d 100644 --- a/tests/snmpsim/nos2.snmprec +++ b/tests/snmpsim/nos2.snmprec @@ -1 +1,2 @@ -1.3.6.1.2.1.1.1.0|4|VDX67 +1.3.6.1.2.1.1.1.0|4|Brocade-VDX-VCS 10 +1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.1588.2.2.1.1 diff --git a/tests/snmpsim/nos3.snmprec b/tests/snmpsim/nos3.snmprec deleted file mode 100644 index 0d45fad852..0000000000 --- a/tests/snmpsim/nos3.snmprec +++ /dev/null @@ -1,2 +0,0 @@ -1.3.6.1.2.1.1.1.0|4|Brocade-VDX-VCS 1 -1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.1588.2.2.1.1