Skip to content

Commit

Permalink
device: Rebranding of Avaya BOSS and VOSS OS' (librenms#8469)
Browse files Browse the repository at this point in the history
* Update avaya-ers.yaml

Extreme bought avaya network assests so rebranding and moving some files.

* Add files via upload

Extreme bought avaya networking assets and so rebranding to Extreme and adding logos with OS for easier reading when on devices pages

* Update avaya-vsp.yaml

removing .1.3.6.1.4.1.45.3.79.1  This is a VSP 7024xl from avaya.  This is techincally not VOSS but BOSS operating system.  It should be in BOSS and avaya-ers.yaml

* Add files via upload

* Update and rename avaya-vsp.inc.php to extreme-voss.inc.php

* Update and rename avaya-vsp.inc.php to extreme-voss.inc.php

* Update and rename avaya-vsp.inc.php to extreme-voss.inc.php

* Update extreme-voss.inc.php

* Rename avaya-vsp.inc.php to extreme-voss.inc.php

* Rename avaya-vsp.inc.php to extreme-voss.inc.php

* Rename avaya-vsp.yaml to extreme-voss.yaml

* Update and rename avaya-vsp.yaml to extreme-voss.yaml

* Update avaya-ers.yaml

* Rename avaya-ers.yaml to extreme-boss.yaml

* Rename avaya-ers.inc.php to extreme-boss.inc.php

* Update and rename avaya-ers.inc.php to extreme-boss.inc.php

* Update and rename avaya-ers.inc.php to extreme-boss.inc.php

* Update and rename avaya-ers.inc.php to extreme-boss.inc.php

* Update and rename avaya-ers.inc.php to extreme-boss.inc.php

* Update and rename avaya-ers.inc.php to extreme-boss.inc.php

* Update extreme-boss.yaml

* Update extreme-voss.yaml

* Update and rename extreme-boss.yaml to boss.yaml

* Update extreme-voss.yaml

* Rename extreme-voss.yaml to voss.yaml

* Rename extreme-boss.inc.php to boss.inc.php

* Rename extreme-voss.inc.php to voss.inc.php

* Rename extreme-boss.inc.php to boss.inc.php

* Rename extreme-voss.inc.php to voss.inc.php

* Update and rename extreme-voss.inc.php to voss.inc.php

* Rename extreme-voss.yaml to voss.yaml

* Rename extreme-voss.inc.php to voss.inc.php

* Update and rename extreme-voss.inc.php to voss.inc.php

* Update and rename extreme-boss.inc.php to boss.inc.php

* Update and rename extreme-boss.inc.php to boss.inc.php

* Update and rename extreme-boss.inc.php to boss.inc.php

* Rename extreme-boss.inc.php to boss.inc.php

* Update voss.inc.php

* Update boss.inc.php

* Update boss.inc.php

* Update voss.inc.php

* Update voss.inc.php

* Update voss.inc.php

* Update voss.inc.php

* Update voss.inc.php

* Update voss.inc.php

* Update boss.inc.php

* Update boss.inc.php

* Update voss.inc.php

* Update boss.inc.php

* Update voss.inc.php

* Update voss.inc.php

* Rename avaya-vsp_8404c.snmprec to voss_8404c.snmprec

* Rename avaya-vsp_8404.snmprec to voss_8404.snmprec

* Rename avaya-vsp_8284xsq.snmprec to voss_8284xsq.snmprec

* Rename avaya-vsp_7254xtq.snmprec to voss_7254xtq.snmprec

* Rename avaya-vsp_7254xsq.snmprec to voss_7254xsq.snmprec

* Rename avaya-vsp_7024xls.snmprec to boss_7024xls.snmprec

* Rename avaya-vsp_4850gts.snmprec to voss_4850gts.snmprec

* Rename avaya-vsp_4850gts-pwr.snmprec to voss_4850gts-pwr.snmprec

* Rename avaya-vsp_4450gsx-pwr.snmprec to voss_4450gsx-pwr.snmprec

