135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- [1833182] Info/Layer2/Baystack.pm: get model number for ERS 2500 (David Sieb�rger)

Browse Source 
- [1833190] Info/Layer2/Baystack.pm: fix index_factor (David Sieb�rger)
- Revert 1.16, fixed issue upstream
This commit is contained in:
Eric Miller
2007-11-19 04:28:01 +00:00
parent bd908a6952
commit 5ac0d946a7
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Info/Layer2/Baystack.pm
View File

@@ -89,9 +89,12 @@ sub os {
my $descr = $baystack->description(); my $descr = $baystack->description();
my $model = $baystack->model(); my $model = $baystack->model();
if ((defined $model and $model =~ /(470|460|BPS|5510|5520|5530)/) and (defined $descr and $descr =~ m/SW:v[3-5]/i)) { if ((defined $model and $model =~ /(325|420|425|470|460|BPS|2500|3510|4524|4526|4548|4550|5510|5520|5530)/) and (defined $descr and $descr =~ m/SW:v[3-5]/i)) {
return 'boss'; return 'boss';
} }
if ((defined $descr and $descr =~ /Business Ethernet Switch.*SW:v/i)) {
return 'bes';
}
return 'baystack'; return 'baystack';
} }
@@ -132,7 +135,7 @@ sub model {
return '303' if (defined $descr and $descr =~ /\D303\D/); return '303' if (defined $descr and $descr =~ /\D303\D/);
return '304' if (defined $descr and $descr =~ /\D304\D/); return '304' if (defined $descr and $descr =~ /\D304\D/);
return 'BPS' if ($model =~ /BPS2000/i); return 'BPS' if ($model =~ /BPS2000/i);
return $2 if ($model =~ /(ES|ERS|BayStack|EthernetRoutingSwitch|EthernetSwitch)(\d+)/); return $2 if ($model =~ /(ES|ERS|BayStack|EthernetRoutingSwitch|EthernetSwitch)-?(\d+)/);
return $model; return $model;
} }
@@ -207,7 +210,7 @@ sub index_factor {
$op_mode = 'pure' unless defined $op_mode; $op_mode = 'pure' unless defined $op_mode;
my $index_factor = 32; 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 =~ m/(boss|bes)/) and ($op_mode eq 'pure'));
return $index_factor; return $index_factor;
} }
@@ -347,17 +350,7 @@ sub e_index {
my $stack = shift; my $stack = shift;
my $partial = shift; my $partial = shift;
# This has intimate knowledge of the implementation of e_index. return $stack->SUPER::e_index($partial) || $stack->ns_e_index($partial);
# e_index is implemented in terms of e_descr, so unlike the other
# functions below we can't just
# return $stack->SUPER::e_index($partial) || $stack->ns_e_index($partial);
# since it will call *our* e_descr. So we only call e_index if
# SUPER::e_descr works.
if ($stack->SUPER::e_descr($partial)) {
return $stack->SUPER::e_index($partial);
} else {
return $stack->ns_e_index($partial);
}
} }
sub e_class { sub e_class {