From 6cd01c188df28db345485fa2ccd186d8701136f2 Mon Sep 17 00:00:00 2001
From: Robert Drake <rfdrake@gmail.com>
Date: Mon, 20 Jan 2014 16:48:01 -0500
Subject: [PATCH] adding support for more mac-address-table formats

Had to make the regex pretty generic because of Cisco changing it on
many platforms.  However, the order of MAC dynamic...interface<EOL>
seems to be universal from what I've found, and there doesn't seem to be
false positives, so I'm hoping it should be a safe change.

I've also added unit tests for the regexs in t/arp.t
---
 lib/Netdot/Model/Device/CLI/CiscoIOS.pm |  3 +-
 t/arp.t                                 | 78 +++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 t/arp.t

diff --git a/lib/Netdot/Model/Device/CLI/CiscoIOS.pm b/lib/Netdot/Model/Device/CLI/CiscoIOS.pm
index 1be0269cb..2d9f5050a 100644
--- a/lib/Netdot/Model/Device/CLI/CiscoIOS.pm
+++ b/lib/Netdot/Model/Device/CLI/CiscoIOS.pm
@@ -259,10 +259,11 @@ sub _get_fwt_from_cli {
     # ------+----------------+--------+-----+----------+--------------------------
     #    128  0024.b20e.fe0f   dynamic  Yes        255   Gi9/22
     # *  703  0022.91a9.6100   dynamic  Yes          5   Fa2/13
+    # *   10  0022.91a9.6100   dynamic  Yes   Gi3/9                             (c6500 sup2)
 
     foreach my $line ( @output ) {
 	chomp($line);
-	if ( $line =~ /^.*($CISCO_MAC)\s+dynamic\s+\S+\s+\S+\s+(\S+)\s*$/o ) {
+	if ( $line =~ /^.*($CISCO_MAC)\s+dynamic\s+.*?(\S+)\s*$/o ) {
 	    $mac   = $1;
 	    $iname = $2;
 	}else{
diff --git a/t/arp.t b/t/arp.t
new file mode 100644
index 000000000..d95dce1b3
--- /dev/null
+++ b/t/arp.t
@@ -0,0 +1,78 @@
+use strict;
+use warnings;
+use Test::More;
+use lib "lib";
+
+# these duplicate the regex in Netdot::Model::Device::CLI::CiscoIOS and give
+# test cases for types of arp/mac-address-table/neighbor entries we might
+# encounter.
+
+
+# duplicating these because if we call the Netdot functions it connects to a
+# database even though we're testing, which is overkill.
+my $CISCO_MAC = '\w{4}\.\w{4}\.\w{4}';
+my $IPV4 = '\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}';
+my $HD   = '[0-9A-Fa-f]{1,4}'; # Hexadecimal digits, 2 bytes
+my $V6P1 = "(?:$HD:){7}$HD";
+my $V6P2 = "(?:$HD(?:\:$HD){0,6})?::(?:$HD(?:\:$HD){0,6})?";
+my $IPV6 = "$V6P1|$V6P2"; # Note: Not strictly a valid V6 address
+
+
+{
+my $arp = << 'ARP';
+Internet  10.82.250.129           -   0000.0c9f.f002  ARPA GigabitEthernet0/3.2335";
+ARP
+
+foreach my $line (split/\n/, $arp) {
+    if ( $line =~ /^Internet\s+($IPV4)\s+[-\d]+\s+($CISCO_MAC)\s+ARPA\s+(\S+)/o )
+    {
+        my $ip    = $1;
+        my $mac   = $2;
+        my $iname = $3;
+        ok($2 eq '0000.0c9f.f002', 'arp match');
+    } else {
+        ok(0, 'arp match');
+        diag("Line doesn't match: $line\n");
+    }
+}
+
+}
+
+{
+my $fdb = << 'FDB';
+   128  0022.91a9.6100   dynamic  Yes        255   Gi9/22
+*  703  0022.91a9.6100   dynamic  Yes          5   Fa2/13
+*   10  0022.91a9.6100   dynamic  Yes   Gi3/9
+ 901      0022.91a9.6100   dynamic ip,ipx,assigned,other TenGigabitEthernet1/14
+Te1/16    0022.91a9.6100   dynamic ip,ipx,assigned,other TenGigabitEthernet1/16
+FDB
+
+
+foreach my $line (split(/\n/, $fdb)) {
+    if ( $line =~ /^.*($CISCO_MAC)\s+dynamic\s+.*?(\S+)\s*$/o ) {
+        ok($1 eq '0022.91a9.6100','fwt match');
+    } else {
+        ok(0, 'fwt match');
+        diag("Line doesn't match: $line\n");
+    }
+}
+
+}
+
+{
+my $v6nd = << 'ND';
+FE80::219:E200:3B7:1920                     0 0019.e2b7.1920  REACH Gi0/2.3
+ND
+
+foreach my $line (split(/\n/, $v6nd)) {
+    if ( $line =~ /^($IPV6)\s+\d+\s+($CISCO_MAC)\s+\S+\s+(\S+)/o ) {
+        ok($2 eq '0019.e2b7.1920','nd match');
+    } else {
+        ok(0, 'nd match');
+        diag("Line doesn't match: $line\n");
+    }
+}
+
+}
+
+done_testing();