* Rename avaya-ers.snmprec to boss.snmprec

* Rename avaya-ers_1.snmprec to boss_1.snmprec

* Update and rename avaya-ers.json to boss.json

* Update and rename avaya-vsp_8404.json to voss_8404.json

* Update and rename avaya-vsp_8404c.json to voss_8404c.json

* Update and rename AvayaErs.php to Boss.php

* Update Boss.php

* Restore processor_type to avaya-ers in test data

* Update voss_8404c.json

* Update extremeboss.svg

* Update extremevoss.svg
  • Loading branch information
ospfbgp authored and laf committed Apr 21, 2018
1 parent 3500459 commit 9a420a6
Show file tree
Hide file tree
Showing 31 changed files with 32 additions and 29 deletions.
6 changes: 3 additions & 3 deletions LibreNMS/OS/AvayaErs.php → LibreNMS/OS/Boss.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* AvayaErs.php
* Boss.php
*
* -Description-
*
Expand Down Expand Up @@ -29,7 +29,7 @@
use LibreNMS\Interfaces\Discovery\ProcessorDiscovery;
use LibreNMS\OS;

class AvayaErs extends OS implements ProcessorDiscovery
class Boss extends OS implements ProcessorDiscovery
{
/**
* Discover processors.
Expand All @@ -45,7 +45,7 @@ public function discoverProcessors()
$count = 1;
foreach ($data as $index => $entry) {
$processors[] = Processor::discover(
$this->getName(),
"avaya-ers",
$this->getDeviceId(),
".1.3.6.1.4.1.45.1.6.3.8.1.1.6.$index",
zeropad($count),
Expand Down
1 change: 1 addition & 0 deletions html/images/os/extremeboss.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions html/images/os/extremevoss.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
os: avaya-ers
text: 'ERS Firmware'
os: boss
text: 'Extreme BOSS'
type: network
icon: avaya
icon: extremeboss
ifname: 1
mib_dir:
- nortel
Expand All @@ -13,3 +13,5 @@ discovery:
sysDescr:
- 'Ethernet Routing Switch'
- 'ERS'
- 'Virtual Services Platform 7024XLS'
- 'Virtual Services Platform 7024XT'
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
os: avaya-vsp
os: voss
text: 'Extreme VOSS'
type: network
icon: extreme
icon: extremevoss
mib_dir:
- nortel
over:
Expand All @@ -18,6 +18,5 @@ discovery:
- .1.3.6.1.4.1.2272.209
- .1.3.6.1.4.1.2272.210
- .1.3.6.1.4.1.2272.220
- .1.3.6.1.4.1.45.3.79.1
good_if:
- 'Virtual Services Platform'
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$OID = '.1.3.6.1.4.1.45.1.6.3.8.1.1.12';

if ($device['os'] == 'avaya-ers') {
if ($device['os'] == 'boss') {
$mem = snmp_walk($device, $OID, '-Osqn');

echo "$mem\n";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
* the source code distribution for details.
*/

// Avaya Memory for VSP with OS VOSS
// Extreme/Avaya Memory for VSP with OS VOSS
// rcKhiSlotMemUsed 1.3.6.1.4.1.2272.1.85.10.1.1.6.1
// rcKhiSlotMemFree 1.3.6.1.4.1.2272.1.85.10.1.1.7.1
// rcKhiSlotMemUtil 1.3.6.1.4.1.2272.1.85.10.1.1.8.1

if ($device['os'] == 'avaya-vsp') {
if ($device['os'] == 'voss') {
$memutil = trim(snmp_get($device, '.1.3.6.1.4.1.2272.1.85.10.1.1.8.1', '-OvQ'));
if (is_numeric($memutil)) {
discover_mempool($valid_mempool, $device, 0, 'avaya-vsp', 'VSP Memory', '1', null, null);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php
/**
* avaya-ers.inc.php
* boss.inc.php
*
* LibreNMS Fan and Power Supply state Discovery module for Avaya ERS
* LibreNMS Fan and Power Supply state Discovery module for Extreme/Avaya ERS
*/

if ($device['os'] === 'avaya-ers') {
if ($device['os'] === 'boss') {
$oid = snmpwalk_cache_oid($device, 's5ChasComTable', array(), 'S5-CHASSIS-MIB');
$cur_oid = '.1.3.6.1.4.1.45.1.6.3.3.1.1.10.';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* avaya-vsp.inc.php
* voss.inc.php
*
* LibreNMS Fan and Power Supply state Discovery module for Avaya
* LibreNMS Fan and Power Supply state Discovery module for Extreme/Avaya
* VOSS(VSP Operating System Software)
*
* Copyright (c) 2017 Daniel Cox <[email protected]>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
/**
* avaya-vsp.inc.php
* voss.inc.php
*
* LibreNMS Temperature Sensor Discovery module for Avaya VOSS(VSP Operating System Software)
* LibreNMS Temperature Sensor Discovery module for Extreme/Avaya VOSS(VSP Operating System Software)
*
* Copyright (c) 2017 Daniel Cox <[email protected]>
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

echo 'RC-VLAN-MIB VLANs: ';

if ($device['os'] == 'avaya-ers') {
if ($device['os'] == 'boss') {
$vtpdomain_id = '1';
$vlans = snmpwalk_cache_oid($device, 'rcVlanName', array(), 'RC-VLAN-MIB');
$tagoruntag = snmpwalk_cache_oid($device, 'rcVlanPortMembers', array(), 'RC-VLAN-MIB', null, '-OQUs --hexOutputLength=0');
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* the source code distribution for details.
*/

// Avaya VSP Memory w/ VOSS
// Extreme/Avaya VSP Memory w/ VOSS
// rcKhiSlotMemUsed 1.3.6.1.4.1.2272.1.85.10.1.1.6.1
// rcKhiSlotMemFree 1.3.6.1.4.1.2272.1.85.10.1.1.7.1
// rcKhiSlotMemUtil 1.3.6.1.4.1.2272.1.85.10.1.1.8.1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

echo 'Doing Nortel/Avaya ERS ';
echo 'Doing Extreme/Avaya/Nortel ERS ';

// Try multiple ways of getting firmware version
$version = snmp_get($device, 'SNMPv2-SMI::enterprises.2272.1.1.7.0', '-Oqvn');
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/data/avaya-vsp_8404.json → tests/data/voss_8404.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"hrDeviceIndex": "0",
"processor_oid": ".1.3.6.1.4.1.2272.1.85.10.1.1.3.1",
"processor_index": "1",
"processor_type": "avaya-vsp",
"processor_type": "voss",
"processor_usage": "88",
"processor_descr": "VSP Processor",
"processor_precision": "1",
Expand All @@ -17,4 +17,4 @@
},
"poller": "matches discovery"
}
}
}
10 changes: 5 additions & 5 deletions tests/data/avaya-vsp_8404c.json → tests/data/voss_8404c.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"hardware": "",
"features": null,
"location": null,
"os": "avaya-vsp",
"os": "voss",
"type": "network",
"serial": null,
"icon": "extreme.svg"
"icon": "extremevoss.svg"
}
]
},
Expand All @@ -29,10 +29,10 @@
"hardware": "VSP-8404C",
"features": null,
"location": "<private>",
"os": "avaya-vsp",
"os": "voss",
"type": "network",
"serial": "17JP2240CR05",
"icon": "extreme.svg"
"icon": "extremevoss.svg"
}
]
}
Expand Down Expand Up @@ -92,7 +92,7 @@
"ifOutUcastPkts_prev": null,
"ifOutUcastPkts_delta": null,
"ifOutUcastPkts_rate": null,
"ifInErrors": null,
"ifInErrors": null,extreme
"ifInErrors_prev": null,
"ifInErrors_delta": null,
"ifInErrors_rate": null,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 9a420a6

Please sign in to comment.