release 3.18

ChangeLog

@@ -1,5 +1,23 @@
 SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
 
+version 3.18 (2014-07-02)
+
+   [ENHANCEMENTS]
+
+    * Pseudo ENTITY-MIB methods added to L3::Tasman for hardware information
+    * Capture VPC Keepalive IP addresses in L3::Nexus (jeroenvi)
+    * L2::Netgear inheritance clean up and removal of unnecessary c_* methods
+      defined in Info base class
+
+   [BUG FIXES]
+
+    * Correctly identify device type (class) for instantiated objects which
+      have overridden layers.
+    * [#58] Fix inheritance in L3::FWSM and L3::CiscoASA
+    * [#71] Don't try to match on a false port description in lldp_if
+    * [#54] Possible bad values returned for cdp_id and lldp_port with some HP
+      gear (Joel Leonhardt)
+
 version 3.17 (2014-06-23)
 
    [ENHANCEMENTS]
@@ -16,7 +34,7 @@ version 3.16 (2014-06-23)
       all applicable classes now inherit CiscoAgg, CiscoStpExtensions,
       CiscoPortSecurity, CiscoPower, and LLDP classes.
     * Remove inheritance of classes the devices do not support in L3::FWSM
-      andL3::CiscoASA
+      and L3::CiscoASA
 
    [BUG FIXES]
 

Info.pm

@@ -24,7 +24,7 @@ use vars
     qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG %SPEED_MAP
     $NOSUCH $BIGINT $REPEATERS/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 =head1 NAME
 
@@ -32,7 +32,7 @@ SNMP::Info - OO Interface to Network devices and MIBs through SNMP
 
 =head1 VERSION
 
-SNMP::Info - Version 3.17
+SNMP::Info - Version 3.18
 
 =head1 AUTHOR
 
@@ -1496,7 +1496,9 @@ sub device_type {
         8072 => 'SNMP::Info::Layer3::NetSNMP',
         9303 => 'SNMP::Info::Layer3::PacketFront',
         12325 => 'SNMP::Info::Layer3::Pf',
+        14179 => 'SNMP::Info::Layer2::Airespace',
         14525 => 'SNMP::Info::Layer2::Trapeze',
+        14823 => 'SNMP::Info::Layer3::Aruba',
         14988 => 'SNMP::Info::Layer3::Mikrotik',
         17163 => 'SNMP::Info::Layer3::Steelhead',
         25506 => 'SNMP::Info::Layer3::H3C',
@@ -1512,6 +1514,7 @@ sub device_type {
         171   => 'SNMP::Info::Layer3::Dell',
         207   => 'SNMP::Info::Layer2::Allied',
         674   => 'SNMP::Info::Layer3::Dell',
+        890   => 'SNMP::Info::Layer2::ZyXEL_DSLAM',
         1872  => 'SNMP::Info::Layer3::AlteonAD',
         1916  => 'SNMP::Info::Layer3::Extreme',
         1991  => 'SNMP::Info::Layer3::Foundry',
@@ -1530,6 +1533,10 @@ sub device_type {
         26543 => 'SNMP::Info::Layer3::IBMGbTor',
     );
 
+    my %l1sysoidmap = (
+        2925  => 'SNMP::Info::Layer1::Cyclades',
+    );
+
     my %l7sysoidmap = (
         318   => 'SNMP::Info::Layer7::APC',
         5951  => 'SNMP::Info::Layer7::Netscaler',
@@ -1647,6 +1654,20 @@ sub device_type {
             if ($desc =~ /\b(C1100|C1130|C1140|AP1200|C350|C1200|C1240|C1250)\b/
             and $desc =~ /\bIOS\b/ );
 
+        # Airespace (WLC) Module
+        $objtype = 'SNMP::Info::Layer2::Airespace'
+            if ( $desc =~ /^Cisco Controller$/ );
+
+        #Nortel 2270
+        $objtype = 'SNMP::Info::Layer2::N2270'
+            if (
+            $desc =~ /Nortel\s+(Networks\s+)??WLAN\s+-\s+Security\s+Switch/ );
+
+        # Nortel (Trapeze) WSS 2300 Series
+        $objtype = 'SNMP::Info::Layer2::NWSS2300'    
+            if (
+            $desc =~ /^(Nortel\s)??Wireless\sSecurity\sSwitch\s23[568][012]\b/);
+
         # Generic device classification based upon sysObjectID
         if (    ( $objtype eq 'SNMP::Info::Layer3' )
             and ( defined($id) )
@@ -1664,6 +1685,18 @@ sub device_type {
 
         # Device Type Overrides
 
+        #  Bay Hub (Needed here for layers override)
+        $objtype = 'SNMP::Info::Layer1::Bayhub'
+            if ( $desc =~ /\bNMM.*Agent/ );
+        $objtype = 'SNMP::Info::Layer1::Bayhub'
+            if ( $desc =~ /\bBay\s*Stack.*Hub/i );
+
+        #  Synoptics Hub (Needed here for layers override)
+        #  This will override Bay Hub only for specific devices supported
+        #  by this class
+        $objtype = 'SNMP::Info::Layer1::S3000'
+            if ( $desc =~ /\bNMM\s+(281|3000|3030)/i );
+
         #   Catalyst 1900 series override
         $objtype = 'SNMP::Info::Layer2::C1900'
             if ( $desc =~ /catalyst/i and $desc =~ /\D19\d{2}/ );
@@ -1750,7 +1783,7 @@ sub device_type {
 
         # Airespace (WLC) Module
         $objtype = 'SNMP::Info::Layer2::Airespace'
-            if ( $desc =~ /Cisco Controller/ );
+            if ( $desc =~ /^Cisco Controller$/ );
 
         #Nortel 2270
         $objtype = 'SNMP::Info::Layer2::N2270'
@@ -1784,12 +1817,20 @@ sub device_type {
             if ( $desc =~ /\bBay\s*Stack.*Hub/i );
 
         #  Synoptics Hub
-        #  This will override Bay Hub only for specific devices supported by this class
+        #  This will override Bay Hub only for specific devices supported
+        #  by this class
         $objtype = 'SNMP::Info::Layer1::S3000'
             if ( $desc =~ /\bNMM\s+(281|3000|3030)/i );
 
-        # These devices don't claim to have Layer1-3 but we like em anyways.
+        # Generic device classification based upon sysObjectID
+        if (    ( $objtype eq 'SNMP::Info::Layer1' )
+            and ( defined($id) )
+            and ( exists( $l1sysoidmap{$id} ) ) )
+        {
+            $objtype = $l1sysoidmap{$id};
+        }
     }
+    # These devices don't claim to have Layer1-3 but we like em anyways.
     else {
         $objtype = 'SNMP::Info::Layer2::ZyXEL_DSLAM'
             if ( $desc =~ /8-port .DSL Module\(Annex .\)/i );
@@ -1816,7 +1857,8 @@ sub device_type {
 
         # Nortel (Trapeze) WSS 2300 Series
         $objtype = 'SNMP::Info::Layer2::NWSS2300'    
-            if ( $desc =~ /\bWireless\sSecurity\sSwitch\s23[568][012]\b/);
+            if (
+            $desc =~ /^(Nortel\s)??Wireless\sSecurity\sSwitch\s23[568][012]\b/);
 
         # Generic device classification based upon sysObjectID
         if ( defined($id) and $objtype eq 'SNMP::Info') {

Info/AMAP.pm

@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = (); # IF-MIB
 

Info/Airespace.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 # Five data structures required by SNMP::Info
 %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );
@@ -62,7 +62,7 @@ $VERSION = '3.17';
     'cdp_proto'        => 'cdpCacheAddressType',
     'cdp_addr'         => 'cdpCacheAddress',
     'cdp_ver'          => 'cdpCacheVersion',
-    'cdp_id'           => 'cdpCacheDeviceId',
+    'cdp_dev_id'       => 'cdpCacheDeviceId',
     'cdp_port'         => 'cdpCacheDevicePort',
     'cdp_platform'     => 'cdpCachePlatform',
     'cdp_capabilities' => 'cdpCacheCapabilities',
@@ -81,7 +81,6 @@ $VERSION = '3.17';
     'cdp_platform'     => \&SNMP::Info::munge_null,
     'cdp_domain'       => \&SNMP::Info::munge_null,
     'cdp_port'         => \&SNMP::Info::munge_null,
-    'cdp_id'           => \&SNMP::Info::munge_null,
     'cdp_ver'          => \&SNMP::Info::munge_null,
     'cdp_ip'           => \&SNMP::Info::munge_ip,
     'cdp_power'        => \&munge_power,
@@ -210,6 +209,22 @@ sub cdp_cap {
     return \%cdp_cap;
 }
 
+sub cdp_id {
+    my $cdp    = shift;
+    my $partial = shift;
+
+    my $ch = $cdp->cdp_dev_id($partial) || {};
+
+    my %cdp_id;
+    foreach my $key ( sort keys %$ch ) {
+        my $id = $ch->{$key};
+        next unless $id;
+        $id = SNMP::Info::munge_mac($id) || SNMP::Info::munge_null($id);
+        $cdp_id{$key} = $id;
+    }
+    return \%cdp_id;
+}
+
 1;
 __END__
 

Info/CiscoAgg.pm

@@ -43,7 +43,7 @@ use SNMP::Info::IEEE802dot3ad 'agg_ports_lag';
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = (
     'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',

Info/CiscoPortSecurity.pm

@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', );
 

Info/CiscoStack.pm

@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 @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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' );
 

Info/EtherLike.pm

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

Info/FDP.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = (
   %SNMP::Info::Aggregate::MIBS,

Info/IPv6.pm

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

Info/LLDP.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %MIBS = (
     'LLDP-MIB'          => 'lldpLocSysCapEnabled',
@@ -121,9 +121,9 @@ sub lldp_if {
         my $lldp_desc = $lldp->lldpLocPortDesc($port);
         my $desc = $lldp_desc->{$port};
         # If cross reference is successful use it, otherwise stick with lldpRemLocalPortNum
-        if ( exists $r_i_descr{$desc} ) {
+        if ( $desc && exists $r_i_descr{$desc} ) {
             $port = $r_i_descr{$desc};
-        } elsif ( exists $r_i_alias{$desc} ) {
+        } elsif ( $desc && exists $r_i_alias{$desc} ) {
             $port = $r_i_alias{$desc};
         }
         
@@ -170,6 +170,7 @@ sub lldp_port {
     my $pdesc = $lldp->lldp_rem_desc($partial)     || {};
     my $pid   = $lldp->lldp_rem_pid($partial)      || {};
     my $ptype = $lldp->lldp_rem_pid_type($partial) || {};
+    my $vendor = $lldp->vendor();
 
     my %lldp_port;
     foreach my $key ( sort keys %$pid ) {
@@ -194,7 +195,7 @@ sub lldp_port {
 
         # Avaya/Nortel lldpRemPortDesc doesn't match ifDescr, but we can still
         # figure out slot.port based upon lldpRemPortDesc
-        if ( $port =~ /^(Unit\s+(\d+)\s+)?Port\s+(\d+)$/ ) {
+        if ( $vendor eq 'avaya' && $port =~ /^(Unit\s+(\d+)\s+)?Port\s+(\d+)$/ ) {
             $port = defined $1 ? "$2.$3" : "$3";
         }
 

Info/Layer1.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 # 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.17';
+$VERSION = '3.18';
 
 # 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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,    %SNMP::Info::LLDP::MIBS,

Info/Layer2/C1900.pm

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

Info/Layer2/C2900.pm

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

Info/Layer2/Catalyst.pm

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

Info/Layer2/Centillion.pm

@@ -43,7 +43,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %MIBS = (
     %SNMP::Info::MIBS,
@@ -385,11 +385,6 @@ Returns 'Centillion'
 
 =over
 
-=item $centillion->layers()
-
-Returns 00000011.  Class emulates Layer 2 functionality through proprietary
-MIBs.
-
 =item  $centillion->index_factor()
 
 Required by SNMP::Info::SONMP.  Number representing the number of ports

Info/Layer2/Cisco.pm

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

Info/Layer2/CiscoSB.pm

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

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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer2/Netgear.pm

@@ -33,32 +33,31 @@ package SNMP::Info::Layer2::Netgear;
 use strict;
 use Exporter;
 use SNMP::Info::Layer2;
-use SNMP::Info::Entity;
 use SNMP::Info::LLDP;
 
-@SNMP::Info::Layer2::Netgear::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Entity SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Netgear::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer2 Exporter/;
 @SNMP::Info::Layer2::Netgear::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
 our $index = undef;
 
-%MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::Entity::MIBS, %SNMP::Info::LLDP::MIBS, );
+%MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::LLDP::MIBS, );
 
 %GLOBALS = (
-    %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::Entity::GLOBALS, %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::LLDP::GLOBALS,
     ng_fsosver   => '.1.3.6.1.4.1.4526.11.11.1.0',
     ng_gsmserial => '.1.3.6.1.4.1.4526.10.1.1.1.4.0',
     ng_gsmosver  => '.1.3.6.1.4.1.4526.10.1.1.1.13.0',
 );
 
-%FUNCS = ( %SNMP::Info::Layer2::FUNCS, %SNMP::Info::Entity::FUNCS, %SNMP::Info::LLDP::FUNCS, );
+%FUNCS = ( %SNMP::Info::Layer2::FUNCS, %SNMP::Info::LLDP::FUNCS, );
 
-%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::Entity::MUNGE, %SNMP::Info::LLDP::MUNGE, );
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::LLDP::MUNGE, );
 
 sub vendor {
     return 'netgear';
@@ -153,133 +152,6 @@ sub os_ver {
     return $netgear->ng_fsosver() if defined  $netgear->model and $netgear->model =~ m/FS\d/i;
 }
 
-#  Use LLDP
-
-sub hasCDP {
-    my $netgear = shift;
-    return $netgear->hasLLDP() || $netgear->SUPER::hasCDP();
-}
-
-sub c_ip {
-    my $netgear = shift;
-    my $partial = shift;
-
-    my $cdp  = $netgear->SUPER::c_ip($partial) || {};
-    my $lldp = $netgear->lldp_ip($partial)     || {};
-
-    my %c_ip;
-    foreach my $iid ( keys %$cdp ) {
-        my $ip = $cdp->{$iid};
-        next unless defined $ip;
-
-        $c_ip{$iid} = $ip;
-    }
-
-    foreach my $iid ( keys %$lldp ) {
-        my $ip = $lldp->{$iid};
-        next unless defined $ip;
-
-        $c_ip{$iid} = $ip;
-    }
-    return \%c_ip;
-}
-
-sub c_if {
-    my $netgear = shift;
-    my $partial  = shift;
-
-    my $lldp = $netgear->lldp_if($partial)     || {};
-    my $cdp  = $netgear->SUPER::c_if($partial) || {};
-
-    my %c_if;
-    foreach my $iid ( keys %$cdp ) {
-        my $if = $cdp->{$iid};
-        next unless defined $if;
-
-        $c_if{$iid} = $if;
-    }
-
-    foreach my $iid ( keys %$lldp ) {
-        my $if = $lldp->{$iid};
-        next unless defined $if;
-
-        $c_if{$iid} = $if;
-    }
-    return \%c_if;
-}
-
-sub c_port {
-    my $netgear = shift;
-    my $partial  = shift;
-
-    my $lldp = $netgear->lldp_port($partial)     || {};
-    my $cdp  = $netgear->SUPER::c_port($partial) || {};
-
-    my %c_port;
-    foreach my $iid ( keys %$cdp ) {
-        my $port = $cdp->{$iid};
-        next unless defined $port;
-
-        $c_port{$iid} = $port;
-    }
-
-    foreach my $iid ( keys %$lldp ) {
-        my $port = $lldp->{$iid};
-        next unless defined $port;
-
-        $c_port{$iid} = $port;
-    }
-    return \%c_port;
-}
-
-sub c_id {
-    my $netgear = shift;
-    my $partial  = shift;
-
-    my $lldp = $netgear->lldp_id($partial)     || {};
-    my $cdp  = $netgear->SUPER::c_id($partial) || {};
-
-    my %c_id;
-    foreach my $iid ( keys %$cdp ) {
-        my $id = $cdp->{$iid};
-        next unless defined $id;
-
-        $c_id{$iid} = $id;
-    }
-
-    foreach my $iid ( keys %$lldp ) {
-        my $id = $lldp->{$iid};
-        next unless defined $id;
-
-        $c_id{$iid} = $id;
-    }
-    return \%c_id;
-}
-
-sub c_platform {
-    my $netgear = shift;
-    my $partial  = shift;
-
-    my $lldp = $netgear->lldp_rem_sysdesc($partial)  || {};
-    my $cdp  = $netgear->SUPER::c_platform($partial) || {};
-
-    my %c_platform;
-    foreach my $iid ( keys %$cdp ) {
-        my $platform = $cdp->{$iid};
-        next unless defined $platform;
-
-        $c_platform{$iid} = $platform;
-    }
-
-    foreach my $iid ( keys %$lldp ) {
-        my $platform = $lldp->{$iid};
-        next unless defined $platform;
-
-        $c_platform{$iid} = $platform;
-    }
-    return \%c_platform;
-}
-
 1;
 
 __END__
@@ -399,49 +271,6 @@ Uses the i_name() field.
 
 =back
 
-=head2 Topology information
-
-Based upon the software version devices may support Link Layer Discovery 
-Protocol (LLDP).
-
-=over
-
-=item $netgear->hasCDP()
-
-Returns true if the device is running LLDP.
-
-=item $netgear->c_if()
-
-Returns reference to hash.  Key: iid Value: local device port (interfaces)
-
-=item $netgear->c_ip()
-
-Returns reference to hash.  Key: iid Value: remote IPv4 address
-
-If multiple entries exist with the same local port, c_if(), with the same IPv4
-address, c_ip(), it may be a duplicate entry.
-
-If multiple entries exist with the same local port, c_if(), with different
-IPv4 addresses, c_ip(), there is either a non-LLDP device in between two or
-more devices or multiple devices which are not directly connected.  
-
-Use the data from the Layer2 Topology Table below to dig deeper.
-
-=item $netgear->c_port()
-
-Returns reference to hash. Key: iid Value: remote port (interfaces)
-
-=item $netgear->c_id()
-
-Returns reference to hash. Key: iid Value: string value used to identify the
-chassis component associated with the remote system.
-
-=item $netgear->c_platform()
-
-Returns reference to hash.  Key: iid Value: Remote Device Type
-
-=back
-
 =head2 Table Methods imported from SNMP::Info::Layer2
 
 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.

Info/Layer2/Orinoco.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 # 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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,

Info/Layer3/C3550.pm

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

Info/Layer3/C4000.pm

@@ -44,7 +44,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %MIBS = (
     %SNMP::Info::MAU::MIBS,

Info/Layer3/C6500.pm

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

Info/Layer3/Cisco.pm

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

Info/Layer3/CiscoASA.pm

@@ -34,7 +34,7 @@ package SNMP::Info::Layer3::CiscoASA;
 use strict;
 use warnings;
 use Exporter;
-use SNMP::Info::CiscoStack;
+use SNMP::Info::CiscoStats;
 use SNMP::Info::Layer3;
 
 @SNMP::Info::Layer3::CiscoASA::ISA = qw/
@@ -45,22 +45,22 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
-%MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStack::MIBS, );
+%MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );
 
 %GLOBALS
-    = ( %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::CiscoStack::GLOBALS, );
+    = ( %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::CiscoStats::GLOBALS, );
 
 %FUNCS = (
     %SNMP::Info::Layer3::FUNCS,
-    %SNMP::Info::CiscoStack::FUNCS,
+    %SNMP::Info::CiscoStats::FUNCS,
     'mac_table' => 'ifPhysAddress',
 );
 
 %MUNGE = (
     %SNMP::Info::Layer3::MUNGE,
-    %SNMP::Info::CiscoStack::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE,
     'mac_table' => \&SNMP::Info::munge_mac,
 );
 
@@ -134,7 +134,7 @@ Subclass for Cisco ASA Devices
 
 =over
 
-=item SNMP::Info::CiscoStack
+=item SNMP::Info::CiscoStats
 
 =item SNMP::Info::Layer3
 
@@ -146,7 +146,7 @@ Subclass for Cisco ASA Devices
 
 =item Inherited Classes' MIBs
 
-See L<SNMP::Info::CiscoStack/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 
@@ -171,9 +171,9 @@ configured interface name instead of "Adaptive Security Appliance
 
 =back
 
-=head2 Globals imported from SNMP::Info::CiscoStack
+=head2 Globals imported from SNMP::Info::CiscoStats
 
-See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details.
+See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
 
 =head2 Global Methods imported from SNMP::Info::Layer3
 
@@ -184,9 +184,9 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a
 reference to a hash.
 
-=head2 Table Methods imported from SNMP::Info::CiscoStack
+=head2 Table Methods imported from SNMP::Info::CiscoStats
 
-See documentation in L<SNMP::Info::CiscoStack/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
 
 =head2 Table Methods imported from SNMP::Info::Layer3
 

Info/Layer3/CiscoFWSM.pm

@@ -33,29 +33,29 @@ package SNMP::Info::Layer3::CiscoFWSM;
 use strict;
 use warnings;
 use Exporter;
-use SNMP::Info::CiscoStack;
+use SNMP::Info::CiscoStats;
 use SNMP::Info::Layer3;
 
-@SNMP::Info::Layer3::CiscoFWSM::ISA = qw/SNMP::Info::CiscoStack
+@SNMP::Info::Layer3::CiscoFWSM::ISA = qw/SNMP::Info::CiscoStats
 	SNMP::Info::Layer3
 	Exporter/;
 @SNMP::Info::Layer3::CiscoFWSM::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
-%MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStack::MIBS, );
+%MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );
 
 %GLOBALS
-	= ( %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::CiscoStack::GLOBALS, );
+	= ( %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::CiscoStats::GLOBALS, );
 
 %FUNCS = (
 	%SNMP::Info::Layer3::FUNCS,
-	%SNMP::Info::CiscoStack::FUNCS,
+	%SNMP::Info::CiscoStats::FUNCS,
 );
 
-%MUNGE = ( %SNMP::Info::Layer3::MUNGE, %SNMP::Info::CiscoStack::MUNGE, );
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, %SNMP::Info::CiscoStats::MUNGE, );
 
 # For FWSMs, the ipNetToPhysicalPhysAddress table appears to be of the form:
 # $ifindex.$inetaddresstype.$proto.$ip_address -> $mac_address
@@ -163,7 +163,7 @@ Subclass for Cisco Firewall Services Modules
 
 =over
 
-=item SNMP::Info::CiscoStack
+=item SNMP::Info::CiscoStats
 
 =item SNMP::Info::Layer3
 
@@ -175,7 +175,7 @@ Subclass for Cisco Firewall Services Modules
 
 =item Inherited Classes' MIBs
 
-See L<SNMP::Info::CiscoStack/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 
@@ -183,9 +183,9 @@ See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 
 =head1 GLOBALS
 
-=head2 Globals imported from SNMP::Info::CiscoStack
+=head2 Globals imported from SNMP::Info::CiscoStats
 
-See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details.
+See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
 
 =head2 Global Methods imported from SNMP::Info::Layer3
 
@@ -221,9 +221,9 @@ the MIB to provide that information isn't supported on FWSM.
 
 =back
 
-=head2 Table Methods imported from SNMP::Info::CiscoStack
+=head2 Table Methods imported from SNMP::Info::CiscoStats
 
-See documentation in L<SNMP::Info::CiscoStack/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
 
 =head2 Table Methods imported from SNMP::Info::Layer3
 

Info/Layer3/CiscoSwitch.pm

@@ -50,7 +50,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Nexus.pm

@@ -46,7 +46,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
@@ -129,6 +129,12 @@ sub ip_table {
 
 		$ip_table{$ip} = $ip;
 	}
+
+	my $local_addrs = $nexus->_local_addr();
+	foreach my $addr (keys %$local_addrs) {
+		$ip_table{$addr} = $addr unless exists $ip_table{$addr};
+	}
+
 	return \%ip_table;
 }
 
@@ -146,6 +152,12 @@ sub ip_index {
 
 		$ip_index{$ip} = $index;
 	}
+
+	my $local_addrs = $nexus->_local_addr();
+	foreach my $addr (keys %$local_addrs) {
+		$ip_index{$addr} = 0 unless exists $ip_index{$addr};
+	}
+
 	return \%ip_index;
 }
 
@@ -163,6 +175,12 @@ sub ip_netmask {
 
 		$ip_netmask{$ip} = $netmask;
 	}
+
+	my $local_addrs = $nexus->_local_addr();
+	foreach my $addr (keys %$local_addrs) {
+		$ip_netmask{$addr} = $local_addrs->{$addr} unless exists $ip_netmask{$addr};
+	}
+
 	return \%ip_netmask;
 }
 
@@ -180,9 +198,29 @@ sub ip_broadcast {
 
 		$ip_broadcast{$ip} = $broadcast;
 	}
+
+	my $local_addrs = $nexus->_local_addr();
+	foreach my $addr (keys %$local_addrs) {
+		$ip_broadcast{$addr} = $addr unless exists $ip_broadcast{$addr};
+	}
+
 	return \%ip_broadcast;
 }
 
+sub _local_addr {
+	my $nexus = shift;
+	my $listen_addr = $nexus->udpLocalAddress() || {};
+	my %local_addr;
+	foreach my $sock (keys %$listen_addr) {
+		my $addr = $listen_addr->{$sock};
+		next if ($addr =~ /^127\./); # localhost
+		next if ($addr eq '0.0.0.0'); # "any"
+		next if ($addr =~ /^(\d+)\./ and $1 ge 224); # Class D or E space: Multicast or Experimental
+		$local_addr{$addr} = '255.255.255.255'; # Fictional netmask
+	}
+	return \%local_addr;
+}
+
 1;
 __END__
 
@@ -283,6 +321,13 @@ Each entry in this table is an IP address in use on this device.  Some
 versions do not index the table with the IPv4 address in accordance with
 the MIB definition, these overrides correct that behavior.
 
+Also, the table is augmented with IP addresses in use by UDP sockets on the 
+device, as determined by checking F<RFC1213-MIB::udpLocalAddress>. Valid 
+addresses from this table (any IPv4 that is not localhost, 0.0.0.0, Class D
+(multicast) or Class E (experimental) are added as a /32 on interface ID 0.
+This is a workaround to determine possible VPC Keepalive IP addresses on the
+device, which are probably advertised by CDP/LLDP to neighbors.
+
 =over
 
 =item $nexus->ip_index()

Info/Layer3/PacketFront.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 

Info/Layer3/Tasman.pm

@@ -30,6 +30,7 @@
 package SNMP::Info::Layer3::Tasman;
 
 use strict;
+use warnings;
 use Exporter;
 
 use SNMP::Info::Layer3;
@@ -41,7 +42,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
@@ -65,15 +66,9 @@ $VERSION = '3.17';
     'nn_ch_serial'  => 'nnchassisSerialNumber',
 );
 
-%FUNCS = (
-    %SNMP::Info::Layer3::FUNCS,
-    %SNMP::Info::MAU::FUNCS,
-);
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, %SNMP::Info::MAU::FUNCS, );
 
-%MUNGE = (
-    %SNMP::Info::Layer3::MUNGE,
-    %SNMP::Info::MAU::MUNGE,
-);
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, %SNMP::Info::MAU::MUNGE, );
 
 # use MAU-MIB for admin. duplex and admin. speed
 *SNMP::Info::Layer3::Tasman::i_duplex_admin
@@ -81,6 +76,35 @@ $VERSION = '3.17';
 *SNMP::Info::Layer3::Tasman::i_speed_admin
     = \&SNMP::Info::MAU::mau_i_speed_admin;
 
+my $module_map = {
+    ADSL_ANX_A => '1-port ADSL2+ Annex A',
+    ADSL_ANX_B => '1-port ADSL2+ Annex B',
+    BRI_2ST    => '2-port ST-interface ISDN BRI for both TDM and Packet',
+    FXO_2M     => 'Voice Interface card - 2 port FXO',
+    FXO_4M     => 'Voice Interface card - 4 port FXO',
+    FXS_2M     => 'Voice Interface card - 2 port FXS',
+    FXS_4M     => 'Voice Interface card - 4 port FXS',
+    HSSI_1     => '1-port High Speed Serial',
+    LMF_24     => '24-port 10/100 Fast Ethernet Layer2/3 switch',
+    LMG_10 =>
+        '10-port non-blocking 10/100/1000 Gigabit Ethernet Layer2/3 switch',
+    LMG_44   => '44-port 10/100/1000 Gigabit Ethernet Layer 2/3 switch',
+    LMP_24   => '24-port 10/100 fast Ethernet Layer2/3 PoE switch',
+    PVIM_A   => 'Packetized Voice Module (PVIM)',
+    SCIM_A   => 'Ipsec VPN Encryption Module',
+    SERV_MOD => 'Secure Router 4134 Server Module',
+    VCM_A =>
+        'Medium Carrier module supports up to 4 FXO or FXS Small Modules',
+    VOIP_A  => 'Packetized Voice Module (PVM)',
+    VPN_A   => 'High Performance IPsec VPN Encryption Module',
+    WDS3_1C => '1-port Clear Channel DS3',
+    WT3_1C  => '1-port Channelized T3',
+    DS3_1C  => '1-port Channelized T3',
+    WTE_1   => '1-port T1/E1 w DS0 and DS1 support for both TDM and Packet',
+    WTE_2S  => '2-port Sync and Async Serial',
+    WTE_8   => '8-port T1/E1'
+};
+
 sub vendor {
     return 'avaya';
 }
@@ -92,12 +116,14 @@ sub os {
 sub os_ver {
     my $tasman  = shift;
     my $version = $tasman->nn_sys_ver() || "";
-    my $descr   = $tasman->description()  || "";
+    my $descr   = $tasman->description() || "";
 
     # Newer versions
     return $1 if ( $version =~ /^SW:\s+(.+?)\s+/ );
+
     # Older versions
-    return $1 if ( $descr =~ /Software Version\s+=\s+[r]*(.+),/);
+    return $1 if ( $descr =~ /Software Version\s+=\s+[r]*(.+),/ );
+
     # Can't find
     return;
 }
@@ -105,9 +131,9 @@ sub os_ver {
 sub model {
     my $tasman = shift;
 
-    my $id        = $tasman->id();
+    my $id       = $tasman->id();
     my $ch_model = $tasman->nn_ch_model();
-    
+
     return $ch_model if $ch_model;
 
     my $model = &SNMP::translateObj($id);
@@ -123,13 +149,184 @@ sub serial {
     # Newer versions of the software redefined the MIB in a non-backwards
     # compatible manner.  Try the old OID first.
     my $serial = $tasman->nn_ch_op_stat();
-    # Newer versions populate status, serial should contain some numbers
-    return $serial if ($serial !~ /^\D+$/);
+
+    # Newer versions populate status, serial should contain some letters
+    # while a status is an integer
+    return $serial if ( $serial !~ /^\D+$/ );
 
     # Unfortunately newer versions don't seem to populate the newer OID.
+    # so check modules for a chassis
+    my $e_parent = $tasman->e_parent();
+
+    foreach my $iid ( keys %$e_parent ) {
+        my $parent = $e_parent->{$iid};
+        if ( $parent eq '0' ) {
+            my $ser = $tasman->e_serial($iid);
+            return $ser->{$iid};
+        }
+    }
+
+    # If everything else failed just return what is supposed to hold the
+    # serial although it probably doesn't
     return $tasman->nn_ch_serial();
 }
 
+# Slots 1–4 are Small Module slots. Slots 5–7 are Medium Module slots.
+# A Large Module spans slots 6 and 7. It will be identified as slot 6.
+
+sub e_index {
+    my $tasman = shift;
+
+    my $index = $tasman->nnchassisInfoSlotSubSlotString() || {};
+
+    # In some cases the modules are duplicated, remove duplicates
+    my %seen;
+    my %e_index;
+    foreach my $key ( keys %$index ) {
+        my $string = $index->{$key};
+        $string =~ s/\D//;
+        unless ( $seen{$string} ) {
+            $seen{$string}++;
+            $e_index{$key} = $string + 1;
+        }
+    }
+
+    return \%e_index;
+}
+
+sub e_class {
+    my $tasman = shift;
+
+    my $e_index = $tasman->e_index() || {};
+
+    my %e_class;
+    foreach my $iid ( keys %$e_index ) {
+
+        my $index = $e_index->{$iid};
+
+        if ( $index == 1 ) {
+            $e_class{$iid} = 'chassis';
+        }
+        else {
+            $e_class{$iid} = 'module';
+        }
+    }
+    return \%e_class;
+}
+
+sub e_descr {
+    my $tasman = shift;
+
+    my $e_index = $tasman->e_index()             || {};
+    my $types   = $tasman->nnchassisInfoCardType || {};
+
+    my %e_descr;
+    foreach my $iid ( keys %$e_index ) {
+        my $type = $types->{$iid};
+        next unless $type;
+
+        if ( $type =~ /^MPU/ ) {
+            $e_descr{$iid} = $tasman->model();
+        }
+        elsif ( defined $module_map->{$type} ) {
+            $e_descr{$iid} = $module_map->{$type};
+        }
+        else {
+            next;
+        }
+    }
+    return \%e_descr;
+}
+
+sub e_serial {
+    my $tasman = shift;
+
+    my $e_index = $tasman->e_index() || {};
+    my $serials = $tasman->nnchassisInfoSerialNumber() || {};
+
+    my %e_serial;
+    foreach my $iid ( keys %$e_index ) {
+        $e_serial{$iid} = $serials->{$iid} || '';
+    }
+    return \%e_serial;
+}
+
+sub e_fru {
+    my $tasman = shift;
+
+    my $e_index = $tasman->e_index() || {};
+
+    my %e_fru;
+    foreach my $iid ( keys %$e_index ) {
+        $e_fru{$iid} = "true";
+    }
+    return \%e_fru;
+}
+
+sub e_type {
+    my $tasman = shift;
+
+    my $e_index = $tasman->e_index()             || {};
+    my $types   = $tasman->nnchassisInfoCardType || {};
+
+    my %e_type;
+    foreach my $iid ( keys %$e_index ) {
+        $e_type{$iid} = $types->{$iid} || '';
+    }
+
+    return \%e_type;
+}
+
+sub e_vendor {
+    my $tasman = shift;
+
+    my $e_idx = $tasman->e_index() || {};
+
+    my %e_vendor;
+    foreach my $iid ( keys %$e_idx ) {
+        $e_vendor{$iid} = 'avaya';
+    }
+    return \%e_vendor;
+}
+
+sub e_pos {
+    my $tasman = shift;
+
+    return $tasman->e_index();
+}
+
+sub e_parent {
+    my $tasman = shift;
+
+    my $e_idx     = $tasman->e_index() || {};
+    my $e_classes = $tasman->e_class() || {};
+
+    my $cha_idx = 0;
+    foreach my $i ( keys %$e_classes ) {
+        my $class = $e_classes->{$i};
+        my $pos   = $e_idx->{$i};
+        if ( $class && $class eq 'chassis' ) {
+            $cha_idx = $pos;
+        }
+    }
+
+    my %e_parent;
+    foreach my $iid ( keys %$e_idx ) {
+        my $idx = $e_idx->{$iid};
+
+        if ( $idx == 1 ) {
+            $e_parent{$iid} = 0;
+        }
+        elsif ( $idx =~ /^(\d)\d$/ ) {
+            $e_parent{$iid} = $1;
+        }
+        else {
+            $e_parent{$iid} = $cha_idx;
+        }
+    }
+    return \%e_parent;
+}
+
 1;
 __END__
 
@@ -229,7 +426,7 @@ Grabs the os version from C<nnsysVersion>
 (C<nnenvPwrsupType.2>)
 
 =item $tasman->ps2_status()
- 
+
 (C<nnenvPwrsupStatus.2>)
 
 =item $tasman->nn_sys_ver()
@@ -270,7 +467,7 @@ to a hash.
 
 =over 4
 
-=item $stack->i_duplex_admin()
+=item $tasman->i_duplex_admin()
 
 Returns reference to hash of iid to administrative duplex setting.
 
@@ -279,7 +476,7 @@ the port administrative speed (C<portAdminSpeed>) which if set to
 autonegotiate then the duplex will also autonegotiate, otherwise it uses the
 reported port duplex (C<portDuplex>).
 
-=item $stack->i_speed_admin()
+=item $tasman->i_speed_admin()
 
 Returns reference to hash of iid to administrative speed setting.
 
@@ -287,6 +484,54 @@ C<portAdminSpeed>
 
 =back
 
+=head2 Pseudo F<ENTITY-MIB> information
+
+These methods emulate F<ENTITY-MIB> Physical Table methods using
+F<CHASSIS-MIB>. 
+
+=over
+
+=item $tasman->e_index()
+
+Returns reference to hash.  Key: IID, Value: Integer.
+
+=item $tasman->e_class()
+
+Returns reference to hash.  Key: IID, Value: General hardware type.
+
+=item $tasman->e_descr()
+
+Returns reference to hash.  Key: IID, Value: Human friendly name
+
+=item $tasman->e_vendor()
+
+Returns reference to hash.  Key: IID, Value: avaya
+
+=item $tasman->e_serial()
+
+Returns reference to hash.  Key: IID, Value: Serial number
+
+=item $tasman->e_pos()
+
+Returns reference to hash.  Key: IID, Value: The relative position among all
+entities sharing the same parent.
+
+=item $tasman->e_type()
+
+Returns reference to hash.  Key: IID, Value: Type of component/sub-component.
+
+=item $tasman->e_parent()
+
+Returns reference to hash.  Key: IID, Value: The value of e_index() for the
+entity which 'contains' this entity.  A value of zero indicates	this entity
+is not contained in any other entity.
+
+=item $entity->e_fru()
+
+BOOLEAN. Is a Field Replaceable unit?
+
+=back
+
 =head2 Table Methods imported from SNMP::Info::Layer3
 
 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.

Info/Layer3/Timetra.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %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.17';
+$VERSION = '3.18';
 
 %MIBS = (
     %SNMP::Info::Layer7::MIBS,