Use LLDP in Layer3::Aruba, for switches.

This commit is contained in:
Bill Fenner
2013-10-17 07:35:13 -07:00
parent 074f2e7c8f
commit 9b1c439e15

View File

@@ -33,8 +33,9 @@ package SNMP::Info::Layer3::Aruba;
use strict; use strict;
use Exporter; use Exporter;
use SNMP::Info::Layer3; use SNMP::Info::Layer3;
use SNMP::Info::LLDP;
@SNMP::Info::Layer3::Aruba::ISA = qw/SNMP::Info::Layer3 Exporter/; @SNMP::Info::Layer3::Aruba::ISA = qw/SNMP::Info::LLDP SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Aruba::EXPORT_OK = qw//; @SNMP::Info::Layer3::Aruba::EXPORT_OK = qw//;
use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
@@ -43,6 +44,7 @@ $VERSION = '3.07';
%MIBS = ( %MIBS = (
%SNMP::Info::Layer3::MIBS, %SNMP::Info::Layer3::MIBS,
%SNMP::Info::LLDP::MIBS,
'WLSR-AP-MIB' => 'wlsrHideSSID', 'WLSR-AP-MIB' => 'wlsrHideSSID',
'WLSX-IFEXT-MIB' => 'ifExtVlanName', 'WLSX-IFEXT-MIB' => 'ifExtVlanName',
'WLSX-SWITCH-MIB' => 'wlsxHostname', 'WLSX-SWITCH-MIB' => 'wlsxHostname',
@@ -55,6 +57,7 @@ $VERSION = '3.07';
%GLOBALS = ( %GLOBALS = (
%SNMP::Info::Layer3::GLOBALS, %SNMP::Info::Layer3::GLOBALS,
%SNMP::Info::LLDP::GLOBALS,
'aruba_serial' => 'wlsxSwitchLicenseSerialNumber', 'aruba_serial' => 'wlsxSwitchLicenseSerialNumber',
'aruba_model' => 'wlsxModelName', 'aruba_model' => 'wlsxModelName',
'mac' => 'wlsxSysExtSwitchBaseMacaddress', 'mac' => 'wlsxSysExtSwitchBaseMacaddress',
@@ -62,6 +65,7 @@ $VERSION = '3.07';
%FUNCS = ( %FUNCS = (
%SNMP::Info::Layer3::FUNCS, %SNMP::Info::Layer3::FUNCS,
%SNMP::Info::LLDP::FUNCS,
# WLSR-AP-MIB::wlsrConfigTable # WLSR-AP-MIB::wlsrConfigTable
'aruba_ap_ssidbcast' => 'wlsrHideSSID', 'aruba_ap_ssidbcast' => 'wlsrHideSSID',
@@ -135,6 +139,7 @@ $VERSION = '3.07';
%MUNGE = ( %MUNGE = (
%SNMP::Info::Layer3::MUNGE, %SNMP::Info::Layer3::MUNGE,
%SNMP::Info::LLDP::MUNGE,
'aruba_ap_fqln' => \&munge_aruba_fqln, 'aruba_ap_fqln' => \&munge_aruba_fqln,
'aruba_ap_type' => \&SNMP::Info::munge_e_type, 'aruba_ap_type' => \&SNMP::Info::munge_e_type,
'aruba_card_type' => \&SNMP::Info::munge_e_type, 'aruba_card_type' => \&SNMP::Info::munge_e_type,