From cc9a1c9f4791a5091bf961de82b0a05d6b77e6dd Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Wed, 11 Apr 2018 20:50:16 -0400 Subject: [PATCH] Make sure MIB leaf is actually in the MIB we're loading, not the imports Add Layer3::Foundry and Layer3::Force10 test classes --- lib/SNMP/Info/Layer3/Force10.pm | 2 +- lib/SNMP/Info/Layer3/Foundry.pm | 2 +- xt/lib/Test/SNMP/Info/Layer3/Force10.pm | 64 +++++++++++++++++++++++++ xt/lib/Test/SNMP/Info/Layer3/Foundry.pm | 63 ++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 xt/lib/Test/SNMP/Info/Layer3/Force10.pm create mode 100644 xt/lib/Test/SNMP/Info/Layer3/Foundry.pm diff --git a/lib/SNMP/Info/Layer3/Force10.pm b/lib/SNMP/Info/Layer3/Force10.pm index f9d5617e..348e8419 100644 --- a/lib/SNMP/Info/Layer3/Force10.pm +++ b/lib/SNMP/Info/Layer3/Force10.pm @@ -49,7 +49,7 @@ $VERSION = '3.54'; %SNMP::Info::Layer3::MIBS, %SNMP::Info::MAU::MIBS, %SNMP::Info::LLDP::MIBS, - 'F10-PRODUCTS-MIB' => 'f10Products', + 'F10-PRODUCTS-MIB' => 'f10ESeriesProducts', ); %GLOBALS = ( diff --git a/lib/SNMP/Info/Layer3/Foundry.pm b/lib/SNMP/Info/Layer3/Foundry.pm index 17d625bf..72b77ad2 100644 --- a/lib/SNMP/Info/Layer3/Foundry.pm +++ b/lib/SNMP/Info/Layer3/Foundry.pm @@ -61,7 +61,7 @@ $VERSION = '3.54'; 'FOUNDRY-SN-STACKING-MIB' => 'snStackingOperUnitRole', 'FOUNDRY-POE-MIB' => 'snAgentPoeGblPowerCapacityTotal', 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snSwGroupOperMode', - 'BROCADE-PRODUCTS-MIB' => 'sysName', + 'BROCADE-PRODUCTS-MIB' => 'brocadeProducts', ); %GLOBALS = ( diff --git a/xt/lib/Test/SNMP/Info/Layer3/Force10.pm b/xt/lib/Test/SNMP/Info/Layer3/Force10.pm new file mode 100644 index 00000000..73ac5ca7 --- /dev/null +++ b/xt/lib/Test/SNMP/Info/Layer3/Force10.pm @@ -0,0 +1,64 @@ +# Test::SNMP::Info::Layer3::Force10 +# +# 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::Layer3::Force10; + +use Test::Class::Most parent => 'My::Test::Class'; + +use SNMP::Info::Layer3::Force10; + +# 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 $d_string = 'Dell Networking OS '; + $d_string .= 'Operating System Version: 1.0 '; + $d_string .= 'Application Software Version: E8-3-16-0 '; + $d_string .= 'Series: MXL-10/40GbE '; + my $cache_data = { + '_layers' => 4, + '_description' => $d_string, + + # F10-PRODUCTS-MIB::m-MXL + '_id' => '.1.3.6.1.4.1.6027.1.4.1', + 'store' => {}, + }; + $test->{info}->cache($cache_data); +} + +1; diff --git a/xt/lib/Test/SNMP/Info/Layer3/Foundry.pm b/xt/lib/Test/SNMP/Info/Layer3/Foundry.pm new file mode 100644 index 00000000..7340f824 --- /dev/null +++ b/xt/lib/Test/SNMP/Info/Layer3/Foundry.pm @@ -0,0 +1,63 @@ +# Test::SNMP::Info::Layer3::Foundry +# +# 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::Layer3::Foundry; + +use Test::Class::Most parent => 'My::Test::Class'; + +use SNMP::Info::Layer3::Foundry; + +# 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 $d_string = 'Brocade Communications Systems, Inc. '; + $d_string .= 'Stacking System ICX6610-48-HPOE, '; + $d_string .= 'IronWare Version 08.0.00aT7f1 '; + my $cache_data = { + '_layers' => 6, + '_description' => $d_string, + + # FOUNDRY-SN-ROOT-MIB::snFastIronStackICX6610Switch + '_id' => '.1.3.6.1.4.1.1991.1.3.48.3.1', + 'store' => {}, + }; + $test->{info}->cache($cache_data); +} + +1;