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: Organised Extremeware and XOS tests #5850 (#6096)

Browse Source 
* refactor: Organised Extremeware and XOS tests #5850

* updated as per comments from murrant
This commit is contained in:
Neil Lathwood
2017-03-11 04:27:23 +00:00
committed by Tony Murray
parent 1d80a0d2a6
commit 1395071aa4
7 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/definitions/extremeware.yaml
View File

@@ -8,5 +8,5 @@ over:
- { graph: device_processor, text: 'CPU Usage' }
- { graph: device_mempool, text: 'Memory Usage' }
discovery:
- sysObjectId:
- .1.3.6.1.4.1.1916.2
- sysObjectId_regex:
- '/^.1.3.6.1.4.1.1916.2.([1-5]?[0-9]|6[0-4])$/'

5
includes/definitions/xos.yaml
View File

@@ -2,12 +2,11 @@ os: xos
text: 'Extreme XOS'
type: network
ifname: 1
group: extremeware
icon: extreme
over:
- { graph: device_bits, text: 'Device Traffic' }
- { graph: device_processor, text: 'CPU Usage' }
- { graph: device_mempool, text: 'Memory Usage' }
discovery:
- sysDescr:
- XOS
- sysObjectId_regex:
- '/^.1.3.6.1.4.1.1916.2.(6[5-9]|[7-9][0-9]|[0-9]{3})$/'

34
includes/polling/os/extremeware.inc.php
View File

@@ -1,37 +1,19 @@
<?php
echo 'Doing Extreme: ';
// BD6808 - Version 7.8.3 (Build 5) by Release_Master 03/15/10 14:27:35
// Summit48 - Version 4.1.19 (Build 2) by Release_Master Wed 08/09/2000 6:09p
// Summit24e3 - Version 6.2e.1 (Build 20) by Release_Master_ABU Tue 05/27/2003 16:46:08
// Summit48 - 1720 Garry - Version 4.1.19 (Build 2) by Release_Master Wed 08/09/2000 6:09p
// Summit48(Yonetan) - Version 4.1.19 (Build 2) by Release_Master Wed 08/09/2000 6:09p
// Alpine3808 - Version 7.2.0 (Build 33) by Release_Master 07/09/04 14:05:12
if (!strpos($poll_device['sysDescr'], 'XOS')) {
echo " Extremeware \n";
list(, $datas) = explode(' - ', $poll_device['sysDescr']);
$datas = str_replace('(', '', $datas);
$datas = str_replace(')', '', $datas);
list($a,$b,$c,$d,$e,$f,$g,$h) = explode(' ', $datas);
if ($a == 'Version') {
$version = $b;
$features = $c.' '.$d.' '.$g;
}
} else {
// ExtremeXOS version 12.4.1.7 v1241b7 by release-manager on Sat Mar 13 02:36:57 EST 2010
// ExtremeWare XOS version 11.5.2.10 v1152b10 by release-manager on Thu Oct 26 09:53:04 PDT 2006
// ExtremeXOS (X670-48x) version 15.5.2.9 v1552b9-patch1-5 by release-manager on Thu Sep 11 13:03:04 EDT 2014
echo " XOS \n";
list($a,$b,$c,$d,$e,$f,$g,$h,$i,$j,$k,$l,$m,$n) = explode(' ', str_replace('ExtremeWare XOS', 'ExtremeXOS', $poll_device['sysDescr']));
if ($b == 'version') {
$version = $c;
$features = $d.' '.$i.' '.$j.' '.$m;
}
if ($c == 'version') {
$version = $d;
$features = $e.' '.$j.' '.$k.' '.$n;
}
echo " Extremeware \n";
list(, $datas) = explode(' - ', $poll_device['sysDescr']);
$datas = str_replace('(', '', $datas);
$datas = str_replace(')', '', $datas);
list($a,$b,$c,$d,$e,$f,$g,$h) = explode(' ', $datas);
if ($a == 'Version') {
$version = $b;
$features = $c.' '.$d.' '.$g;
}
$hardware = rewrite_extreme_hardware($poll_device['sysObjectID']);

25
includes/polling/os/xos.inc.php Normal file
View File

@@ -0,0 +1,25 @@
<?php
// ExtremeXOS version 12.4.1.7 v1241b7 by release-manager on Sat Mar 13 02:36:57 EST 2010
// ExtremeWare XOS version 11.5.2.10 v1152b10 by release-manager on Thu Oct 26 09:53:04 PDT 2006
// ExtremeXOS (X670-48x) version 15.5.2.9 v1552b9-patch1-5 by release-manager on Thu Sep 11 13:03:04 EDT 2014
echo " XOS \n";
list($a,$b,$c,$d,$e,$f,$g,$h,$i,$j,$k,$l,$m,$n) = explode(' ', str_replace('ExtremeWare XOS', 'ExtremeXOS', $poll_device['sysDescr']));
if ($b == 'version') {
$version = $c;
$features = $d.' '.$i.' '.$j.' '.$m;
}
if ($c == 'version') {
$version = $d;
$features = $e.' '.$j.' '.$k.' '.$n;
}
$hardware = rewrite_extreme_hardware($poll_device['sysObjectID']);
if ($hardware == $poll_device['sysObjectID']) {
unset($hardware);
}
$version = str_replace('"', '', $version);
$features = str_replace('"', '', $features);
$hardware = str_replace('"', '', $hardware);

1
tests/OSDiscoveryTest.php
View File

@@ -693,7 +693,6 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
public function testExtremeware()
{
$this->checkOS('extremeware');
}
public function testF5()

2
tests/snmpsim/extremeware.snmprec
View File

@@ -1,2 +0,0 @@
1.3.6.1.2.1.1.1.0|4|ExtremeXOS (X440-24p) version 15.5.1.6 v1551b6 by release-manager on Fri Apr 25 20:47:26 EDT 2014
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1916.2.175

3
tests/snmpsim/xos.snmprec
View File

@@ -1 +1,2 @@
1.3.6.1.2.1.1.1.0|4|XOS
1.3.6.1.2.1.1.1.0|4|ExtremeXOS (X440-24p) version 15.5.1.6 v1551b6 by release-manager on Fri Apr 25 20:47:26 EDT 2014
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.1916.2.175