From 6256f33079d3e549277698a4523d64f61cd5be5d Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Sun, 15 Jul 2012 23:00:30 -0400 Subject: [PATCH] [2809045] Strip preceding netscreen from model name in L3::Netscreen --- ChangeLog | 1 + Info/Layer3/Netscreen.pm | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/ChangeLog b/ChangeLog index 30d557fa..92da56c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ version 2.09 [ENHANCEMENTS] * [3418918] Extreme devices now report OS as either extremeware or xos + * [2809045] Strip preceding netscreen from model name in L3::Netscreen [BUG FIXES] diff --git a/Info/Layer3/Netscreen.pm b/Info/Layer3/Netscreen.pm index 5c9b2a3f..016c5b09 100644 --- a/Info/Layer3/Netscreen.pm +++ b/Info/Layer3/Netscreen.pm @@ -92,6 +92,26 @@ sub serial { return; } +sub model { + my $netscreen = shift; + + my $id = $netscreen->id(); + + unless ( defined $id ) { + print + " SNMP::Info::Layer3::model() - Device does not support sysObjectID\n" + if $netscreen->debug(); + return; + } + + my $model = &SNMP::translateObj($id); + + return $id unless defined $model; + + $model =~ s/^netscreen//i; + return $model; +} + 1; __END__