From b7e252b91a6e288b525dcd7423107580ab63661a Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <emiller@cpan.org>
Date: Sun, 29 Sep 2013 22:27:39 -0400
Subject: [PATCH] Overrides ipAddrTable methods, some versions do not index the
 table with the IPv4 address in accordance with the MIB definition.

Fix for device serial number to use the fabric serial number.
---
 Info/Layer3/Nexus.pm | 109 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 107 insertions(+), 2 deletions(-)

diff --git a/Info/Layer3/Nexus.pm b/Info/Layer3/Nexus.pm
index cc3ff6f3..b8c4c45c 100644
--- a/Info/Layer3/Nexus.pm
+++ b/Info/Layer3/Nexus.pm
@@ -141,11 +141,13 @@ sub os_ver {
 sub serial {
     my $nexus = shift;
 
-    my $e_class = $nexus->e_class();
+    my $e_class  = $nexus->e_class();
+    my $e_parent = $nexus->e_parent();
 
     foreach my $iid ( keys %$e_class ) {
         my $class = $e_class->{$iid} || '';
-        if ($class =~ /chassis/) {
+	my $parent = $e_parent->{$iid} || 1;
+        if ($class =~ /chassis/ && $e_parent == 0) {
 	    my $serial = $nexus->e_serial($iid);
 	    return $serial->{$iid};
 	}
@@ -174,6 +176,73 @@ sub model {
     return $model;
 }
 
+# Reported version 6.x of NX-OS doesn't use the IPv4 address as index
+# override methods in ipAddrTable
+sub ip_table {
+    my $nexus         = shift;
+    my $orig_ip_table = $nexus->orig_ip_table();
+
+    my %ip_table;
+    foreach my $iid ( keys %$orig_ip_table ) {
+	my $ip = $orig_ip_table->{$iid};
+	next unless defined $ip;
+
+	$ip_table{$ip} = $ip;
+    }
+    return \%ip_table;
+}
+
+sub ip_index {
+    my $nexus         = shift;
+    my $orig_ip_table = $nexus->orig_ip_table();
+    my $orig_ip_index = $nexus->orig_ip_index();
+
+    my %ip_index;
+    foreach my $iid ( keys %$orig_ip_table ) {
+	my $ip    = $orig_ip_table->{$iid};
+	my $index = $orig_ip_index->{$iid};
+
+	next unless ( defined $ip && defined $index );
+
+	$ip_index{$ip} = $index;
+    }
+    return \%ip_index;
+}
+
+sub ip_netmask {
+    my $nexus           = shift;
+    my $orig_ip_table   = $nexus->orig_ip_table();
+    my $orig_ip_netmask = $nexus->orig_ip_netmask();
+
+    my %ip_netmask;
+    foreach my $iid ( keys %$orig_ip_table ) {
+	my $ip      = $orig_ip_table->{$iid};
+	my $netmask = $orig_ip_netmask->{$iid};
+
+	next unless ( defined $ip && defined $netmask );
+
+	$ip_netmask{$ip} = $netmask;
+    }
+    return \%ip_netmask;
+}
+
+sub ip_broadcast {
+    my $nexus             = shift;
+    my $orig_ip_table     = $nexus->orig_ip_table();
+    my $orig_ip_broadcast = $nexus->orig_ip_broadcast();
+
+    my %ip_broadcast;
+    foreach my $iid ( keys %$orig_ip_table ) {
+	my $ip        = $orig_ip_table->{$iid};
+	my $broadcast = $orig_ip_broadcast->{$iid};
+
+	next unless ( defined $ip && defined $broadcast );
+
+	$ip_broadcast{$ip} = $broadcast;
+    }
+    return \%ip_broadcast;
+}
+
 1;
 __END__
 
@@ -306,6 +375,42 @@ Returns 1.  Use vlan indexing.
 
 =back
 
+=head2 Overrides
+
+=head3 IP Address Table
+
+Each entry in this table is an IP address in use on this device.  Some 
+versions do not index the table with the IPv4 address in accordance with
+the MIB definition, these overrides correct that behavior.
+
+=over
+
+=item $nexus->ip_index()
+
+Maps the IP Table to the IID
+
+(C<ipAdEntIfIndex>)
+
+=item $nexus->ip_table()
+
+Maps the Table to the IP address
+
+(C<ipAdEntAddr>)
+
+=item $nexus->ip_netmask()
+
+Gives netmask setting for IP table entry.
+
+(C<ipAdEntNetMask>)
+
+=item $nexus->ip_broadcast()
+
+Gives broadcast address for IP table entry.
+
+(C<ipAdEntBcastAddr>)
+
+=back
+
 =head2 Globals imported from SNMP::Info::Layer3
 
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.