diff --git a/Changes b/Changes index d1203222..712103c7 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,7 @@ Version 3.55 [NEW FEATURES] + * #260 Oneaccess (robwwd) * #259 Add ERX (Old Juniper E-Series JunOSe) Support (robwwd) * #258 Add support for Arbor devices (robwwd) * #253 Nexans switch support (paecker) diff --git a/MANIFEST b/MANIFEST index 335d8e41..782ca4f4 100644 --- a/MANIFEST +++ b/MANIFEST @@ -105,6 +105,7 @@ lib/SNMP/Info/Layer3/N1600.pm lib/SNMP/Info/Layer3/Netscreen.pm lib/SNMP/Info/Layer3/NetSNMP.pm lib/SNMP/Info/Layer3/Nexus.pm +lib/SNMP/Info/Layer3/OneAccess.pm lib/SNMP/Info/Layer3/PacketFront.pm lib/SNMP/Info/Layer3/PaloAlto.pm lib/SNMP/Info/Layer3/Passport.pm @@ -245,6 +246,7 @@ xt/lib/Test/SNMP/Info/Layer3/N1600.pm xt/lib/Test/SNMP/Info/Layer3/Netscreen.pm xt/lib/Test/SNMP/Info/Layer3/NetSNMP.pm xt/lib/Test/SNMP/Info/Layer3/Nexus.pm +xt/lib/Test/SNMP/Info/Layer3/OneAccess.pm xt/lib/Test/SNMP/Info/Layer3/PacketFront.pm xt/lib/Test/SNMP/Info/Layer3/PaloAlto.pm xt/lib/Test/SNMP/Info/Layer3/Passport.pm diff --git a/META.json b/META.json index 39e2d35d..d98f2a5b 100644 --- a/META.json +++ b/META.json @@ -439,6 +439,10 @@ "file" : "lib/SNMP/Info/Layer3/Nexus.pm", "version" : "3.54" }, + "SNMP::Info::Layer3::OneAccess" : { + "file" : "lib/SNMP/Info/Layer3/OneAccess.pm", + "version" : "3.54" + }, "SNMP::Info::Layer3::PacketFront" : { "file" : "lib/SNMP/Info/Layer3/PacketFront.pm", "version" : "3.54" diff --git a/META.yml b/META.yml index cf06e038..76f7176b 100644 --- a/META.yml +++ b/META.yml @@ -316,6 +316,9 @@ provides: SNMP::Info::Layer3::Nexus: file: lib/SNMP/Info/Layer3/Nexus.pm version: '3.54' + SNMP::Info::Layer3::OneAccess: + file: lib/SNMP/Info/Layer3/OneAccess.pm + version: '3.54' SNMP::Info::Layer3::PacketFront: file: lib/SNMP/Info/Layer3/PacketFront.pm version: '3.54' diff --git a/README b/README index 90c50603..6f1076c7 100644 --- a/README +++ b/README @@ -765,6 +765,11 @@ SUBCLASSES See documentation in SNMP::Info::Layer3::Nexus for details. + SNMP::Info::Layer3::OneAccess + Subclass for OneAccess Quidway switches + + See documentation in SNMP::Info::Layer3::OneAccess for details. + SNMP::Info::Layer3::PacketFront Subclass for PacketFront DRG series CPE. diff --git a/lib/SNMP/Info.pm b/lib/SNMP/Info.pm index fbb9b75a..e57ed81b 100644 --- a/lib/SNMP/Info.pm +++ b/lib/SNMP/Info.pm @@ -914,6 +914,12 @@ Subclass for Cisco Nexus devices running NX-OS See documentation in L for details. +=item SNMP::Info::Layer3::OneAccess + +Subclass for OneAccess Quidway switches + +See documentation in L for details. + =item SNMP::Info::Layer3::PacketFront Subclass for PacketFront DRG series CPE. @@ -1610,6 +1616,7 @@ sub device_type { 10418 => 'SNMP::Info::Layer1::Cyclades', 12325 => 'SNMP::Info::Layer3::Pf', 12356 => 'SNMP::Info::Layer3::Fortinet', + 13191 => 'SNMP::Info::Layer3::OneAccess', 14179 => 'SNMP::Info::Layer2::Airespace', 14525 => 'SNMP::Info::Layer2::Trapeze', 14823 => 'SNMP::Info::Layer3::Aruba', diff --git a/lib/SNMP/Info/Layer3/OneAccess.pm b/lib/SNMP/Info/Layer3/OneAccess.pm new file mode 100644 index 00000000..0a2f79fe --- /dev/null +++ b/lib/SNMP/Info/Layer3/OneAccess.pm @@ -0,0 +1,200 @@ +# SNMP::Info::Layer3::OneAccess +# +# 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::OneAccess; + +use strict; +use Exporter; +use SNMP::Info::Layer3; + +@SNMP::Info::Layer3::OneAccess::ISA = qw/ + SNMP::Info::Layer3 + Exporter +/; +@SNMP::Info::Layer3::OneAccess::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 "OneAccess"; +} + +sub model { + return 'One300'; + +} + +sub os { + return 'oneos'; +} + +sub os_ver { + my $OneAccess = shift; + my $descr = $OneAccess->description(); + my $os_ver = undef; + + if ( $descr =~ /V(\d.+)$/ ) { + $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::OneAccess - SNMP Interface to OneAccess Layer 3 routers. + +=head1 AUTHORS + +Rob Woodward + +=head1 SYNOPSIS + + # Let SNMP::Info determine the correct subclass for you. + my $OneAccess = new SNMP::Info( + AutoSpecify => 1, + Debug => 1, + DestHost => 'myrouter', + Community => 'public', + Version => 2 + ) + or die "Can't connect to DestHost.\n"; + + my $class = $OneAccess->class(); + print "SNMP::Info determined this device to fall under subclass : $class\n"; + +=head1 DESCRIPTION + +Subclass for OneAccess Quidway 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 $OneAccess->vendor() + +Returns 'OneAccess'. + +=item $OneAccess->os() + +Returns 'oneos'. + +=item $OneAccess->os_ver() + +Returns the software version extracted from C. + +=item $OneAccess->model() + +Returns the hardware model one300. + +=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 $OneAccess->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/OneAccess.pm b/xt/lib/Test/SNMP/Info/Layer3/OneAccess.pm new file mode 100644 index 00000000..8b6f95ad --- /dev/null +++ b/xt/lib/Test/SNMP/Info/Layer3/OneAccess.pm @@ -0,0 +1,90 @@ +# Test::SNMP::Info::Layer3::OneAccess +# +# 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::OneAccess; + +use Test::Class::Most parent => 'My::Test::Class'; + +use SNMP::Info::Layer3::OneAccess; + +# 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' => 79, + '_description' => 'ONEOS5-VOIP_H323-V4.3R4E18', + '_id' => '.1.3.6.1.4.1.13191.1.1.30', + 'store' => {}, + }; + $test->{info}->cache($cache_data); +} + +sub os : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'os'); + is($test->{info}->os(), 'oneos', q(OS returns 'oneos')); +} + +sub os_ver : Tests(3) { + my $test = shift; + + can_ok($test->{info}, 'os_ver'); + is($test->{info}->os_ver(), '4.3R4E18', 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(), 'OneAccess', q(Vendor returns 'OneAccess')); +} + +sub model : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'model'); + is($test->{info}->model(), 'One300', q(Model has expected value)); +} + +1;