Rebranding of Avaya BOSS and VOSS to Extreme

LibreNMS/OS/AvayaErs.php → LibreNMS/OS/Boss.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * AvayaErs.php
+ * Boss.php
  *
  * -Description-
  *
@@ -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.
@@ -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),

includes/definitions/avaya-ers.yaml → includes/definitions/boss.yaml

@@ -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
@@ -13,3 +13,5 @@ discovery:
       sysDescr:
           - 'Ethernet Routing Switch'
           - 'ERS'
+          - 'Virtual Services Platform 7024XLS'
+          - 'Virtual Services Platform 7024XT'

includes/definitions/avaya-vsp.yaml → includes/definitions/voss.yaml

@@ -1,7 +1,7 @@
-os: avaya-vsp
+os: voss
 text: 'Extreme VOSS'
 type: network
-icon: extreme
+icon: extremevoss
 mib_dir:
     - nortel
 over:
@@ -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'

includes/discovery/mempools/avaya-ers.inc.php → includes/discovery/mempools/boss.inc.php

@@ -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";

includes/discovery/mempools/avaya-vsp.inc.php → includes/discovery/mempools/voss.inc.php

@@ -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);

includes/discovery/sensors/state/avaya-ers.inc.php → includes/discovery/sensors/state/boss.inc.php

@@ -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.';
 

includes/discovery/sensors/state/avaya-vsp.inc.php → includes/discovery/sensors/state/voss.inc.php

@@ -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 <danielcoxman@gmail.com>

includes/discovery/sensors/temperature/avaya-vsp.inc.php → includes/discovery/sensors/temperature/voss.inc.php

@@ -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 <danielcoxman@gmail.com>
  *

includes/discovery/vlans/avaya-ers.inc.php → includes/discovery/vlans/boss.inc.php

@@ -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');

includes/polling/mempools/avaya-vsp.inc.php → includes/polling/mempools/voss.inc.php

@@ -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

includes/polling/os/avaya-ers.inc.php → includes/polling/os/boss.inc.php

@@ -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');

tests/data/avaya-vsp_8404.json → tests/data/voss_8404.json

@@ -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",
@@ -17,4 +17,4 @@
         },
         "poller": "matches discovery"
     }
-}
+}

tests/data/avaya-vsp_8404c.json → tests/data/voss_8404c.json

@@ -11,10 +11,10 @@
                     "hardware": "",
                     "features": null,
                     "location": null,
-                    "os": "avaya-vsp",
+                    "os": "voss",
                     "type": "network",
                     "serial": null,
-                    "icon": "extreme.svg"
+                    "icon": "extremevoss.svg"
                 }
             ]
         },
@@ -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"
                 }
             ]
         }
@@ -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,