From 2301d2e60a1cb4fb0a06533f41aea44f65501537 Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Wed, 11 Apr 2018 20:12:46 -0400 Subject: [PATCH] Remove not-accessible 'cdpCacheIfIndex' MIB leaf and don't try to access it in CDP class Add CDP test class --- lib/SNMP/Info/CDP.pm | 6 ---- xt/lib/Test/SNMP/Info/CDP.pm | 55 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 xt/lib/Test/SNMP/Info/CDP.pm diff --git a/lib/SNMP/Info/CDP.pm b/lib/SNMP/Info/CDP.pm index 9d39b71c..dfacb0ba 100644 --- a/lib/SNMP/Info/CDP.pm +++ b/lib/SNMP/Info/CDP.pm @@ -58,7 +58,6 @@ $VERSION = '3.54'; ); %FUNCS = ( - 'cdp_index' => 'cdpCacheIfIndex', 'cdp_proto' => 'cdpCacheAddressType', 'cdp_addr' => 'cdpCacheAddress', 'cdp_ver' => 'cdpCacheVersion', @@ -128,11 +127,6 @@ sub hasCDP { sub cdp_if { my $cdp = shift; - # See if by some miracle Cisco implemented the cdpCacheIfIndex entry - my $cdp_index = $cdp->cdp_index(); - return $cdp_index if defined $cdp_index; - - # Nope, didn't think so. Now we fake it. my $cdp_ip = $cdp->cdp_ip(); unless ( defined $cdp_ip ) { $cdp->error_throw( diff --git a/xt/lib/Test/SNMP/Info/CDP.pm b/xt/lib/Test/SNMP/Info/CDP.pm new file mode 100644 index 00000000..11101aeb --- /dev/null +++ b/xt/lib/Test/SNMP/Info/CDP.pm @@ -0,0 +1,55 @@ +# Test::SNMP::Info::CDP +# +# 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::CDP; + +use Test::Class::Most parent => 'My::Test::Class'; + +use SNMP::Info::CDP; + +# 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 = { + 'store' => {}, + }; + $test->{info}->cache($cache_data); +} + +1; \ No newline at end of file