From ca48defd24583c979db9abff52179656ab644d44 Mon Sep 17 00:00:00 2001 From: inphobia Date: Sat, 19 Jan 2019 05:02:41 +0100 Subject: [PATCH] and more whitespace cleanup --- lib/SNMP/Info/Layer3/Aironet.pm | 10 ++++----- lib/SNMP/Info/Layer3/AlcatelLucent.pm | 4 ++-- lib/SNMP/Info/Layer3/AlteonAD.pm | 28 ++++++++++++------------- lib/SNMP/Info/Layer3/Altiga.pm | 30 +++++++++++++-------------- lib/SNMP/Info/Layer3/Arista.pm | 4 ++-- lib/SNMP/Info/Layer3/Aruba.pm | 12 +++++------ lib/SNMP/Info/Layer3/BayRS.pm | 16 +++++++------- lib/SNMP/Info/Layer3/C3550.pm | 10 ++++----- lib/SNMP/Info/Layer3/C4000.pm | 8 +++---- lib/SNMP/Info/Layer3/C6500.pm | 12 +++++------ lib/SNMP/Info/Layer3/CheckPoint.pm | 8 +++---- lib/SNMP/Info/Layer3/Cisco.pm | 4 ++-- lib/SNMP/Info/Layer3/CiscoFWSM.pm | 4 ++-- 13 files changed, 75 insertions(+), 75 deletions(-) diff --git a/lib/SNMP/Info/Layer3/Aironet.pm b/lib/SNMP/Info/Layer3/Aironet.pm index d35aab9d..3415d33e 100644 --- a/lib/SNMP/Info/Layer3/Aironet.pm +++ b/lib/SNMP/Info/Layer3/Aironet.pm @@ -224,14 +224,14 @@ Max Baker =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $aironet = new SNMP::Info( AutoSpecify => 1, Debug => 1, DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $aironet->class(); @@ -257,7 +257,7 @@ This class is for devices running Cisco IOS software (newer) =back For speed or debugging purposes you can call the subclass directly, but not -after determining a more specific class using the method above. +after determining a more specific class using the method above. my $aironet = new SNMP::Info::Layer3::Aironet(...); @@ -280,7 +280,7 @@ after determining a more specific class using the method above. =back These MIBs are now included in the v2.tar.gz archive available from -ftp.cisco.com. Make sure you have a current version. +ftp.cisco.com. Make sure you have a current version. =head1 GLOBALS @@ -296,7 +296,7 @@ C =item $aironet->mac() -Gives the MAC Address of the wireless side +Gives the MAC Address of the wireless side C diff --git a/lib/SNMP/Info/Layer3/AlcatelLucent.pm b/lib/SNMP/Info/Layer3/AlcatelLucent.pm index 4cb45040..6adfe065 100644 --- a/lib/SNMP/Info/Layer3/AlcatelLucent.pm +++ b/lib/SNMP/Info/Layer3/AlcatelLucent.pm @@ -306,7 +306,7 @@ Bill Fenner =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $alu = new SNMP::Info( AutoSpecify => 1, Debug => 1, @@ -314,7 +314,7 @@ Bill Fenner DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $alu->class(); diff --git a/lib/SNMP/Info/Layer3/AlteonAD.pm b/lib/SNMP/Info/Layer3/AlteonAD.pm index ea2eb6af..34933f54 100644 --- a/lib/SNMP/Info/Layer3/AlteonAD.pm +++ b/lib/SNMP/Info/Layer3/AlteonAD.pm @@ -163,14 +163,14 @@ sub ps1_status { my $alteon = shift; my $old_ps = $alteon->old_ps1_stat(); my $new_ps = $alteon->new_ps_stat(); - + return $old_ps if $old_ps; - + if ($new_ps) { return 'ok' if ($new_ps eq 'singlePowerSupplyOk'); return 'failed' if ($new_ps eq 'firstPowerSupplyFailed'); } - + return; } @@ -178,9 +178,9 @@ sub ps2_status { my $alteon = shift; my $old_ps = $alteon->old_ps2_stat(); my $new_ps = $alteon->new_ps_stat(); - + return $old_ps if $old_ps; - + if ($new_ps) { return 'ok' if ($new_ps eq 'doublePowerSupplyOk'); return 'failed' if ($new_ps eq 'secondPowerSupplyFailed'); @@ -242,19 +242,19 @@ sub i_duplex { sub i_duplex_admin { my $alteon = shift; - my $ag_pref + my $ag_pref = $alteon->new_ag_p_cfg_pref() || $alteon->old_ag_p_cfg_pref() || {}; - my $ag_fe_auto + my $ag_fe_auto = $alteon->new_ag_p_cfg_fe_auto() || $alteon->old_ag_p_cfg_fe_auto() || {}; - my $ag_fe_mode + my $ag_fe_mode = $alteon->new_ag_p_cfg_fe_mode() || $alteon->old_ag_p_cfg_fe_mode() || {}; - my $ag_ge_auto + my $ag_ge_auto = $alteon->new_ag_p_cfg_ge_auto() || $alteon->old_ag_p_cfg_ge_auto() || {}; @@ -395,7 +395,7 @@ sub i_vlan_membership_untagged { my $vlan = $vlans->{$port}; push( @{ $i_vlan_membership->{$port} }, $vlan ); } - + return $i_vlan_membership; } @@ -432,14 +432,14 @@ Eric Miller =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $alteon = new SNMP::Info( AutoSpecify => 1, Debug => 1, DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $alteon->class(); @@ -451,7 +451,7 @@ Abstraction subclass for Radware Alteon Series ADC switches and Nortel BladeCenter Layer2-3 GbE Switch Modules. For speed or debugging purposes you can call the subclass directly, but not -after determining a more specific class using the method above. +after determining a more specific class using the method above. my $alteon = new SNMP::Info::Layer3::AlteonAD(...); @@ -581,7 +581,7 @@ IDs. These are the VLANs which are members of the egress list for the port. Example: my $interfaces = $alteon->interfaces(); my $vlans = $alteon->i_vlan_membership(); - + foreach my $iid (sort keys %$interfaces) { my $port = $interfaces->{$iid}; my $vlan = join(',', sort(@{$vlans->{$iid}})); diff --git a/lib/SNMP/Info/Layer3/Altiga.pm b/lib/SNMP/Info/Layer3/Altiga.pm index f44e89f4..e1704d10 100644 --- a/lib/SNMP/Info/Layer3/Altiga.pm +++ b/lib/SNMP/Info/Layer3/Altiga.pm @@ -4,20 +4,20 @@ # Copyright (c) 2008 Jeroen van Ingen Schenau # All rights reserved. # -# Redistribution and use in source and binary forms, with or without +# Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# * Neither the name of the University of California, Santa Cruz nor the -# names of its contributors may be used to endorse or promote products +# * Neither the name of the University of California, Santa Cruz nor the +# names of its contributors may be used to endorse or promote products # derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE # LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR @@ -37,7 +37,7 @@ use SNMP::Info::Layer3; @SNMP::Info::Layer3::Altiga::ISA = qw/SNMP::Info::Layer3 Exporter/; @SNMP::Info::Layer3::Altiga::EXPORT_OK = qw//; -use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE +use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE $int_include_vpn $fake_idx $type_class/; $VERSION = '3.64'; @@ -46,7 +46,7 @@ $VERSION = '3.64'; %SNMP::Info::Layer3::MIBS, 'ALTIGA-VERSION-STATS-MIB' => 'alVersionString', 'ALTIGA-SESSION-STATS-MIB' => 'alActiveSessionCount', - 'ALTIGA-HARDWARE-STATS-MIB' => 'alHardwarePs1Type', + 'ALTIGA-HARDWARE-STATS-MIB' => 'alHardwarePs1Type', ); %GLOBALS = ( @@ -70,7 +70,7 @@ $VERSION = '3.64'; 'fan1_alarm' => 'alHardwareFan1RpmAlarm', 'fan2_alarm' => 'alHardwareFan2RpmAlarm', 'fan3_alarm' => 'alHardwareFan3RpmAlarm', - + ); %FUNCS = ( @@ -189,7 +189,7 @@ sub interfaces { if ($int_include_vpn) { my $tun_type = $altiga->vpn_sess_protocol(); my $peer = $altiga->vpn_sess_peer_ip(); - my $remote = $altiga->vpn_sess_rem_ip(); + my $remote = $altiga->vpn_sess_rem_ip(); my $group = $altiga->vpn_sess_gid(); foreach my $tunnel (keys %$tun_type) { if ($type_class->{$tun_type->{$tunnel}} eq 1) { @@ -197,7 +197,7 @@ sub interfaces { } } } - + return \%interfaces; } @@ -275,14 +275,14 @@ Jeroen van Ingen Schenau =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $altiga = new SNMP::Info( AutoSpecify => 1, Debug => 1, DestHost => 'my_vpn_host', Community => 'public', Version => 1 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $altiga->class(); @@ -366,7 +366,7 @@ to a hash. =item $altiga->interfaces() This method overrides the interfaces() method inherited from SNMP::Info. -It provides a mapping between the Interface Table Index (iid) and the physical +It provides a mapping between the Interface Table Index (iid) and the physical port name, adding a port number to the port name to prevent duplicate names. =item $altiga->i_lastchange() diff --git a/lib/SNMP/Info/Layer3/Arista.pm b/lib/SNMP/Info/Layer3/Arista.pm index 42e55499..421a1a60 100644 --- a/lib/SNMP/Info/Layer3/Arista.pm +++ b/lib/SNMP/Info/Layer3/Arista.pm @@ -146,7 +146,7 @@ Bill Fenner =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $arista = new SNMP::Info( AutoSpecify => 1, Debug => 1, @@ -154,7 +154,7 @@ Bill Fenner DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $arista->class(); diff --git a/lib/SNMP/Info/Layer3/Aruba.pm b/lib/SNMP/Info/Layer3/Aruba.pm index 4e31d95e..1d43e506 100644 --- a/lib/SNMP/Info/Layer3/Aruba.pm +++ b/lib/SNMP/Info/Layer3/Aruba.pm @@ -1403,7 +1403,7 @@ Eric Miller DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; @@ -1422,7 +1422,7 @@ end station MAC addresses collection and correlation to the thin access point the end station is using for communication. For speed or debugging purposes you can call the subclass directly, but not -after determining a more specific class using the method above. +after determining a more specific class using the method above. my $aruba = new SNMP::Info::Layer3::Aruba(...); @@ -1466,7 +1466,7 @@ These are methods that return scalar value from SNMP =item $aruba->model() -Returns model type. Cross references $aruba->id() with product IDs in the +Returns model type. Cross references $aruba->id() with product IDs in the Aruba MIB. =item $aruba->vendor() @@ -1540,7 +1540,7 @@ false. =item $aruba->i_ssidmac() With the same keys as i_ssidlist, returns the Basic service set -identification (BSSID), MAC address, the AP is using for the SSID. +identification (BSSID), MAC address, the AP is using for the SSID. =item $aruba->cd11_mac() @@ -1578,7 +1578,7 @@ Total packets transmitted by the wireless client. =item $aruba->i_index() -Returns reference to map of IIDs to Interface index. +Returns reference to map of IIDs to Interface index. Extends C to support APs as device interfaces. @@ -1614,7 +1614,7 @@ interfaces. =item $aruba->i_up_admin() Returns reference to map of IIDs to administrative status of the interface. -Returns C for Ethernet interfaces and C +Returns C for Ethernet interfaces and C for AP interfaces. =item $aruba->i_mac() diff --git a/lib/SNMP/Info/Layer3/BayRS.pm b/lib/SNMP/Info/Layer3/BayRS.pm index 61ccb4fb..bbf8f0e0 100644 --- a/lib/SNMP/Info/Layer3/BayRS.pm +++ b/lib/SNMP/Info/Layer3/BayRS.pm @@ -1389,14 +1389,14 @@ Eric Miller =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $bayrs = new SNMP::Info( AutoSpecify => 1, Debug => 1, DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $bayrs->class(); @@ -1404,10 +1404,10 @@ Eric Miller =head1 DESCRIPTION -Abstraction subclass for routers running Avaya/Nortel BayRS. +Abstraction subclass for routers running Avaya/Nortel BayRS. For speed or debugging purposes you can call the subclass directly, but not -after determining a more specific class using the method above. +after determining a more specific class using the method above. my $bayrs = new SNMP::Info::Layer3::BayRS(...); @@ -1458,7 +1458,7 @@ These are methods that return scalar value from SNMP Returns the model of the BayRS router. Will translate between the MIB model and the common model with this map : - C<%MODEL_MAP = ( + C<%MODEL_MAP = ( 'acefn' => 'FN', 'aceln' => 'LN', 'acecn' => 'CN', @@ -1529,8 +1529,8 @@ passed but the entire table will be returned. Returns reference to the map between IID and physical Port. The physical port name is stripped to letter and numbers to signify -port type and slot port (S11) if the default platform naming was -maintained. Otherwise the port is the interface description. +port type and slot port (S11) if the default platform naming was +maintained. Otherwise the port is the interface description. =item $bayrs->i_name() @@ -1540,7 +1540,7 @@ interfaces. =item $bayrs->i_duplex() Returns reference to hash. Maps port operational duplexes to IIDs for -Ethernet interfaces. +Ethernet interfaces. =item $bayrs->i_duplex_admin() diff --git a/lib/SNMP/Info/Layer3/C3550.pm b/lib/SNMP/Info/Layer3/C3550.pm index 8b90f71f..fa2e2166 100644 --- a/lib/SNMP/Info/Layer3/C3550.pm +++ b/lib/SNMP/Info/Layer3/C3550.pm @@ -206,7 +206,7 @@ Max Baker =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $c3550 = new SNMP::Info( AutoSpecify => 1, Debug => 1, @@ -214,7 +214,7 @@ Max Baker DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $c3550->class(); @@ -222,14 +222,14 @@ Max Baker =head1 DESCRIPTION -Abstraction subclass for Cisco Catalyst 3550 Layer 2/3 Switches. +Abstraction subclass for Cisco Catalyst 3550 Layer 2/3 Switches. These devices run IOS but have some of the same characteristics as the Catalyst WS-C family (5xxx,6xxx). For example, forwarding tables are held in VLANs, and extended interface information is gleaned from F. For speed or debugging purposes you can call the subclass directly, but not -after determining a more specific class using the method above. +after determining a more specific class using the method above. my $c3550 = new SNMP::Info::Layer3::C3550(...); @@ -327,7 +327,7 @@ Crosses $c3550->p_port() with $c3550->p_duplex() to utilize port C. Example: my %if_map = reverse %{$c3550->interfaces()}; - $c3550->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) + $c3550->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) or die "Couldn't change port duplex. ",$c3550->error(1); =back diff --git a/lib/SNMP/Info/Layer3/C4000.pm b/lib/SNMP/Info/Layer3/C4000.pm index 8c546ca3..7ff5c62c 100644 --- a/lib/SNMP/Info/Layer3/C4000.pm +++ b/lib/SNMP/Info/Layer3/C4000.pm @@ -111,7 +111,7 @@ Bill Fenner =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $c4000 = new SNMP::Info( AutoSpecify => 1, Debug => 1, @@ -119,7 +119,7 @@ Bill Fenner DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $c4000->class(); @@ -127,10 +127,10 @@ Bill Fenner =head1 DESCRIPTION -Abstraction subclass for Cisco Catalyst 4000 Layer 2/3 Switches. +Abstraction subclass for Cisco Catalyst 4000 Layer 2/3 Switches. For speed or debugging purposes you can call the subclass directly, but not -after determining a more specific class using the method above. +after determining a more specific class using the method above. my $c4000 = new SNMP::Info::Layer3::C4000(...); diff --git a/lib/SNMP/Info/Layer3/C6500.pm b/lib/SNMP/Info/Layer3/C6500.pm index df6aaaba..98d56b03 100644 --- a/lib/SNMP/Info/Layer3/C6500.pm +++ b/lib/SNMP/Info/Layer3/C6500.pm @@ -179,7 +179,7 @@ sub set_i_duplex_admin { my $c6500 = shift; my ( $duplex, $iid ) = @_; - + if ( $c6500->is_virtual_switch() ) { # VSS -> MAU @@ -252,7 +252,7 @@ Max Baker =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $c6500 = new SNMP::Info( AutoSpecify => 1, Debug => 1, @@ -260,7 +260,7 @@ Max Baker DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $c6500->class(); @@ -268,14 +268,14 @@ Max Baker =head1 DESCRIPTION -Abstraction subclass for Cisco Catalyst 6500 Layer 2/3 Switches. +Abstraction subclass for Cisco Catalyst 6500 Layer 2/3 Switches. These devices run IOS but have some of the same characteristics as the Catalyst WS-C family (5xxx). For example, forwarding tables are held in VLANs, and extended interface information is gleaned from F. For speed or debugging purposes you can call the subclass directly, but not -after determining a more specific class using the method above. +after determining a more specific class using the method above. my $c6500 = new SNMP::Info::Layer3::C6500(...); @@ -382,7 +382,7 @@ Crosses $c6500->p_port() with $c6500->p_duplex() to utilize port C. Example: my %if_map = reverse %{$c6500->interfaces()}; - $c6500->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) + $c6500->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) or die "Couldn't change port duplex. ",$c6500->error(1); =item $c6500->set_i_speed_admin(speed, ifIndex) diff --git a/lib/SNMP/Info/Layer3/CheckPoint.pm b/lib/SNMP/Info/Layer3/CheckPoint.pm index a31ba230..4be32fe2 100644 --- a/lib/SNMP/Info/Layer3/CheckPoint.pm +++ b/lib/SNMP/Info/Layer3/CheckPoint.pm @@ -57,7 +57,7 @@ $VERSION = '3.64'; %SNMP::Info::LLDP::GLOBALS, 'netsnmp_vers' => 'versionTag', 'hrSystemUptime' => 'hrSystemUptime', - + ); %FUNCS = ( @@ -109,7 +109,7 @@ sub os_ver { return $1 if ($extend_table->{$ex} =~ /^This is Check Point's software version (.*)$/); last; } - } + } $os_ver = $1 if ( $descr =~ /^\S+\s+\S+\s+(\S+)\s+/ ); if ($vers) { @@ -184,14 +184,14 @@ Ambroise Rosset =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $ckp = new SNMP::Info( AutoSpecify => 1, Debug => 1, DestHost => 'myrouter', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $ckp->class(); diff --git a/lib/SNMP/Info/Layer3/Cisco.pm b/lib/SNMP/Info/Layer3/Cisco.pm index 6aa2fc9f..e9c391eb 100644 --- a/lib/SNMP/Info/Layer3/Cisco.pm +++ b/lib/SNMP/Info/Layer3/Cisco.pm @@ -189,7 +189,7 @@ Max Baker =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $cisco = new SNMP::Info( AutoSpecify => 1, Debug => 1, @@ -197,7 +197,7 @@ Max Baker DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $cisco->class(); diff --git a/lib/SNMP/Info/Layer3/CiscoFWSM.pm b/lib/SNMP/Info/Layer3/CiscoFWSM.pm index fa3233ca..a28dbe29 100644 --- a/lib/SNMP/Info/Layer3/CiscoFWSM.pm +++ b/lib/SNMP/Info/Layer3/CiscoFWSM.pm @@ -141,7 +141,7 @@ Brian De Wolf =head1 SYNOPSIS - # Let SNMP::Info determine the correct subclass for you. + # Let SNMP::Info determine the correct subclass for you. my $fwsm = new SNMP::Info( AutoSpecify => 1, Debug => 1, @@ -149,7 +149,7 @@ Brian De Wolf DestHost => 'myswitch', Community => 'public', Version => 2 - ) + ) or die "Can't connect to DestHost.\n"; my $class = $fwsm->class();