diff --git a/DeviceMatrix.txt b/DeviceMatrix.txt index 33064bc6..9a9e0cd5 100644 --- a/DeviceMatrix.txt +++ b/DeviceMatrix.txt @@ -4,7 +4,7 @@ # This file is meant to detail the cababilities # of network devices to supply data via SNMP. -# $Id: DeviceMatrix.txt,Modified by Eric Miller 10/17/2004 +# $Id$ # Allied device-vendor: Allied Telesyn @@ -491,20 +491,22 @@ device: 2500,2600,2700 device: 4500,4600,5000 -device-family: Passport LAN +device-family: Passport/Accelar LAN arpnip: yes macsuck: yes portmac: yes duplex: both cdp: proprietary class: Layer3::Passport -note: !Code versions < 3.2 vlan based mac-suck and are unsupported. Upgrade code. -note: !3.2 code versions < 3.2.2.2 have Bridge MIB loop. Upgrade code. +note: !8600 Code versions < 3.2 vlan based mac-suck and are unsupported. Upgrade code. +note: !8600 3.2 code versions < 3.2.2.2 have Bridge MIB loop. Upgrade code. device: 8603,8606,8610 device: 8610co +device: 1050,1100,1150,1200 + # Proxim device-vendor: Proxim diff --git a/Info.pm b/Info.pm index 2121fcb8..cbf64a9a 100644 --- a/Info.pm +++ b/Info.pm @@ -438,7 +438,7 @@ See SNMP::Info::Layer3::Foundry for more info. =item SNMP::Info::Layer3::Passport -Subclass for Nortel Networks' Passport 8600 series switches. +Subclass for Nortel Networks' Passport 8600 and Accelar series switches. See SNMP::Info::Layer3::Passport for where to get MIBs required. @@ -764,7 +764,7 @@ Algorithm for Subclass Detection: Catalyst 6500, 4000, 3750 -> SNMP::Info::Layer3::C6500 Cisco Generic L3 IOS device -> SNMP::Info::Layer3::Cisco Foundry -> SNMP::Info::Layer3::Foundry - Nortel Passport LAN -> SNMP::Info::Layer3::Passport + Nortel Passport/Accelar LAN -> SNMP::Info::Layer3::Passport Alteon Ace Director -> SNMP::Info::Layer3::AlteonAD Nortel Contivity -> SNMP::Info::Layer3::Contivity Nortel BayRS Router -> SNMP::Info::Layer3::BayRS @@ -821,8 +821,10 @@ sub device_type { $objtype = 'SNMP::Info::Layer3::C6500' if ($desc =~ /cisco/i and $desc =~ /3750/); $objtype = 'SNMP::Info::Layer3::C6500' if $desc =~ /Catalyst 4000/; $objtype = 'SNMP::Info::Layer3::C6500' if $desc =~ /s72033_rp/; - # Nortel Passport 8600 + # Nortel Passport 8600, 1100, 1200 Series $objtype = 'SNMP::Info::Layer3::Passport' if $desc =~ /Passport-86/; + $objtype = 'SNMP::Info::Layer3::Passport' if $desc =~ /Passport-[1][012]/; + $objtype = 'SNMP::Info::Layer3::Passport' if $desc =~ /Accelar-1/; # Nortel Alteon AD Series $objtype = 'SNMP::Info::Layer3::AlteonAD' if $desc =~ /Alteon\s[1A][8D]/; # Nortel Contivity