From a38eafbf56f22a2a1a5e2a8a5ff9e5fc47506740 Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <jeneric@users.noreply.github.com>
Date: Wed, 11 Apr 2018 20:41:14 -0400
Subject: [PATCH] Increase capture of i_vlan on router interfaces in L3::Cisco
 Make sure cisco_comm_indexing() has a return value of either 1 or 0 in
 L3::Cisco Add Layer3::Cisco test class

---
 lib/SNMP/Info/Layer3/Cisco.pm         |  10 ++-
 xt/lib/Test/SNMP/Info/Layer3/Cisco.pm | 101 ++++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 xt/lib/Test/SNMP/Info/Layer3/Cisco.pm

diff --git a/lib/SNMP/Info/Layer3/Cisco.pm b/lib/SNMP/Info/Layer3/Cisco.pm
index f256c1f2..6232727e 100644
--- a/lib/SNMP/Info/Layer3/Cisco.pm
+++ b/lib/SNMP/Info/Layer3/Cisco.pm
@@ -128,9 +128,14 @@ sub i_vlan {
         if (   $i_type->{$idx} eq 'l2vlan'
             || $i_type->{$idx} eq '135' && !defined $i_vlan->{$idx} )
         {
+            # Not sure where this regex came from, anchored at end?
             if ( $i_descr->{$idx} =~ /\.(\d+)$/ ) {
                 $i_vlan->{$idx} = $1;
             }
+            # This matches 101 in 'Ethernet0.101-802.1Q vLAN subif'
+            elsif ( $i_descr->{$idx} =~ /\.(\d+)-/ ) {
+                $i_vlan->{$idx} = $1;
+            }
         }
     }
     return $i_vlan;
@@ -138,9 +143,10 @@ sub i_vlan {
 
 sub cisco_comm_indexing { 
     my $cisco = shift;
-    # If we get a VTP version, it's *extremely* likely that the device needs community based indexing
+    # If we get a VTP version, it's *extremely* likely that the device needs
+    # community based indexing
     my $vtp = $cisco->vtp_version() || '0';
-    return ($vtp ne '0');
+    return $vtp ? 1 : 0;
 }
 
 1;
diff --git a/xt/lib/Test/SNMP/Info/Layer3/Cisco.pm b/xt/lib/Test/SNMP/Info/Layer3/Cisco.pm
new file mode 100644
index 00000000..dde9a153
--- /dev/null
+++ b/xt/lib/Test/SNMP/Info/Layer3/Cisco.pm
@@ -0,0 +1,101 @@
+# Test::SNMP::Info::Layer3::Cisco
+#
+# 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::Cisco;
+
+use Test::Class::Most parent => 'My::Test::Class';
+
+use SNMP::Info::Layer3::Cisco;
+
+sub setup : Tests(setup) {
+  my $test = shift;
+  $test->SUPER::setup;
+
+  # Start with a common cache that will serve most tests
+  my $d_string = 'Cisco Internetwork Operating System Software ';
+  $d_string .= 'IOS (tm) C1700 Software (C1700-NY-M), ';
+  $d_string .= 'Version 12.2(8)YM, EARLY DEPLOYMENT RELEASE SOFTWARE (fc1)';
+  my $cache_data = {
+    '_layers'      => 78,
+    '_description' => $d_string,
+
+    # CISCO-PRODUCTS-MIB::cisco1721
+    '_id'            => '.1.3.6.1.4.1.9.1.444',
+    '_vtp_version'   => 2,
+    '_i_type'        => 1,
+    '_i_description' => 1,
+    'store'          => {
+      'i_type' => {
+        1 => 'ppp',
+        2 => 'ethernetCsmacd',
+        3 => 'other',
+        4 => 'l2vlan',
+        5 => 'l2vlan'
+      },
+      'i_description' => {
+        1 => 'Serial0',
+        2 => 'FastEthernet0',
+        3 => 'Null0',
+        4 => 'FastEthernet0.101-802.1Q vLAN subif',
+        5 => 'FastEthernet0.102-802.1Q vLAN subif'
+      },
+    },
+  };
+  $test->{info}->cache($cache_data);
+}
+
+# Only going to test the non-VTP path in this class and assume CiscoVTP will
+# test the SUPER::i_vlan method, since this class will handle traditional
+# routers that usually don't have VTP.
+sub i_vlan : Tests(3) {
+  my $test = shift;
+
+  can_ok($test->{info}, 'i_vlan');
+
+  my $expected = {4 => 101, 5 => 102};
+
+  cmp_deeply($test->{info}->i_vlan(),
+    $expected, q(802.1Q interfaces have expected VLAN values));
+
+  $test->{info}->clear_cache();
+  cmp_deeply($test->{info}->i_vlan(), {}, q(No data data returns empty hash));
+}
+
+sub cisco_comm_indexing : Tests(3) {
+  my $test = shift;
+
+  can_ok $test->{info}, 'cisco_comm_indexing';
+  is($test->{info}->cisco_comm_indexing(),
+    1, 'VTP version, Cisco community indexing on');
+
+  $test->{info}->clear_cache();
+  is($test->{info}->cisco_comm_indexing(), 0, 'Cisco community indexing off');
+}
+
+1;