From 3b58ba8678e1c09a5312e2df75fb2788c5ea2633 Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Thu, 5 Apr 2018 23:23:59 -0400 Subject: [PATCH] Remove commented out code Add Layer2::Orinoco test class --- lib/SNMP/Info/Layer2/Orinoco.pm | 24 ----- xt/lib/Test/SNMP/Info/Layer2/Orinoco.pm | 134 ++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 24 deletions(-) create mode 100644 xt/lib/Test/SNMP/Info/Layer2/Orinoco.pm diff --git a/lib/SNMP/Info/Layer2/Orinoco.pm b/lib/SNMP/Info/Layer2/Orinoco.pm index b267bafe..79534160 100644 --- a/lib/SNMP/Info/Layer2/Orinoco.pm +++ b/lib/SNMP/Info/Layer2/Orinoco.pm @@ -46,8 +46,6 @@ $VERSION = '3.54'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS, - - #'ORiNOCO-MIB' => 'orinoco', ); %GLOBALS @@ -56,12 +54,6 @@ $VERSION = '3.54'; %FUNCS = ( %SNMP::Info::Layer2::FUNCS, %SNMP::Info::IEEE802dot11::FUNCS, - - # ORiNOCO-MIB:oriWirelessIfPropertiesTable - #'ori_ssid' => 'oriWirelessIfNetworkName', - #'ori_channel' => 'oriWirelessIfChannel', - #'ori_closed_sys' => 'oriWirelessIfClosedSystem', - # ORiNOCO-MIB:oriSystemInvMgmtComponentTable ); %MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::IEEE802dot11::MUNGE, ); @@ -165,22 +157,6 @@ sub interfaces { return \%interfaces; } -#sub i_ssidbcast { -# my $orinoco = shift; -# my $partial = shift; -# -# my $bcast = $orinoco->ori_closed_sys($partial) || {}; -# -# my %i_ssidbcast; -# foreach my $iid (keys %$bcast){ -# my $bc = $bcast->{$iid}; -# next unless defined $bc; -# -# $i_ssidbcast{$iid} = $bc; -# } -# return \%i_ssidbcast; -#} - 1; __END__ diff --git a/xt/lib/Test/SNMP/Info/Layer2/Orinoco.pm b/xt/lib/Test/SNMP/Info/Layer2/Orinoco.pm new file mode 100644 index 00000000..4ee2f27f --- /dev/null +++ b/xt/lib/Test/SNMP/Info/Layer2/Orinoco.pm @@ -0,0 +1,134 @@ +# Test::SNMP::Info::Layer2::Orinoco +# +# 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::Orinoco; + +use Test::Class::Most parent => 'My::Test::Class'; + +use SNMP::Info::Layer2::Orinoco; + +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' => ' AP-2000 v2.4.5(758) SN-02UT15570603 v2.0.10', + + # NTWS-REGISTRATION-DEVICES-MIB::ntwsSwitch2380 + '_id' => '.1.3.6.1.4.1.11898.2.4.6', + '_i_index' => 1, + '_i_description' => 1, + 'store' => { + 'i_index' => {1 => 1, 2 => 2, 3 => 3, 4 => 4}, + 'i_description' => {1 => 'dp0', 2 => 'lo0', 3 => 'wlc0', 4 => 'empty1'} + }, + }; + $test->{info}->cache($cache_data); +} + +sub os : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'os'); + is($test->{info}->os(), 'orinoco', q(OS returns 'orinoco')); +} + +sub os_ver : Tests(3) { + my $test = shift; + + can_ok($test->{info}, 'os_ver'); + is($test->{info}->os_ver(), '2.4.5', q(OS version returns expected value)); + + $test->{info}->clear_cache(); + is($test->{info}->os_ver(), undef, q(No description returns undef)); +} + +sub os_bin : Tests(3) { + my $test = shift; + + can_ok($test->{info}, 'os_bin'); + is($test->{info}->os_bin(), + '2.0.10', q(Firmware version returns expected value)); + + $test->{info}->clear_cache(); + is($test->{info}->os_bin(), undef, q(No description returns undef)); +} + +sub vendor : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'vendor'); + is($test->{info}->vendor(), 'proxim', q(Vendor returns 'proxim')); +} + +sub model : Tests(3) { + my $test = shift; + + can_ok($test->{info}, 'model'); + is($test->{info}->model(), 'AP-2000', q(Model has expected value)); + + $test->{info}->clear_cache(); + is($test->{info}->model(), undef, q(No description returns undef)); +} + +sub serial : Tests(3) { + my $test = shift; + + can_ok($test->{info}, 'serial'); + is($test->{info}->serial(), '02UT15570603', q(Serial has expected value)); + + $test->{info}->clear_cache(); + is($test->{info}->serial(), undef, q(No description returns undef)); +} + +sub i_ignore : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'i_ignore'); + + my $expected = {2 => 1, 4 => 1}; + + cmp_deeply($test->{info}->i_ignore(), + $expected, q(Interfaces have expected values)); +} + +sub interfaces : Tests(2) { + my $test = shift; + + can_ok($test->{info}, 'interfaces'); + + my $expected = {1 => 'dp0', 3 => 'wlc0'}; + + cmp_deeply($test->{info}->interfaces(), + $expected, q(Interfaces have expected values)); +} + +1;