diff --git a/Changes b/Changes index e28e73a8..d1203222 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,7 @@ Version 3.55 [NEW FEATURES] + * #259 Add ERX (Old Juniper E-Series JunOSe) Support (robwwd) * #258 Add support for Arbor devices (robwwd) * #253 Nexans switch support (paecker) * #142 Sixnet Switch Support diff --git a/MANIFEST b/MANIFEST index a98e171d..335d8e41 100644 --- a/MANIFEST +++ b/MANIFEST @@ -87,6 +87,7 @@ lib/SNMP/Info/Layer3/Cumulus.pm lib/SNMP/Info/Layer3/Dell.pm lib/SNMP/Info/Layer3/DLink.pm lib/SNMP/Info/Layer3/Enterasys.pm +lib/SNMP/Info/Layer3/ERX.pm lib/SNMP/Info/Layer3/Extreme.pm lib/SNMP/Info/Layer3/F5.pm lib/SNMP/Info/Layer3/Force10.pm @@ -226,6 +227,7 @@ xt/lib/Test/SNMP/Info/Layer3/Cumulus.pm xt/lib/Test/SNMP/Info/Layer3/Dell.pm xt/lib/Test/SNMP/Info/Layer3/DLink.pm xt/lib/Test/SNMP/Info/Layer3/Enterasys.pm +xt/lib/Test/SNMP/Info/Layer3/ERX.pm xt/lib/Test/SNMP/Info/Layer3/Extreme.pm xt/lib/Test/SNMP/Info/Layer3/F5.pm xt/lib/Test/SNMP/Info/Layer3/Force10.pm diff --git a/META.json b/META.json index e95744b2..39e2d35d 100644 --- a/META.json +++ b/META.json @@ -363,6 +363,10 @@ "file" : "lib/SNMP/Info/Layer3/Dell.pm", "version" : "3.54" }, + "SNMP::Info::Layer3::ERX" : { + "file" : "lib/SNMP/Info/Layer3/ERX.pm", + "version" : "3.54" + }, "SNMP::Info::Layer3::Enterasys" : { "file" : "lib/SNMP/Info/Layer3/Enterasys.pm", "version" : "3.54" diff --git a/META.yml b/META.yml index 1d544516..cf06e038 100644 --- a/META.yml +++ b/META.yml @@ -259,6 +259,9 @@ provides: SNMP::Info::Layer3::Dell: file: lib/SNMP/Info/Layer3/Dell.pm version: '3.54' + SNMP::Info::Layer3::ERX: + file: lib/SNMP/Info/Layer3/ERX.pm + version: '3.54' SNMP::Info::Layer3::Enterasys: file: lib/SNMP/Info/Layer3/Enterasys.pm version: '3.54' diff --git a/README b/README index dd6bc140..90c50603 100644 --- a/README +++ b/README @@ -671,6 +671,11 @@ SUBCLASSES See documentation in SNMP::Info::Layer3::Enterasys for details. + SNMP::Info::Layer3::ERX + Subclass for Juniper ERX switches. + + See documentation in SNMP::Info::Layer3::ERX for details. + SNMP::Info::Layer3::Extreme Subclass for Extreme Networks switches. diff --git a/lib/SNMP/Info.pm b/lib/SNMP/Info.pm index 35a48ef7..fbb9b75a 100644 --- a/lib/SNMP/Info.pm +++ b/lib/SNMP/Info.pm @@ -804,6 +804,12 @@ Subclass for Enterasys devices. See documentation in L for details. +=item SNMP::Info::Layer3::ERX + +Subclass for Juniper ERX switches. + +See documentation in L for details. + =item SNMP::Info::Layer3::Extreme Subclass for Extreme Networks switches. @@ -1592,6 +1598,7 @@ sub device_type { 3375 => 'SNMP::Info::Layer3::F5', 3417 => 'SNMP::Info::Layer3::BlueCoatSG', 4526 => 'SNMP::Info::Layer2::Netgear', + 4874 => 'SNMP::Info::Layer3::ERX', 5624 => 'SNMP::Info::Layer3::Enterasys', 6027 => 'SNMP::Info::Layer3::Force10', 6486 => 'SNMP::Info::Layer3::AlcatelLucent', @@ -1685,6 +1692,7 @@ sub device_type { $objtype = 'SNMP::Info::Layer3::C3550' if $desc =~ /(C3550|C3560)/; $objtype = 'SNMP::Info::Layer3::C4000' if $desc =~ /Catalyst 4[05]00/; $objtype = 'SNMP::Info::Layer3::Foundry' if $desc =~ /foundry/i; + $objtype = 'SNMP::Info::Layer3::ERX' if $desc =~ /erx/i; # Aironet - older non-IOS $objtype = 'SNMP::Info::Layer3::Aironet' diff --git a/lib/SNMP/Info/Layer3/ERX.pm b/lib/SNMP/Info/Layer3/ERX.pm new file mode 100644 index 00000000..709f5199 --- /dev/null +++ b/lib/SNMP/Info/Layer3/ERX.pm @@ -0,0 +1,205 @@ +# SNMP::Info::Layer3::ERX +# +# Copyright (c) 2017 Rob Woodward +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the University of California, Santa Cruz nor the +# names of its contributors may be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +package SNMP::Info::Layer3::ERX; + +use strict; +use Exporter; +use SNMP::Info::Layer3; + +@SNMP::Info::Layer3::ERX::ISA = qw/ + SNMP::Info::Layer3 + Exporter +/; +@SNMP::Info::Layer3::ERX::EXPORT_OK = qw//; + +use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; + +$VERSION = '3.54'; + +%MIBS = ( + %SNMP::Info::Layer3::MIBS +); + +%GLOBALS = ( + %SNMP::Info::Layer3::GLOBALS, +); + +%FUNCS = ( + %SNMP::Info::Layer3::FUNCS, +); + +%MUNGE = ( + %SNMP::Info::Layer3::MUNGE, +); + +sub vendor { + return "Juniper"; +} + +sub model { + my $ERX = shift; + my $descr = $ERX->description() || ''; + my $model = undef; + + $model = $1 if ( $descr =~ /Juniper Networks, Inc. (.+) Edge Routing Switch/i ); + + return $model; +} + +sub os { + return 'JunOSe'; +} + +sub os_ver { + my $ERX = shift; + my $descr = $ERX->description(); + my $os_ver = undef; + + if ( $descr =~ /Version : \((.+)\) .+:/ ) { + $os_ver = $1; + } + + return $os_ver; +} + +sub i_ignore { + my $l3 = shift; + my $partial = shift; + + my $interfaces = $l3->interfaces($partial) || {}; + + my %i_ignore; + foreach my $if ( keys %$interfaces ) { + # lo0 etc + if ( $interfaces->{$if} =~ /\b(inloopback|console)\d*\b/i ) { + $i_ignore{$if}++; + } + } + return \%i_ignore; +} + +1; +__END__ + +=head1 NAME + +SNMP::Info::Layer3::ERX - SNMP Interface to ERX Layer 3 routers. + +=head1 AUTHORS + +Rob Woodward + +=head1 SYNOPSIS + + # Let SNMP::Info determine the correct subclass for you. + my $ERX = new SNMP::Info( + AutoSpecify => 1, + Debug => 1, + DestHost => 'myrouter', + Community => 'public', + Version => 2 + ) + or die "Can't connect to DestHost.\n"; + + my $class = $ERX->class(); + print "SNMP::Info determined this device to fall under subclass : $class\n"; + +=head1 DESCRIPTION + +Subclass for Juniper ERX switches + +=head2 Inherited Classes + +=over + +=item SNMP::Info::Layer3 + +=back + +=head2 Required MIBs + +=over + +=item Inherited Classes' MIBs + +See L for its own MIB requirements. + +=back + +=head1 GLOBALS + +These are methods that return scalar value from SNMP + +=over + +=item $ERX->vendor() + +Returns 'Juniper'. + +=item $ERX->os() + +Returns 'JunOSe'. + +=item $ERX->os_ver() + +Returns the software version extracted from C. + +=item $ERX->model() + +Returns the hardware model extracted from C. + +=back + +=head2 Globals imported from SNMP::Info::Layer3 + +See documentation in L for details. + +=head1 TABLE ENTRIES + +These are methods that return tables of information in the form of a reference +to a hash. + +=head2 Overrides + +=over + +=item $ERX->i_ignore() + +Returns reference to hash. Increments value of IID if port is to be ignored. + +Ignores InLoopback and Console interfaces + +=back + +=head2 Table Methods imported from SNMP::Info::Layer3 + +See documentation in L for details. + +=cut diff --git a/xt/lib/Test/SNMP/Info/Layer3/ERX.pm b/xt/lib/Test/SNMP/Info/Layer3/ERX.pm new file mode 100644 index 00000000..7372fe11 --- /dev/null +++ b/xt/lib/Test/SNMP/Info/Layer3/ERX.pm @@ -0,0 +1,92 @@ +# Test::SNMP::Info::Layer3::ERX +# +# Copyright (c) 2018 Rob Woodward +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the University of California, Santa Cruz nor the +# names of its contributors may be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +package Test::SNMP::Info::Layer3::ERX; + +use Test::Class::Most parent => 'My::Test::Class'; + +use SNMP::Info::Layer3::ERX; + +# Remove this startup override once we have full method coverage +sub startup : Tests(startup => 1) { + my $test = shift; + $test->SUPER::startup(); + + $test->todo_methods(1); +} + +sub setup : Tests(setup) { + my $test = shift; + $test->SUPER::setup; + + # Start with a common cache that will serve most tests + my $cache_data = { + '_layers' => 76, + '_description' => 'Juniper Networks, Inc. ERX-1400 Edge Routing Switch SW Version : (12.3.2 patch-0.1 [BuildId 14534]) Build Date : August 13, 2012 12:31 Copyright (c) 1999, 2001 Juniper Networks, Inc.', + '_id' => '.1.3.6.1.4.1.4874.1.1.1.1.1', + 'store' => {}, + }; + $test->{info}->cache($cache_data); +} + +sub os : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'os'); + is($test->{info}->os(), 'JunOSe', q(OS returns 'JunOSe')); +} + +sub os_ver : Tests(3) { + my $test = shift; + + can_ok($test->{info}, 'os_ver'); + is($test->{info}->os_ver(), '12.3.2 patch-0.1 [BuildId 14534]', q(OS version has expected value)); + + $test->{info}->clear_cache(); + is($test->{info}->os_ver(), undef, + q(No description returns undef OS version)); +} + +sub vendor : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'vendor'); + is($test->{info}->vendor(), 'Juniper', q(Vendor returns 'Juniper')); +} + +sub model : Tests(3) { + my $test = shift; + + can_ok($test->{info}, 'model'); + is($test->{info}->model(), 'ERX-1400', q(Model has expected value)); + + $test->{info}->clear_cache(); + is($test->{info}->model(), undef, q(No description returns undef model)); +} +1;