Merge pull request #47 from rowanthorpe/update-l2database-fixes

Improve update-l2database.pl

tools/runtime/l2database/update-l2database.pl

@@ -26,6 +26,9 @@
 # A script to poll all switches and update a database table of the known
 # MAC addresses attached to each port.
 #
+# Tested on Brocade TurboIron, FES-X6xx and
+# Extreme BD-8806, X460-48t, X650-24x(SSns) and X670V-48x. Possibly may
+# squeak on other vendors' kit due to implementation issues.
 
 use strict;
 use Net_SNMP_util;
@@ -38,6 +41,7 @@
 my $dbh = $ixpconfig->{db};
 my $debug = 0;
 my $do_nothing = 0;
+my $debug_output;
 
 my ($query, $sth, $l2mapping);
 
@@ -51,72 +55,117 @@
 	$l2mapping->{$switch} = trawl_switch_snmp($switch, $switches->{$switch}->{snmppasswd});
 }
 
-$debug && print STDERR Dumper ($l2mapping);
+if ($debug) {
+	($debug_output = Dumper($l2mapping)) =~ s/^\$VAR[0-9]+ = /\$l2mapping = /;
+	print STDERR $debug_output;
+}
 
 $query = "SELECT id, switchport, switchportid, spifname, switch, status, infrastructure FROM view_switch_details_by_custid";
 ($sth = $dbh->prepare($query)) or die "$dbh->errstr\n";
 $sth->execute() or die "$dbh->errstr\n";
 my $ports = $sth->fetchall_hashref( [qw (switch switchport)] );
 
+if ($debug) {
+	($debug_output = Dumper($ports)) =~ s/^\$VAR[0-9]+ = /\$ports = /;
+	print STDERR $debug_output;
+}
+
 my ($insertsth);
 $query = "INSERT INTO macaddress (id, firstseen, virtualinterfaceid, mac) VALUES (NULL, NOW(), ?, ?)";
 ($insertsth = $dbh->prepare($query)) or die "$dbh->errstr\n";
 
-$dbh->do('START TRANSACTION') or die $dbh->errstr;
-$dbh->do('DELETE FROM macaddress') or die $dbh->errstr;
+$do_nothing or $dbh->do('START TRANSACTION') or die $dbh->errstr;
+$do_nothing or $dbh->do('DELETE FROM macaddress') or die $dbh->errstr;
 
 foreach my $switch (keys %{$ports}) {
+	$debug && print STDERR "\n";
 	foreach my $port (keys %{$ports->{$switch}}) {
 		foreach my $mac (@{$l2mapping->{$switch}->{$port}}) {
-			$debug && printf STDERR "INSERT: $mac -> $switch:$port\n";
+			$debug && print STDERR "INSERT: $mac -> $switch:$port\n";
 			$do_nothing or $insertsth->execute($ports->{$switch}->{$port}->{id}, $mac) or die "$dbh->errstr\n";
-#		$ports->{$switch}->{$port}->{mac} = $l2mapping->{$switch}->{$port};
+#			$ports->{$switch}->{$port}->{mac} = $l2mapping->{$switch}->{$port};
 		}
 	}
 }
 
-$dbh->do('COMMIT') or die $dbh->errstr;
+$do_nothing or $dbh->do('COMMIT') or die $dbh->errstr;
 
 exit;
 
+# Source and comments(!) adapted from Net::SNMP::Mixin::Util::normalize_mac()
+# (Artistic Licensed code) found at:
+#  http://search.cpan.org/perldoc?Net%3A%3ASNMP%3A%3AMixin%3A%3AUtil
+sub normalize_mac {
+	my ($mac) = @_;
+	return unless defined $mac;
+
+	# translate this OCTET_STRING to hexadecimal, unless already translated
+	if ( length $mac == 6 ) {
+		$mac = unpack 'H*', $mac;
+	}
+
+	# to lower case
+	my $norm_address = lc($mac);
+
+	# remove '-' in bloody Microsoft format
+	$norm_address =~ s/-//g;
+
+	# remove '.' in bloody Cisco format
+	$norm_address =~ s/\.//g;
+
+	# remove '0x' in front of, we are already lower case
+	$norm_address =~ s/^0x//;
+
+	# we are already lower case
+	my $hex_digit = qr/[a-f,0-9]/;
+
+	# insert leading 0 in bloody Sun format
+	$norm_address =~ s/\b($hex_digit)\b/0$1/g;
+
+	# wrong format
+	return unless $norm_address =~ m /^$hex_digit{12}$/;
+
+	return $norm_address;
+}
+
 sub trawl_switch_snmp ($$) {
 	my($host, $snmpcommunity) = @_;
-	
+
 	$host = $snmpcommunity.'@'.$host;
-	
+
 	my @ifindex2descr = &snmpwalk($host, ".1.3.6.1.2.1.2.2.1.2");
 	my @interface2ifindex = &snmpwalk($host, ".1.3.6.1.2.1.17.1.4.1.2");
 	my @bridgehash2ifindex = &snmpwalk($host, ".1.3.6.1.2.1.17.4.3.1.2");
 	my @bridgehash2mac = &snmpwalk($host, ".1.3.6.1.2.1.17.4.3.1.1");
-	
+
 	my ($ifindex, $interfaces, $bridgehash, $macaddr);
-	
+
 	# ifindex2descr - oid -> 1001 - descr -> X460-48x Port 1
 	foreach my $entry (@ifindex2descr) {
 		my ($oid, $descr) = split(':', $entry, 2);
 		$ifindex->{$oid} = $descr;
 	}
-	
+
 	# interface2ifindex - oid -> 7 - descr -> 1007
 	foreach my $entry (@interface2ifindex) {
 		my ($oid, $descr) = split(':', $entry, 2);
 		$interfaces->{$oid} = $descr;
 	}
-	
+
 	# '136.67.225.163.42.128' => '49'	
 	foreach my $entry (@bridgehash2ifindex) {
 		my ($oid, $descr) = split(':', $entry, 2);
 		$bridgehash->{$oid} = $descr;
 	}
-	
+
 	# 136.67.225.163.42.128 - 0x8843e1a32a80
 	foreach my $entry (@bridgehash2mac) {
 		my ($oid, $descr) = split(':', $entry, 2);
-		
+
 		if (defined($ifindex->{ $interfaces->{ $bridgehash->{$oid} } })) {
-			push (@{$macaddr->{$ifindex->{ $interfaces->{ $bridgehash->{$oid} } } }}, lc(substr($descr,2)));
+			push (@{$macaddr->{$ifindex->{ $interfaces->{ $bridgehash->{$oid} } } }}, normalize_mac($descr));
 		}
 	}
-	
+
 	return $macaddr;
 }