From 0a0766afbd48792491454449219f30f647425419 Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Tue, 17 Apr 2018 00:09:02 -0400 Subject: [PATCH] Simplify Layer3::OneAccess model method since it is returning a static string Add Layer3::OneAccess test class and POD updates --- Changes | 1 + MANIFEST | 1 + META.json | 2 +- README | 5 ++ lib/SNMP/Info.pm | 6 ++ lib/SNMP/Info/Layer3/OneAccess.pm | 11 ++- xt/lib/Test/SNMP/Info/Layer3/OneAccess.pm | 90 +++++++++++++++++++++++ 7 files changed, 109 insertions(+), 7 deletions(-) create mode 100644 xt/lib/Test/SNMP/Info/Layer3/OneAccess.pm 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 83672aca..782ca4f4 100644 --- a/MANIFEST +++ b/MANIFEST @@ -246,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 5ede1ffd..d98f2a5b 100644 --- a/META.json +++ b/META.json @@ -441,7 +441,7 @@ }, "SNMP::Info::Layer3::OneAccess" : { "file" : "lib/SNMP/Info/Layer3/OneAccess.pm", - "version" : "3.37" + "version" : "3.54" }, "SNMP::Info::Layer3::PacketFront" : { "file" : "lib/SNMP/Info/Layer3/PacketFront.pm", 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 8967300a..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. diff --git a/lib/SNMP/Info/Layer3/OneAccess.pm b/lib/SNMP/Info/Layer3/OneAccess.pm index 66845974..0a2f79fe 100644 --- a/lib/SNMP/Info/Layer3/OneAccess.pm +++ b/lib/SNMP/Info/Layer3/OneAccess.pm @@ -64,13 +64,8 @@ sub vendor { } sub model { - my $OneAccess = shift; - my $descr = $OneAccess->description() || ''; - my $model = undef; + return 'One300'; - $model = 'One300'; - - return $model; } sub os { @@ -143,6 +138,10 @@ Subclass for OneAccess Quidway switches =back +=head2 Required MIBs + +=over + =item Inherited Classes' MIBs See L for its own MIB requirements. 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;