Correct regex validator in mau_set_i_speed_admin() and mau_set_i_duplex_admin()
Correct IID/key used in mau_set_i_speed_admin() and mau_set_i_duplex_admin() Add MAU test class
This commit is contained in:
Eric A. Miller
@@ -277,7 +277,7 @@ sub mau_set_i_speed_admin {
|
|||||||
my $rv;
|
my $rv;
|
||||||
|
|
||||||
$speed = lc($speed);
|
$speed = lc($speed);
|
||||||
if ( !( $speed =~ /(10|100|1000|auto)/io and $iid =~ /\d+/o ) ) {
|
if ( !( $speed =~ /^(10|100|1000|auto)$/i and $iid =~ /\d+/ ) ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -298,7 +298,7 @@ sub mau_set_i_speed_admin {
|
|||||||
my $myduplex;
|
my $myduplex;
|
||||||
|
|
||||||
my $i_mau_def_type
|
my $i_mau_def_type
|
||||||
= &SNMP::translateObj( $mau->mau_type_admin($iid)->{ $iid . '.1' } );
|
= &SNMP::translateObj( $mau->mau_type_admin($key)->{ $key } );
|
||||||
|
|
||||||
if ( $i_mau_def_type =~ /^dot3MauType.*Base.*(..)$/
|
if ( $i_mau_def_type =~ /^dot3MauType.*Base.*(..)$/
|
||||||
&& ( $1 eq "HD" or $1 eq "FD" ) )
|
&& ( $1 eq "HD" or $1 eq "FD" ) )
|
||||||
@@ -315,17 +315,17 @@ sub mau_set_i_speed_admin {
|
|||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
elsif ( $speed eq "auto" ) {
|
elsif ( $speed eq "auto" ) {
|
||||||
$rv = $mau->set_mau_autostat( 'enabled', $iid . '.1' );
|
$rv = $mau->set_mau_autostat( 'enabled', $key );
|
||||||
return ($rv);
|
return ($rv);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if ( $i_autoneg eq "enabled" ) {
|
if ( $i_autoneg eq "enabled" ) {
|
||||||
$mau->set_mau_autostat( 'disabled', $iid . '.1' );
|
$mau->set_mau_autostat( 'disabled', $key );
|
||||||
}
|
}
|
||||||
$rv
|
$rv
|
||||||
= $mau->set_mau_type_admin(
|
= $mau->set_mau_type_admin(
|
||||||
'.1.3.6.1.2.1.26.4.' . $speeds{$myduplex}{$speed},
|
'.1.3.6.1.2.1.26.4.' . $speeds{$myduplex}{$speed},
|
||||||
$iid . '.1' );
|
$key );
|
||||||
|
|
||||||
return ($rv);
|
return ($rv);
|
||||||
}
|
}
|
||||||
@@ -340,7 +340,7 @@ sub mau_set_i_duplex_admin {
|
|||||||
|
|
||||||
$duplex = lc($duplex);
|
$duplex = lc($duplex);
|
||||||
|
|
||||||
if ( !( $duplex =~ /(full|half|auto)/i and $iid =~ /\d+/ ) ) {
|
if ( !( $duplex =~ /^(full|half|auto)$/i and $iid =~ /\d+/ ) ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -356,7 +356,7 @@ sub mau_set_i_duplex_admin {
|
|||||||
my $i_autoneg = $myhash->{$key};
|
my $i_autoneg = $myhash->{$key};
|
||||||
|
|
||||||
my $i_speed
|
my $i_speed
|
||||||
= &SNMP::translateObj( $mau->mau_type_admin($iid)->{ $iid . '.1' } );
|
= SNMP::translateObj( $mau->mau_type_admin($key)->{ $key } );
|
||||||
|
|
||||||
if ( $i_speed =~ /^dot3MauType(.*)Base/ && $_mau_i_speed_map{$1} ) {
|
if ( $i_speed =~ /^dot3MauType(.*)Base/ && $_mau_i_speed_map{$1} ) {
|
||||||
$i_speed = $1;
|
$i_speed = $1;
|
||||||
@@ -371,7 +371,7 @@ sub mau_set_i_duplex_admin {
|
|||||||
return (1);
|
return (1);
|
||||||
}
|
}
|
||||||
elsif ( $duplex eq "auto" ) {
|
elsif ( $duplex eq "auto" ) {
|
||||||
$rv = $mau->set_mau_autostat( 'enabled', $iid . '.1' );
|
$rv = $mau->set_mau_autostat( 'enabled', $key );
|
||||||
return ($rv);
|
return ($rv);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -380,12 +380,12 @@ sub mau_set_i_duplex_admin {
|
|||||||
if ( $i_autoneg eq "enabled"
|
if ( $i_autoneg eq "enabled"
|
||||||
&& defined( $duplexes{$i_speed}{$duplex} ) )
|
&& defined( $duplexes{$i_speed}{$duplex} ) )
|
||||||
{
|
{
|
||||||
$mau->set_mau_autostat( 'disabled', $iid . '.1' );
|
$mau->set_mau_autostat( 'disabled', $key );
|
||||||
}
|
}
|
||||||
$rv
|
$rv
|
||||||
= $mau->set_mau_type_admin(
|
= $mau->set_mau_type_admin(
|
||||||
'.1.3.6.1.2.1.26.4.' . $duplexes{$i_speed}{$duplex},
|
'.1.3.6.1.2.1.26.4.' . $duplexes{$i_speed}{$duplex},
|
||||||
$iid . '.1' );
|
$key );
|
||||||
return ($rv);
|
return ($rv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
176
xt/lib/Test/SNMP/Info/MAU.pm
Normal file
176
xt/lib/Test/SNMP/Info/MAU.pm
Normal file
@@ -0,0 +1,176 @@
|
|||||||
|
# Test::SNMP::Info::MAU
|
||||||
|
#
|
||||||
|
# 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::MAU;
|
||||||
|
|
||||||
|
use Test::Class::Most parent => 'My::Test::Class';
|
||||||
|
|
||||||
|
use SNMP::Info::MAU;
|
||||||
|
|
||||||
|
# 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 = {
|
||||||
|
'_mau_index' => 1,
|
||||||
|
'_mau_autostat' => 1,
|
||||||
|
'_mau_type_admin' => 1,
|
||||||
|
'store' => {
|
||||||
|
'fan_state' => {
|
||||||
|
101 => 'normal',
|
||||||
|
102 => 'warning',
|
||||||
|
103 => 'notPresent',
|
||||||
|
201 => 'shutdown',
|
||||||
|
202 => 'critical',
|
||||||
|
203 => 'notFunctioning'
|
||||||
|
},
|
||||||
|
'fan_descr' => {
|
||||||
|
101 => 'chassis-1 Chassis Fan Tray 1',
|
||||||
|
102 => 'chassis-1 Power Supply 1 Fan',
|
||||||
|
103 => 'chassis-1 Power Supply 2 Fan',
|
||||||
|
201 => 'chassis-2 Chassis Fan Tray 1',
|
||||||
|
202 => 'chassis-2 Power Supply 1 Fan',
|
||||||
|
203 => 'chassis-2 Power Supply 2 Fan'
|
||||||
|
},
|
||||||
|
'mau_index' => {1.1 => 1, 2.1 => 2, 3.1 => 3, 4.1 => 4, 5.1 => 5},
|
||||||
|
'mau_autostat' => {
|
||||||
|
1.1 => 'enabled',
|
||||||
|
2.1 => 'disabled',
|
||||||
|
3.1 => 'disabled',
|
||||||
|
4.1 => 'disabled',
|
||||||
|
5.1 => 'disabled'
|
||||||
|
},
|
||||||
|
|
||||||
|
# .1.3.6.1.2.1.26.4.15 = IANA-MAU-MIB::dot3MauType100BaseTXHD
|
||||||
|
# .1.3.6.1.2.1.26.4.16 = IANA-MAU-MIB::dot3MauType100BaseTXFD
|
||||||
|
# .1.3.6.1.2.1.26.4.35 = IANA-MAU-MIB::dot3MauType10GigBaseLR
|
||||||
|
'mau_type_admin' => {
|
||||||
|
1.1 => '.0.0',
|
||||||
|
2.1 => '.0.0',
|
||||||
|
3.1 => '.1.3.6.1.2.1.26.4.15',
|
||||||
|
4.1 => '.1.3.6.1.2.1.26.4.16',
|
||||||
|
5.1 => '.1.3.6.1.2.1.26.4.35',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
$test->{info}->cache($cache_data);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
sub mau_i_duplex_admin : Tests(3) {
|
||||||
|
my $test = shift;
|
||||||
|
|
||||||
|
can_ok($test->{info}, 'mau_i_duplex_admin');
|
||||||
|
|
||||||
|
my $expected
|
||||||
|
= {1 => 'auto', 2 => 'auto', 3 => 'half', 4 => 'full'};
|
||||||
|
|
||||||
|
cmp_deeply($test->{info}->mau_i_duplex_admin(),
|
||||||
|
$expected, q(Interfaces have expected duplex admin values));
|
||||||
|
|
||||||
|
$test->{info}->clear_cache();
|
||||||
|
cmp_deeply($test->{info}->mau_i_duplex_admin(),
|
||||||
|
{}, q(No duplex admin data returns empty hash));
|
||||||
|
}
|
||||||
|
|
||||||
|
sub mau_i_speed_admin : Tests(3) {
|
||||||
|
my $test = shift;
|
||||||
|
|
||||||
|
can_ok($test->{info}, 'mau_i_speed_admin');
|
||||||
|
|
||||||
|
my $expected = {1 => 'auto', 2 => 'auto', 3 => '100 Mbps', 4 => '100 Mbps', 5 => '10 Gbps'};
|
||||||
|
|
||||||
|
cmp_deeply($test->{info}->mau_i_speed_admin(),
|
||||||
|
$expected, q(Interfaces have expected speed admin values));
|
||||||
|
|
||||||
|
$test->{info}->clear_cache();
|
||||||
|
cmp_deeply($test->{info}->mau_i_speed_admin(),
|
||||||
|
{}, q(No speed admin data returns empty hash));
|
||||||
|
}
|
||||||
|
|
||||||
|
sub mau_set_i_speed_admin : Tests(3) {
|
||||||
|
my $test = shift;
|
||||||
|
|
||||||
|
# Set method uses a partial fetch which ignores the cache and reloads data
|
||||||
|
# therefore we must use the mocked session.
|
||||||
|
my $data = {
|
||||||
|
'MAU-MIB::ifMauDefaultType' => {
|
||||||
|
1.1 => '.0.0',
|
||||||
|
2.1 => '.0.0',
|
||||||
|
3.1 => '.1.3.6.1.2.1.26.4.15',
|
||||||
|
4.1 => '.1.3.6.1.2.1.26.4.16',
|
||||||
|
5.1 => '.1.3.6.1.2.1.26.4.35',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
$test->{info}{sess}{Data} = $data;
|
||||||
|
can_ok($test->{info}, 'mau_set_i_speed_admin');
|
||||||
|
|
||||||
|
is($test->{info}->mau_set_i_speed_admin('100', 3),
|
||||||
|
1, q(Mock set speed call succeeded));
|
||||||
|
|
||||||
|
is($test->{info}->mau_set_i_speed_admin('auto-x', 2),
|
||||||
|
undef, q(Mock set speed call to bad speed 'auto-x' fails));
|
||||||
|
}
|
||||||
|
|
||||||
|
sub mau_set_i_duplex_admin : Tests(3) {
|
||||||
|
my $test = shift;
|
||||||
|
|
||||||
|
# Set method uses a partial fetch which ignores the cache and reloads data
|
||||||
|
# therefore we must use the mocked session.
|
||||||
|
my $data = {
|
||||||
|
'MAU-MIB::ifMauDefaultType' => {
|
||||||
|
1.1 => '.0.0',
|
||||||
|
2.1 => '.0.0',
|
||||||
|
3.1 => '.1.3.6.1.2.1.26.4.15',
|
||||||
|
4.1 => '.1.3.6.1.2.1.26.4.16',
|
||||||
|
5.1 => '.1.3.6.1.2.1.26.4.35',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
$test->{info}{sess}{Data} = $data;
|
||||||
|
|
||||||
|
can_ok($test->{info}, 'mau_set_i_duplex_admin');
|
||||||
|
|
||||||
|
is($test->{info}->mau_set_i_duplex_admin('full', 3),
|
||||||
|
1, q(Mock set duplex call succeeded));
|
||||||
|
|
||||||
|
is($test->{info}->mau_set_i_duplex_admin('full-x', 2),
|
||||||
|
undef, q(Mock set duplex call to bad duplex type 'full-x' fails));
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
||||||
Reference in New Issue
Block a user