diff --git a/Changes b/Changes index d3a33d7e..c6ad184f 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,29 @@ +Version 3.55 + + [NEW FEATURES] + * #253 Nexans switch support (paecker) + + [ENHANCEMENTS] + + * Increase capture of i_vlan on router interfaces in L3::Cisco + + [BUG FIXES] + + * #61 ZyXEL (X)GS1900 family MIB - Fix loop in layers method + * Fix ISA in AMAP and EDP classes + * Add missing MIB in L2::Trapeze, L2::NWSS2300, and L3::Dell + * Fix gigabit logic in i_duplex_admin() of CiscoStack + * Prevent potential undefined warnings in i_speed_admin() of L2::C2900 and + ports() of L3::C3550 + * Correct validation and IID/key used in mau_set_i_speed_admin() and + mau_set_i_duplex_admin() of MAU + * Correct typo in MIB leaf names in L3::Aironet + * Don't use MIB leafs that are not-accessible according to MIB + Version 3.54 (2018-04-01) [NEW FEATURES] + * #141 Avocent ACS files for correct discovery in Netdisco * Add support for Avocent ACS 5K/6K/8K terminal servers in Layer1::Cyclades diff --git a/MANIFEST b/MANIFEST index cff815f1..0f7bda96 100644 --- a/MANIFEST +++ b/MANIFEST @@ -58,6 +58,7 @@ lib/SNMP/Info/Layer2/Kentrox.pm lib/SNMP/Info/Layer2/N2270.pm lib/SNMP/Info/Layer2/NAP222x.pm lib/SNMP/Info/Layer2/Netgear.pm +lib/SNMP/Info/Layer2/Nexans.pm lib/SNMP/Info/Layer2/NWSS2300.pm lib/SNMP/Info/Layer2/Orinoco.pm lib/SNMP/Info/Layer2/Trapeze.pm @@ -194,6 +195,7 @@ xt/lib/Test/SNMP/Info/Layer2/Kentrox.pm xt/lib/Test/SNMP/Info/Layer2/N2270.pm xt/lib/Test/SNMP/Info/Layer2/NAP222x.pm xt/lib/Test/SNMP/Info/Layer2/Netgear.pm +xt/lib/Test/SNMP/Info/Layer2/Nexans.pm xt/lib/Test/SNMP/Info/Layer2/NWSS2300.pm xt/lib/Test/SNMP/Info/Layer2/Orinoco.pm xt/lib/Test/SNMP/Info/Layer2/Trapeze.pm diff --git a/lib/SNMP/Info/Layer2/Nexans.pm b/lib/SNMP/Info/Layer2/Nexans.pm index 9f41038f..c8843130 100644 --- a/lib/SNMP/Info/Layer2/Nexans.pm +++ b/lib/SNMP/Info/Layer2/Nexans.pm @@ -143,10 +143,10 @@ Christoph Neuhaus Version => 2 ) or die "Can't connect to DestHost.\n"; - + my $class = $nexans->class(); print "SNMP::Info determined this device to fall under subclass : $class\n"; - + =head1 DESCRIPTION Abstraction subclass for Nexans network devices. @@ -225,13 +225,9 @@ to a hash. =over -=item $nexans->i_duplex() +=item $nexans->i_name() -Return reference to hash of IIDs to current link duplex. - -=item $nexans->i_duplex_admin() - -Return reference to hash of IIDs to admin duplex setting. +Returns reference to map of IIDs to human-set port name. =back @@ -239,6 +235,19 @@ Return reference to hash of IIDs to admin duplex setting. See documentation in L for details. -=head2 +=head1 Data Munging Callback Subroutines + +=over + +=item munge_i_duplex() + +Converts duplex returned by C to either 'full' or 'half'. + +=item munge_i_duplex_admin() + +Converts duplex returned by C to either 'full', 'half', +or 'auto'. + +=back =cut diff --git a/xt/lib/Test/SNMP/Info/Layer2/Nexans.pm b/xt/lib/Test/SNMP/Info/Layer2/Nexans.pm new file mode 100644 index 00000000..6f058c54 --- /dev/null +++ b/xt/lib/Test/SNMP/Info/Layer2/Nexans.pm @@ -0,0 +1,138 @@ +# Test::SNMP::Info::Layer2::Nexans +# +# Copyright (c) 2018 Eric Miller +# 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::Layer2::Nexans; + +use Test::Class::Most parent => 'My::Test::Class'; + +use SNMP::Info::Layer2::Nexans; + +sub setup : Tests(setup) { + my $test = shift; + $test->SUPER::setup; + + # Start with a common cache that will serve most tests + my $cache_data = { + '_layers' => 2, + '_description' => 'GigaSwitch 641 Desk SFP-I ES3 (HW3/ENHANCED/SECURITY/V4.14W)', + + # NEXANS-MIB::gigaSwitch641DeskSfpTp + '_id' => '.1.3.6.1.4.1.266.1.3.70', + '_infoMgmtFirmwareVersion' => 'HW3/ENHANCED/SECURITY/V4.14W', + '_infoSeriesNo' => '12345ABC', + '_nexans_i_name' => 1, + 'store' => { + 'nexans_i_name' => { + '2' => 'testing', + '3' => '', + '5' => 'myUplink' + }, + }, + }; + $test->{info}->cache($cache_data); +} + +sub munge_i_duplex : Tests(5) { + my $test = shift; + + can_ok($test->{info}, 'munge_i_duplex'); + is(SNMP::Info::Layer2::Nexans::munge_i_duplex('up100Fdx'), 'full', q(Full duplex munges)); + is(SNMP::Info::Layer2::Nexans::munge_i_duplex('up100Hdx'), 'half', q(Half duplex munges)); + is(SNMP::Info::Layer2::Nexans::munge_i_duplex(), undef, q(Null returns undef)); + is(SNMP::Info::Layer2::Nexans::munge_i_duplex('down'), 'down', q(Down returns unmunged)); +} + +sub munge_i_duplex_admin : Tests(6) { + my $test = shift; + + can_ok($test->{info}, 'munge_i_duplex_admin'); + is(SNMP::Info::Layer2::Nexans::munge_i_duplex_admin('fix100Fdx'), 'full', q(Full duplex munges)); + is(SNMP::Info::Layer2::Nexans::munge_i_duplex_admin('fix10Hdx'), 'half', q(Half duplex munges)); + is(SNMP::Info::Layer2::Nexans::munge_i_duplex_admin('autoneg'), 'auto', q(Half duplex munges)); + is(SNMP::Info::Layer2::Nexans::munge_i_duplex_admin(), undef, q(Null returns undef)); + is(SNMP::Info::Layer2::Nexans::munge_i_duplex_admin('unk'), 'unk', q(Unknown returns unmunged)); +} + +sub vendor : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'vendor'); + is($test->{info}->vendor(), 'nexans', q(Vendor returns 'nexans')); +} + +sub model : Tests(3) { + my $test = shift; + + can_ok($test->{info}, 'model'); + is($test->{info}->model(), 'gigaSwitch641DeskSfpTp', q(Model returns expected value)); + + $test->{info}->clear_cache(); + is($test->{info}->model(), '', q(No id returns empty string)); +} + +sub os : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'os'); + is($test->{info}->os(), 'nexanos', q(Vendor returns 'nexanos')); +} + +sub os_ver : Test(3) { + my $test = shift; + + can_ok($test->{info}, 'os_ver'); + is($test->{info}->os_ver(), 'HW3/ENHANCED/SECURITY/V4.14W', q(OS Version has expected value)); + + $test->{info}->clear_cache(); + is($test->{info}->os_ver(), '', q(No data returns empty string)); +} + +sub serial : Test(3) { + my $test = shift; + + can_ok($test->{info}, 'serial'); + is($test->{info}->serial(), '12345ABC', q(Serial has expected value)); + + $test->{info}->clear_cache(); + is($test->{info}->os_ver(), '', q(No data returns undef)); +} + +sub i_name : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'i_name'); + + my $expected + = {2 => 'testing', 3 => '3', 5 => 'myUplink'}; + + cmp_deeply($test->{info}->i_name(), + $expected, q(Interface names have expected values)); +} + +1;