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

refactor: move the rest of avaya os detection to yaml (#6426)

Browse Source 
Detection should be improved for these OS.
This commit is contained in:
Tony Murray
2017-04-15 02:10:15 -05:00
committed by Neil Lathwood
parent 54975f64d4
commit 8a8edb7d6d
9 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/definitions/avaya-ers.yaml
View File

@@ -6,3 +6,9 @@ mib_dir:
- nortel - nortel
over: over:
- { graph: device_bits, text: 'Device Traffic' } - { graph: device_bits, text: 'Device Traffic' }
discovery:
-
sysObjectId: .1.3.6.1.4.1.45.
sysDescr:
- 'Ethernet Routing Switch'
- 'ERS'

3
includes/definitions/avaya-ipo.yaml
View File

@@ -4,3 +4,6 @@ type: network
icon: avaya icon: avaya
mib_dir: mib_dir:
- nortel - nortel
discovery:
- sysObjectId:
- .1.3.6.1.4.1.6889.

1
includes/definitions/avaya-vsp.yaml
View File

@@ -17,3 +17,4 @@ discovery:
- .1.3.6.1.4.1.2272.208 - .1.3.6.1.4.1.2272.208
- .1.3.6.1.4.1.2272.209 - .1.3.6.1.4.1.2272.209
- .1.3.6.1.4.1.2272.210 - .1.3.6.1.4.1.2272.210
- .1.3.6.1.4.1.45.3.79.1

5
includes/discovery/os/avaya-ers.inc.php
View File

@@ -1,5 +0,0 @@
<?php
if (str_contains($sysDescr, array('Ethernet Routing Switch', 'ERS-')) && !starts_with($sysObjectId, '.1.3.6.1.4.1.674.10895.3000')) {
$os = 'avaya-ers';
}

5
includes/discovery/os/avaya-ipo.inc.php
View File

@@ -1,5 +0,0 @@
<?php
if (str_contains(snmp_get($device, 'ENTITY-MIB::entPhysicalDescr.1', '-Oqvn'), 'Avaya IP Office')) {
$os = "avaya-ipo";
}

2
tests/OSDiscoveryTest.php
View File

@@ -259,6 +259,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
public function testAvayaipo() public function testAvayaipo()
{ {
$this->checkOS('avaya-ipo'); $this->checkOS('avaya-ipo');
$this->checkOS('avaya-ipo', 'avaya-ipo-server');
} }
public function testAvayavsp() public function testAvayavsp()
@@ -270,6 +271,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
$this->checkOS('avaya-vsp', 'avaya-vsp-8404'); $this->checkOS('avaya-vsp', 'avaya-vsp-8404');
$this->checkOS('avaya-vsp', 'avaya-vsp-7254xsq'); $this->checkOS('avaya-vsp', 'avaya-vsp-7254xsq');
$this->checkOS('avaya-vsp', 'avaya-vsp-7254xtq'); $this->checkOS('avaya-vsp', 'avaya-vsp-7254xtq');
$this->checkOS('avaya-vsp', 'avaya-vsp-7024xls');
} }
public function testAvocent() public function testAvocent()

3
tests/snmpsim/avaya-ers1.snmprec
View File

@@ -1 +1,2 @@
1.3.6.1.2.1.1.1.0|4|ERS- 1.3.6.1.2.1.1.1.0|4|ERS 5510-24T
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.45.3.52.1

2
tests/snmpsim/avaya-ipo-server.snmprec Normal file
View File

@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|S-Edition Expansion (V2) 9.1.8.0 build 172
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6889.1.2.1.10.6

2
tests/snmpsim/avaya-vsp-7024xls.snmprec Normal file
View File

@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|Virtual Services Platform 7024XLS
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.45.3.79.1