diff --git a/COPYRIGHT b/COPYRIGHT index 7e160734..0ce8e7ae 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,3 +1,8 @@ +All code from version 0.7 on +Copyright (c) 2003 Max Baker +All rights reserved. + +Original Code Copyright (c) 2002,2003 Regents of the University of California All rights reserved. diff --git a/ChangeLog b/ChangeLog index 5a680ad9..ccccb181 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ SNMP::Info - Perl5 OO Interface to Network Devices and SNMP MIBs ChangeLog $Id$ -version 0.7 () +version 0.7 (08/14/03) * Added Class for Catalyst 6500 Series - Layer3::C6500 * Added CiscoVTP support to 3550,2900, and Catalyst classes * Extracted VLAN stuff from Layer2::Catalyst to SNMP::Info::CiscoVTP diff --git a/Info.pm b/Info.pm index 0912dc5c..a344aa88 100644 --- a/Info.pm +++ b/Info.pm @@ -1,6 +1,8 @@ # SNMP::Info - Max Baker # $Id$ # +# Portions Copyright (c) 2003 Max Baker +# All rights reserved. # Copyright (c) 2002-3, Regents of the University of California # All rights reserved. # @@ -27,13 +29,14 @@ SNMP::Info - Object Oriented Perl5 Interface to Network devices and MIBs through =head1 VERSION -SNMP::Info - Version 0.6 +SNMP::Info - Version 0.7 =head1 AUTHOR -Max Baker (C) +Max Baker SNMP::Info was created at UCSC for the netdisco project (www.netdisco.org) +and is now maintained by Max Baker. =head1 SYNOPSIS @@ -186,6 +189,28 @@ by running cd /usr/local/share/snmp/mibs tar xvfz /path/to/v1.tar.gz BRIDGE-MIB.my SNMP-REPEATER-MIB.my ESSWITCH-MIB.my +=item Fix CISCO-TC-MIB + +There is a problem with the Cisco file F which +is included from lots of other MIBs. Make the following changes +if you run into errors about C in this file. + +Edit F + +Comment out line 192 that says C with two dashes. + + -- SMI Unsigned32 + +Add C to the imports after line 19: + + IMPORTS + MODULE-IDENTITY, + Gauge32, + Integer32, + Counter64, + Unsigned32, + FROM SNMPv2-SMI + =item More Specific MIBs Some non-cisco subclasses will need MIBs other than the basic one available from Cisco. @@ -2151,6 +2176,10 @@ sub AUTOLOAD { =head1 COPYRIGHT AND LICENCE +Portions +Copyright (c) 2003 Max Baker - All rights reserved. + +Original Code Copyright (c) 2002-3, Regents of the University of California All rights reserved. diff --git a/Info/Bridge.pm b/Info/Bridge.pm index cbdd5689..75a2d7c2 100644 --- a/Info/Bridge.pm +++ b/Info/Bridge.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Bridge; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/CDP.pm b/Info/CDP.pm index b29b59bf..420d30fe 100644 --- a/Info/CDP.pm +++ b/Info/CDP.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::CDP; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/CiscoStats.pm b/Info/CiscoStats.pm index 60b326a1..f18493c4 100644 --- a/Info/CiscoStats.pm +++ b/Info/CiscoStats.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::CiscoStats; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Entity.pm b/Info/Entity.pm index 62072f2e..8b2f2527 100644 --- a/Info/Entity.pm +++ b/Info/Entity.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Entity; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/EtherLike.pm b/Info/EtherLike.pm index e8e6b4e4..3aff1879 100644 --- a/Info/EtherLike.pm +++ b/Info/EtherLike.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::EtherLike; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer1.pm b/Info/Layer1.pm index 344cf30a..4c4ab658 100644 --- a/Info/Layer1.pm +++ b/Info/Layer1.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer1; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer1/Allied.pm b/Info/Layer1/Allied.pm index a657f63a..cbdf6bf1 100644 --- a/Info/Layer1/Allied.pm +++ b/Info/Layer1/Allied.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer1::Allied; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer1/Asante.pm b/Info/Layer1/Asante.pm index 14b413e4..f0a901b7 100644 --- a/Info/Layer1/Asante.pm +++ b/Info/Layer1/Asante.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer1::Asante; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer2/Aironet.pm b/Info/Layer2/Aironet.pm index 0769d555..f0eb20d2 100644 --- a/Info/Layer2/Aironet.pm +++ b/Info/Layer2/Aironet.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer2::Aironet; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer2/Bay.pm b/Info/Layer2/Bay.pm index 7d500648..49ec0aba 100644 --- a/Info/Layer2/Bay.pm +++ b/Info/Layer2/Bay.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer2::Bay; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer2/C1900.pm b/Info/Layer2/C1900.pm index 8799e560..b146b2a5 100644 --- a/Info/Layer2/C1900.pm +++ b/Info/Layer2/C1900.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer2::C1900; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer2/HP.pm b/Info/Layer2/HP.pm index 08532c37..0a446a55 100644 --- a/Info/Layer2/HP.pm +++ b/Info/Layer2/HP.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer2::HP; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer3.pm b/Info/Layer3.pm index 5f0c1758..5f816e0a 100644 --- a/Info/Layer3.pm +++ b/Info/Layer3.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer3; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer3/Aironet.pm b/Info/Layer3/Aironet.pm index fc837e25..eba335ca 100644 --- a/Info/Layer3/Aironet.pm +++ b/Info/Layer3/Aironet.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer3::Aironet; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/Layer3/Foundry.pm b/Info/Layer3/Foundry.pm index 639cd3af..e9e8f1f6 100644 --- a/Info/Layer3/Foundry.pm +++ b/Info/Layer3/Foundry.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::Layer3::Foundry; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/Info/MAU.pm b/Info/MAU.pm index 6a06b101..1a87e185 100644 --- a/Info/MAU.pm +++ b/Info/MAU.pm @@ -28,7 +28,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package SNMP::Info::MAU; -$VERSION = 0.6; +$VERSION = 0.7; # $Id$ use strict; diff --git a/MANIFEST b/MANIFEST index 2b7c391a..c1b79b15 100644 --- a/MANIFEST +++ b/MANIFEST @@ -4,12 +4,15 @@ Info.pm Info/Bridge.pm Info/CDP.pm Info/CiscoStats.pm +Info/CiscoStack.pm +Info/CiscoVTP.pm Info/Entity.pm Info/EtherLike.pm Info/Layer1.pm Info/Layer1/Allied.pm Info/Layer1/Asante.pm Info/Layer2.pm +Info/Layer2/Aironet.pm Info/Layer2/Bay.pm Info/Layer2/C1900.pm Info/Layer2/C2900.pm @@ -18,6 +21,7 @@ Info/Layer2/HP.pm Info/Layer3.pm Info/Layer3/Aironet.pm Info/Layer3/C3550.pm +Info/Layer3/C6500.pm Info/Layer3/Foundry.pm Info/MAU.pm MANIFEST @@ -25,3 +29,5 @@ Makefile.PL README t/prereq.t t/test_class.pl +t/make_dev_matrix.pl +DeviceMatrix.txt diff --git a/Makefile.PL b/Makefile.PL index ea0d270b..e948d8fe 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -21,5 +21,6 @@ WriteMakefile( sub MY::postamble { " .PHONY: readme -readme: +readme: README +README: Info.pm pod2text -l Info.pm > README" } diff --git a/README b/README index d1d57d4c..c6d16c39 100644 --- a/README +++ b/README @@ -5,14 +5,14 @@ NAME VERSION - SNMP::Info - Version 0.6 + SNMP::Info - Version 0.7 AUTHOR - Max Baker ("max@warped.org") + Max Baker SNMP::Info was created at UCSC for the netdisco project - (www.netdisco.org) + (www.netdisco.org) and is now maintained by Max Baker. SYNOPSIS @@ -160,6 +160,27 @@ DESCRIPTION cd /usr/local/share/snmp/mibs tar xvfz /path/to/v1.tar.gz BRIDGE-MIB.my SNMP-REPEATER-MIB.my ESSWITCH-MIB.my + Fix CISCO-TC-MIB + There is a problem with the Cisco file CISCO-TC.my which is + included from lots of other MIBs. Make the following changes if + you run into errors about "Unsigned32" in this file. + + Edit /usr/local/share/snmp/mibs/CISCO-TC.my + + Comment out line 192 that says "SMI Unsigned32" with two dashes. + + -- SMI Unsigned32 + + Add "Unsigned32" to the imports after line 19: + + IMPORTS + MODULE-IDENTITY, + Gauge32, + Integer32, + Counter64, + Unsigned32, + FROM SNMPv2-SMI + More Specific MIBs Some non-cisco subclasses will need MIBs other than the basic one available from Cisco. @@ -302,6 +323,11 @@ DESCRIPTION SNMP::Info::Layer3::C3550 Subclass for Cisco Catalyst 3550 2/3 switches running IOS. + Thanks + + Thanks for testing and coding help (in no particular order) to : Andy + Ford, Brian Wilson, Jean-Philippe Luiggi, Dána Watanabe + USAGE Constructor @@ -393,13 +419,15 @@ USAGE Layer3 Support -> SNMP::Info::Layer3 Aironet (non IOS) -> SNMP::Info::Layer3::Aironet Catalyst 3550 -> SNMP::Info::Layer3::C3550 + Catalyst 6500 -> SNMP::Info::Layer3::C6500 Foundry -> SNMP::Info::Layer3::Foundry Elsif Layer2 (no Layer3) -> SNMP::Info::Layer2 Aironet (Cisco) AP1100 -> SNMP::Info::Layer2::Aironet Bay Networks -> SNMP::Info::Layer2::Bay Catalyst 1900 -> SNMP::Info::Layer2::C1900 - Catalyst 2900XL (IOS) -> SNMP::Info::Layer2::C2900 - Catalyst WS-C (2926,5xxx,6xxx) -> SNMP::Info::Layer2::Catalyst + Catalyst 2900XL/2950(IOS) -> SNMP::Info::Layer2::C2900 + Catalyst 3550/3548 -> SNMP::Info::Layer3::C3550 + Catalyst WS-C 2926,5xxx -> SNMP::Info::Layer2::Catalyst HP Procurve -> SNMP::Info::Layer2::HP Elsif Layer1 Support -> SNMP::Info::Layer1 Allied -> SNMP::Info::Layer1::Allied @@ -988,27 +1016,35 @@ SNMP::INFO INTERNALS Makes human friendly speed ratings using %SPEED_MAP %SPEED_MAP = ( + '56000' => '56 kbps', '64000' => '64 kbps', '1500000' => '1.5 Mbps', + '1536000' => 'T1', '1544000' => 'T1', '2000000' => '2.0 Mbps', '2048000' => '2.048 Mbps', + '3072000' => 'Dual T1', + '3088000' => 'Dual T1', '4000000' => '4.0 Mbps', '10000000' => '10 Mbps', '11000000' => '11 Mbps', '20000000' => '20 Mbps', '16000000' => '16 Mbps', - '45000000' => 'DS3', + '44736000' => 'T3', + '45000000' => '45 Mbps', '45045000' => 'DS3', '64000000' => '64 Mbps', '100000000' => '100 Mbps', - '149760000' => 'OC-1' - '155000000' => 'OC-1' + '149760000' => 'ATM on OC-3', + '155000000' => 'OC-3', + '155519000' => 'OC-3', + '155520000' => 'OC-3', '400000000' => '400 Mbps', + '599040000' => 'ATM on OC-12', '622000000' => 'OC-12', - '599040000' => 'OC-12', + '622080000' => 'OC-12', '1000000000' => '1.0 Gbps', - ); + ) munge_ip() Takes a binary IP and makes it dotted ASCII @@ -1141,8 +1177,10 @@ SNMP::INFO INTERNALS COPYRIGHT AND LICENCE - Copyright (c) 2002-3, Regents of the University of California All rights - reserved. + Portions Copyright (c) 2003 Max Baker - All rights reserved. + + Original Code Copyright (c) 2002-3, Regents of the University of + California All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are