From b43eafd09a4e999b6f22f7a972dc3714f2739552 Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <jeneric@users.noreply.github.com>
Date: Wed, 11 Apr 2018 20:48:16 -0400
Subject: [PATCH] Use OIDs when we don't have the MIB Add Layer3::DLink test
 class

---
 lib/SNMP/Info/Layer3/DLink.pm         |  9 +++-
 xt/lib/Test/SNMP/Info/Layer3/DLink.pm | 60 +++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 xt/lib/Test/SNMP/Info/Layer3/DLink.pm

diff --git a/lib/SNMP/Info/Layer3/DLink.pm b/lib/SNMP/Info/Layer3/DLink.pm
index 45ee0608..0712b8e3 100644
--- a/lib/SNMP/Info/Layer3/DLink.pm
+++ b/lib/SNMP/Info/Layer3/DLink.pm
@@ -39,8 +39,13 @@ $VERSION = '3.54';
     %SNMP::Info::LLDP::FUNCS,
     'dlink_fw' => 'probeSoftwareRev',
     'dlink_hw' => 'probeHardwareRev',
-    'dlink_stp_i_root_port' => 'MSTP_MIB__swMSTPInstRootPort',
-    'dlink_serial_no' => 'AGENT_GENERAL_MIB__agentSerialNumber',
+    # Replaced with OID since these MIBs are no longer in the netdisco-mibs
+    # collection. Commit reference of MIB removal in netdisco-mibs:
+    # d6ec3f15861e28d220a681e7fa3b222c21664fda
+    'dlink_stp_i_root_port' => '.1.3.6.1.4.1.171.12.15.2.3.1.18',
+    'dlink_serial_no' => '.1.3.6.1.4.1.171.12.1.1.12',
+    # TODO: hardcoded OIDs using get() in method calls below should be
+    # replaced similarly and use the library getter methods
 );
 
 %MUNGE = ( %SNMP::Info::Layer3::MUNGE, %SNMP::Info::LLDP::MUNGE, );
diff --git a/xt/lib/Test/SNMP/Info/Layer3/DLink.pm b/xt/lib/Test/SNMP/Info/Layer3/DLink.pm
new file mode 100644
index 00000000..c27f8c51
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/Layer3/DLink.pm
@@ -0,0 +1,60 @@
+# Test::SNMP::Info::Layer3::DLink
+#
+# 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::DLink;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer3::DLink;
+
+# 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' => 4,
+    '_description' => 'DGS-3620-28SC Gigabit Ethernet Switch',
+
+    # SWDGS3620PRIMGMT-MIB::dlink-Dgs3620Prod-Dgs3620-28SC
+    '_id'   => '.1.3.6.1.4.1.171.10.118.2',
+    'store' => {},
+  };
+  $test->{info}->cache($cache_data);
+}
+
+1;