Added feature to enable os Discovery for Brocade NOS V4.X and below. #5158

Merged
merged 4 commits into from Dec 14, 2016

Projects

None yet

4 participants

@mattschwen
Contributor

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

@mattschwen mattschwen Added feature to enable os Discovery for Brocade NOS V4.X and below.
353bf46
@mattschwen mattschwen Added unit test for Brocade NOS v4.X os discovery.
93c802f
tests/OSDiscoveryTest.php
@@ -962,6 +962,7 @@ public function testNos()
$this->checkOS('nos');
$this->checkOS('nos', 'nos1');
$this->checkOS('nos', 'nos2');
+ $this->checkOS('nos', 'nos3');
@laf
laf Dec 12, 2016 Member

Sounds petty but this needs to be lined up :)

includes/discovery/os/nos.inc.php
@@ -1,5 +1,13 @@
<?php
+$fabos_objectid = array(
@laf
laf Dec 12, 2016 Member

Out of interest why is this called fabos?

@mattschwen
mattschwen Dec 13, 2016 Contributor

Good find, I modified this from my initial thought that this was FABOS when it turned out to be NOS.

@laf laf added the New-Device label Dec 12, 2016
@mattschwen mattschwen Adjustments to added feature as noted by LAF
f9756c9
tests/snmpsim/nos3.snmprec
@@ -0,0 +1,2 @@
+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.9.1.1588
@laf
laf Dec 14, 2016 Member

The php unit tests are failing because this isn't matching. You are looking for .1.3.6.1.4.1.1588.2.2.1.1 but providing 1.3.6.1.4.1.9.1.1588 so this test fails.

@mattschwen mattschwen Fixed php unit test to provide correct oid
af22002
@scrutinizer-notifier

The inspection completed: No new issues

@laf laf merged commit de87fc8 into librenms:master Dec 14, 2016

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@mattschwen
Contributor

Thank you for having patients with me!

@mattschwen mattschwen deleted the mattschwen:brocadeNOS branch Dec 14, 2016
@laf
Member
laf commented Dec 14, 2016

Thanks for the work :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment