release 3.15

ChangeLog

@@ -1,5 +1,19 @@
 SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
 
+version 3.15 (2014-07-10)
+
+   [NEW FEATURES]
+
+    * Offline mode and Cache export/priming.
+
+   [ENHANCEMENTS]
+
+    * Return serial number for Cisco 3850 from entPhysicalSerialNum
+
+   [BUG FIXES]
+
+    * Cisco SB serial number probably did not work
+
 version 3.14 (2014-06-07)
 
    [ENHANCEMENTS]

Info.pm

@@ -24,7 +24,7 @@ use vars
     qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG %SPEED_MAP
     $NOSUCH $BIGINT $REPEATERS/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 =head1 NAME
 
@@ -32,7 +32,7 @@ SNMP::Info - OO Interface to Network devices and MIBs through SNMP
 
 =head1 VERSION
 
-SNMP::Info - Version 3.14
+SNMP::Info - Version 3.15
 
 =head1 AUTHOR
 
@@ -1053,6 +1053,20 @@ SNMP::Session object to use instead of connecting on own.
 
 (default creates session automatically)
 
+=item Offline
+
+Causes SNMP::Info to avoid network activity and return data only from its
+cache. If you ask for something not in the cache, an error is thrown.  See
+also the C<cache()> and C<offline()> methods.
+
+(default 0, which means "online")
+
+=item Cache
+
+Pass in a HashRef to prime the cache of retrieved data. Useful for creating an
+instance in C<Offline> mode from a previously dumped cache. See also the
+C<cache()> method to retrieve a cache after running actial queries.
+
 =item OTHER
 
 All other arguments are passed to SNMP::Session.
@@ -1142,6 +1156,16 @@ sub new {
         delete $sess_args{IgnoreNetSNMPConf};
     }
 
+    if ( defined $args{Offline} ) {
+        $new_obj->{Offline} = $args{Offline} || 0;
+        delete $sess_args{Offline};
+    }
+
+    if ( defined $args{Cache} and ref {} eq ref $args{Cache} ) {
+        $new_obj->{$_} = $args{Cache}->{$_} for keys %{$args{Cache}};
+        delete $sess_args{Cache};
+    }
+
     my $sess = undef;
     if ( defined $args{Session} ) {
         $sess = $args{Session};
@@ -1266,6 +1290,9 @@ data from a method.
 Run $info->clear_cache() to clear the cache to allow reload of both globals
 and table methods.
 
+The cache can be retreved or set using the $info->cache() method. This works
+together with the C<Offline> option.
+
 =head2 Object Scalar Methods
 
 These are for package related data, not directly supplied
@@ -1314,6 +1341,50 @@ sub debug {
     return $self->{debug};
 }
 
+=item $info->offline([1|0])
+
+Returns if offline mode is currently turned on for this object.
+
+Optionally sets the Offline parameter.
+
+=cut
+
+sub offline {
+    my $self = shift;
+    my $ol   = shift;
+
+    if ( defined $ol ) {
+        $self->{Offline} = $ol;
+    }
+    return $self->{Offline};
+}
+
+=item $info->cache([new_cache])
+
+Returns a HashRef of all cached data in this object. There will be a C<store>
+key for table data and then one key for each leaf.
+
+Optionally sets the cache parameters if passed a HashRef.
+
+=cut
+
+sub cache {
+    my $self = shift;
+    my $data = shift;
+
+    if ( defined $data and ref {} eq ref $data ) {
+        $self->{$_} = $data->{$_} for keys %$data;
+    }
+
+    my $cache = { store => $self->{store} };
+    foreach my $key ( keys %$self ) {
+        next unless defined $key;
+        next unless $key =~ /^_/;
+        $cache->{$key} = $self->{$key};
+    }
+    return $cache;
+}
+
 =item $info->bulkwalk([1|0])
 
 Returns if bulkwalk is currently turned on for this object.
@@ -3649,6 +3720,12 @@ sub _global {
             } 
         }
 
+        if ( $self->{Offline} ) {
+            $self->error_throw(
+                "SNMP::Info::_global: Offline but $attr is not in cache\n" );
+            return;
+        }
+
         if ( $self->debug() ) {
             # Let's get the MIB Module and leaf name along with the OID
             my $qual_leaf = SNMP::translateObj($oid,0,1) || '';
@@ -3973,6 +4050,12 @@ sub _load_attr {
             && !$load
             && !defined $partial );
 
+        if ( $self->{Offline} ) {
+            $self->error_throw(
+                "SNMP::Info::_load_atrr: Offline but $attr is not in cache\n" );
+            return;
+        }
+
         # We want the qualified leaf name so that we can
         # specify the Module (MIB) in the case of private leaf naming
         # conflicts.  Example: ALTEON-TIGON-SWITCH-MIB::agSoftwareVersion
@@ -4182,6 +4265,7 @@ sub snmp_connect_ip {
     my $ver  = $self->snmp_ver();
     my $comm = $self->snmp_comm();
 
+    return if $self->{Offline};
     return if ( $ip eq '0.0.0.0' ) or ( $ip =~ /^127\./ );
 
     # Create session object

Info/AMAP.pm

@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS
     = ( 'ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB' => 'aipAMAPRemDeviceType', );

Info/AdslLine.pm

@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'ADSL-LINE-MIB' => 'adslLineType' );
 

Info/Aggregate.pm

@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (); # IF-MIB
 

Info/Airespace.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Bridge.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     'BRIDGE-MIB'   => 'dot1dBaseBridgeAddress',

Info/CDP.pm

@@ -43,7 +43,7 @@ use SNMP::Info;
 use vars
     qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT %CDP_CAPABILITIES/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 # Five data structures required by SNMP::Info
 %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );

Info/CiscoAgg.pm

@@ -43,7 +43,7 @@ use SNMP::Info::IEEE802dot3ad 'agg_ports_lag';
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
   %SNMP::Info::IEEE802dot3ad::MIBS,

Info/CiscoConfig.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',

Info/CiscoImage.pm

@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'CISCO-IMAGE-MIB' => 'ciscoImageString', );
 

Info/CiscoPortSecurity.pm

@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',

Info/CiscoPower.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex',
           'CISCO-CDP-MIB' => 'cdpCachePowerConsumption' );

Info/CiscoQOS.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', );
 

Info/CiscoRTT.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', );
 

Info/CiscoStack.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', );
 

Info/CiscoStats.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     'SNMPv2-MIB'            => 'sysDescr',

Info/CiscoStpExtensions.pm

@@ -36,7 +36,7 @@ use SNMP::Info::Bridge;
 
 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 @SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/;
 @SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//;

Info/CiscoVTP.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     'CISCO-VTP-MIB'                       => 'vtpVlanName',

Info/EDP.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     'EXTREME-EDP-MIB'   => 'extremeEdpPortIfIndex',

Info/Entity.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' );
 

Info/EtherLike.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'EtherLike-MIB' => 'etherMIB' );
 

Info/FDP.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' );
 

Info/IEEE802dot11.pm

@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', );
 

Info/IEEE802dot3ad.pm

@@ -43,7 +43,7 @@ use SNMP::Info::Aggregate;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
   %SNMP::Info::Aggregate::MIBS,

Info/IPv6.pm

@@ -44,7 +44,7 @@ use constant {
     IPV6MIB => 3,
 };
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 
 

Info/LLDP.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     'LLDP-MIB'          => 'lldpLocSysCapEnabled',

Info/Layer1.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( %SNMP::Info::MIBS, 'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex' );
 

Info/Layer1/Allied.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', );

Info/Layer1/Asante.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, );

Info/Layer1/Bayhub.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,

Info/Layer1/Cyclades.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer1::MIBS,

Info/Layer1/S3000.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,

Info/Layer2.pm

@@ -45,7 +45,7 @@ use SNMP::Info::PowerEthernet;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,         %SNMP::Info::Bridge::MIBS,

Info/Layer2/Airespace.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,      %SNMP::Info::Bridge::MIBS,

Info/Layer2/Aironet.pm

@@ -49,7 +49,7 @@ use SNMP::Info::IEEE802dot11;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %GLOBALS = (
     %SNMP::Info::IEEE802dot11::GLOBALS,

Info/Layer2/Allied.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
 

Info/Layer2/Baystack.pm

@@ -46,7 +46,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,    %SNMP::Info::LLDP::MIBS,

Info/Layer2/C1900.pm

@@ -46,7 +46,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::GLOBALS,

Info/Layer2/C2900.pm

@@ -47,7 +47,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::GLOBALS,     %SNMP::Info::CiscoConfig::GLOBALS,

Info/Layer2/Catalyst.pm

@@ -49,7 +49,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoPortSecurity::MIBS,

Info/Layer2/Centillion.pm

@@ -43,7 +43,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer2/Cisco.pm

@@ -50,7 +50,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoConfig::MIBS,

Info/Layer2/CiscoSB.pm

@@ -50,7 +50,7 @@ use SNMP::Info::CDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
@@ -98,21 +98,17 @@ sub vendor {
     return 'cisco';
 }
 
-# Walk the entPhysicalSerialNum table and return both the first serial
-# number found as well as the index of that entry.
+# Walk the entPhysicalSerialNum table and return the first serial found
 sub serial {
     my $ciscosb  = shift;
-    my $serial   = undef;  
     my $e_serial = $ciscosb->e_serial();
 
     # Find entity table entry for this unit
-    foreach my $e ( keys %$e_serial ) {
-        if (defined ($e_serial->{$e}) and $e_serial->{$e} !~ /^\s*$/) {
-            $index = $e;
-            last;
+    foreach my $e ( sort keys %$e_serial ) {
+        if (defined $e_serial->{$e} and $e_serial->{$e} !~ /^\s*$/) {
+            return $e_serial->{$e};
         }
     }
-    return $e_serial->{$index} if defined $index;
 }
 
 sub os_ver {

Info/Layer2/HP.pm

@@ -52,7 +52,7 @@ use SNMP::Info::Aggregate;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer2/HP4000.pm

@@ -44,7 +44,7 @@ use SNMP::Info::CDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer2/HPVC.pm

@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,

Info/Layer2/Kentrox.pm

@@ -36,7 +36,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,

Info/Layer2/N2270.pm

@@ -43,7 +43,7 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,        %SNMP::Info::Bridge::MIBS,

Info/Layer2/NAP222x.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS,

Info/Layer2/NWSS2300.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Bridge;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer2/Netgear.pm

@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.

Info/Layer2/Orinoco.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,

Info/Layer2/Trapeze.pm

@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer2/ZyXEL_DSLAM.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );

Info/Layer3.pm

@@ -51,7 +51,7 @@ use SNMP::Info::AdslLine;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer3/Aironet.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/AlcatelLucent.pm

@@ -49,7 +49,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/AlteonAD.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Altiga.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE 
             $int_include_vpn $fake_idx $type_class/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
             %SNMP::Info::Layer3::MIBS,

Info/Layer3/Arista.pm

@@ -48,7 +48,7 @@ use SNMP::Info::Aggregate;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Aruba.pm

@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/BayRS.pm

@@ -43,7 +43,7 @@ use SNMP::Info::Bridge;
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE %MODEL_MAP
     %MODID_MAP %PROCID_MAP/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer3/BlueCoatSG.pm

@@ -36,7 +36,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,

Info/Layer3/C3550.pm

@@ -64,7 +64,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 @SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm

Info/Layer3/C4000.pm

@@ -50,7 +50,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/C6500.pm

@@ -70,7 +70,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
@@ -134,6 +134,23 @@ sub vendor {
 
 sub cisco_comm_indexing { return 1; }
 
+sub serial {
+    my $c6500 = shift;
+
+    my $serial = $c6500->SUPER::serial();
+    return $serial if defined $serial and $serial;
+
+    # now grab the table only if SUPER cannot find it
+    my $e_serial = $c6500->e_serial();
+
+    # Find entity table entry for this unit
+    foreach my $e ( sort keys %$e_serial ) {
+        if (defined $e_serial->{$e} and $e_serial->{$e} !~ /^\s*$/) {
+            return $e_serial->{$e};
+        }
+    }
+}
+
 #  Newer versions use the ETHERLIKE-MIB to report operational duplex.
 
 sub i_duplex {
@@ -389,6 +406,10 @@ Returns the Switch status: multiNode or standalone.
 
 Return 1 if the switch (C<cvsSwitchMode>) is in multimode (VSS).
 
+=item $c6500->serial()
+
+Returns serial number of unit (falls back to C<entPhysicalSerialNum>).
+
 =back
 
 =head2 Global Methods imported from SNMP::Info::CiscoVTP

Info/Layer3/Cisco.pm

@@ -52,7 +52,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/CiscoASA.pm

@@ -55,7 +55,7 @@ use SNMP::Info::Layer3::Cisco;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
        %SNMP::Info::Layer3::Cisco::MIBS,

Info/Layer3/CiscoFWSM.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Layer3::Cisco;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::Cisco::MIBS,

Info/Layer3/Contivity.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Entity;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS, %SNMP::Info::Entity::MIBS,

Info/Layer3/Dell.pm

@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Enterasys.pm

@@ -44,7 +44,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::CDP::MIBS,

Info/Layer3/Extreme.pm

@@ -46,7 +46,7 @@ use SNMP::Info::EDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/F5.pm

@@ -38,7 +38,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Force10.pm

@@ -43,7 +43,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Foundry.pm

@@ -48,7 +48,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/H3C.pm

@@ -47,7 +47,7 @@ use SNMP::Info::IEEE802dot3ad 'agg_ports_lag';
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/HP9300.pm

@@ -42,7 +42,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/IBMGbTor.pm

@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Juniper.pm

@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Lantronix.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Microsoft.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 

Info/Layer3/Mikrotik.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/N1600.pm

@@ -41,7 +41,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/NetSNMP.pm

@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Netscreen.pm

@@ -40,7 +40,7 @@ use SNMP::Info::IEEE802dot11;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Nexus.pm

@@ -61,7 +61,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm

Info/Layer3/PacketFront.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Passport.pm

@@ -43,7 +43,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::RapidCity::MIBS,

Info/Layer3/Pf.pm

@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Pica8.pm

@@ -39,7 +39,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/SonicWALL.pm

@@ -36,7 +36,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,

Info/Layer3/Steelhead.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Sun.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 

Info/Layer3/Tasman.pm

@@ -41,7 +41,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Timetra.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', );
 

Info/Layer7.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer7/APC.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Layer7;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer7::MIBS,

Info/Layer7/Neoteris.pm

@@ -38,7 +38,7 @@ use SNMP::Info::Layer7;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.14';
+$VERSION = '3.15';
 
 %MIBS = (
     %SNMP::Info::Layer7::MIBS,