From a0a8b77f7a62618a99bc99fb337fd0972ad42c29 Mon Sep 17 00:00:00 2001 From: cvs2svn <> Date: Tue, 16 Nov 2004 01:42:33 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create tag 'ver_0_9'. Sprout from master 2004-11-16 01:42:32 UTC Max Baker 'prep' Cherrypick from master 2004-10-28 21:53:15 UTC Max Baker 'added RCS id tag and rev'd all version numbers to 0.9': Info/Layer2/Baystack.pm --- Info/Layer2/Baystack.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Info/Layer2/Baystack.pm b/Info/Layer2/Baystack.pm index 86c93cfc..34d740e2 100644 --- a/Info/Layer2/Baystack.pm +++ b/Info/Layer2/Baystack.pm @@ -35,11 +35,11 @@ use strict; use Exporter; use SNMP::Info; use SNMP::Info::Bridge; +use SNMP::Info::NortelStack; use SNMP::Info::SONMP; use SNMP::Info::RapidCity; -use SNMP::Info::NortelStack; -@SNMP::Info::Layer2::Baystack::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::SONMP SNMP::Info::RapidCity SNMP::Info::NortelStack Exporter/; +@SNMP::Info::Layer2::Baystack::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::NortelStack SNMP::Info::SONMP SNMP::Info::RapidCity Exporter/; @SNMP::Info::Layer2::Baystack::EXPORT_OK = qw//; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/; @@ -47,25 +47,25 @@ use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/; %MIBS = ( %SNMP::Info::MIBS, %SNMP::Info::Bridge::MIBS, + %SNMP::Info::NortelStack::MIBS, %SNMP::Info::SONMP::MIBS, %SNMP::Info::RapidCity::MIBS, - %SNMP::Info::NortelStack::MIBS, ); %GLOBALS = ( %SNMP::Info::GLOBALS, %SNMP::Info::Bridge::GLOBALS, + %SNMP::Info::NortelStack::GLOBALS, %SNMP::Info::SONMP::GLOBALS, %SNMP::Info::RapidCity::GLOBALS, - %SNMP::Info::NortelStack::GLOBALS, ); %FUNCS = ( %SNMP::Info::FUNCS, %SNMP::Info::Bridge::FUNCS, + %SNMP::Info::NortelStack::FUNCS, %SNMP::Info::SONMP::FUNCS, %SNMP::Info::RapidCity::FUNCS, - %SNMP::Info::NortelStack::FUNCS, 'i_name2' => 'ifName', 'i_mac2' => 'ifPhysAddress', ); @@ -78,9 +78,9 @@ $SNMP::Info::SPEED_MAP{2_000_000_000} = '1.0 Gbps'; %MUNGE = ( %SNMP::Info::MUNGE, %SNMP::Info::Bridge::MUNGE, + %SNMP::Info::NortelStack::MUNGE, %SNMP::Info::SONMP::MUNGE, %SNMP::Info::RapidCity::MUNGE, - %SNMP::Info::NortelStack::MUNGE, 'i_mac2' => \&SNMP::Info::munge_mac, ); @@ -224,7 +224,7 @@ sub index_factor { $op_mode = 'pure' unless defined $op_mode; my $index_factor = 32; - $index_factor = 64 if ((defined $model and $model =~ /(470)/) or ($os eq 'boss') and ($op_mode eq 'pure')); + $index_factor = 64 if ((defined $model and $model =~ /(470)/) or ($os eq 'BoSS') and ($op_mode eq 'pure')); return $index_factor; }