135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure MIB leaf is actually in the MIB we're loading, not the imports

Browse Source 
Capture the numeric OS version
Add Layer3::Cumulus test class
This commit is contained in:
Eric A. Miller
2018-04-11 20:43:54 -04:00
parent 87a287e0c9
commit 2e18464635
2 changed files with 97 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/SNMP/Info/Layer3/Cumulus.pm
View File

@@ -53,7 +53,7 @@ $VERSION = '3.54';
%SNMP::Info::LLDP::MIBS,
%SNMP::Info::IEEE802dot3ad::MIBS,
'UCD-SNMP-MIB' => 'versionTag',
'NET-SNMP-TC' => 'netSnmpAgentOIDs',
'NET-SNMP-TC' => 'netSnmpAliasDomain',
'HOST-RESOURCES-MIB' => 'hrSystem',
);
@@ -86,7 +86,7 @@ sub os_ver {
my $descr = $netsnmp->description();
# STRING: "Cumulus Linux version 3.5.1 running on innotek GmbH VirtualBox"
return $1 if ( $descr =~ /^Cumulus Linux (\S+)\s+/ );
return $1 if ( $descr =~ /^Cumulus Linux.+(\d+\.\d+\.\d+)\s/ );
return;
}

95
xt/lib/Test/SNMP/Info/Layer3/Cumulus.pm Normal file
View File

@@ -0,0 +1,95 @@
# Test::SNMP::Info::Layer3::Cumulus
#
# 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::Cumulus;
use Test::Class::Most parent => 'My::Test::Class';
use SNMP::Info::Layer3::Cumulus;
# 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' => 72,
'_description' => 'Cumulus Linux version 3.5.1 running on innotek GmbH VirtualBox',
# Doesn't translate to model
'_id' => '.1.3.6.1.4.1.40310',
'_chassis' => 'Cumulus Networks VX Chassis',
'store' => {},
};
$test->{info}->cache($cache_data);
}
sub vendor : Tests(2) {
my $test = shift;
can_ok($test->{info}, 'vendor');
is($test->{info}->vendor(), 'Cumulus Networks', q(Vendor returns 'Cumulus Networks'));
}
sub os : Tests(2) {
my $test = shift;
can_ok($test->{info}, 'os');
is($test->{info}->os(), 'cumulus', q(OS returns 'cumulus'));
}
sub os_ver : Tests(3) {
my $test = shift;
can_ok($test->{info}, 'os_ver');
is($test->{info}->os_ver(), '3.5.1', q(OS ver is expected value));
$test->{info}->clear_cache();
is($test->{info}->os_ver(), undef, q(No description returns undef));
}
sub model : Tests(3) {
my $test = shift;
can_ok($test->{info}, 'model');
is($test->{info}->model(), 'VX Chassis', q(Model is expected value));
$test->{info}->clear_cache();
is($test->{info}->model(), undef, q(No data returns undef model));
}
1;