--- lib/MDAP/ChangeIP.pm	2007/11/16 16:21:45	49
+++ lib/MDAP/ChangeIP.pm	2007/12/05 23:13:38	85
@@ -4,28 +4,37 @@
 use warnings;
 
 use Module::Pluggable;
-use Data::Dump qw/dump/;
+use MDAP;
+use NetAddr::IP;
 
-my $debug = 0;
-my $verbose = 1;
+# start IPs
+my $ip1 = NetAddr::IP->new('192.168.1.242/24');
+my $ip2 = NetAddr::IP->new('10.0.0.1/8');
+
+my @serials = ( qw/
+	CP0636JT3SH
+	CP0644JTHJ4
+	CP0624BH55U
+	CP0703KT3PP
+/);
 
-my $serial2ip = {
-	'CP0636JT3SH' => '192.168.1.242',
-	'CP0644JTHJ4' => '192.168.1.243',
-	'CP0624BH55U' => '192.168.1.244',
-};
+my $serial2ip;
+
+foreach my $serial ( @serials ) {
+	$serial2ip->{$serial} = $ip1++ . ';' . $ip2++;
+}
 
 sub check {
 	my ( $self, $h ) = @_;
-	warn "## ",__PACKAGE__,"check(",dump($h),")" if $debug;
 
 	my $serial = $h->{'_PROD_SERIAL_NBR'} || die "no serial?";
-
 	my $ip_list = $h->{'IP_LIST'} || die "no IP_LIST";
 
 	if ( my $ip = $serial2ip->{$serial} ) {
-		if ( $ip eq $ip_list ) {
-			warn "OK ",__PACKAGE__," $serial $ip_list\n" if $verbose;
+		my $ip_only = $ip;
+		$ip_only =~ s/\/\d+//g;
+		if ( $ip eq $ip_list || $ip_only eq $ip_list ) {
+			once "OK ",__PACKAGE__," $serial $ip_list";
 			return;
 		}
 
@@ -33,26 +42,26 @@
 			$h->{'_VARIANT_FRIENDLY_NAME'}, " ",
 			$h->{'_BOARD_NAME'}, " ",
 			$h->{'_BUILD'}, " ",
-			"IP $ip_list -> $ip\n" if $verbose;
+			"IP $ip_list -> $ip\n" if $debug;
+
 		my $ip_status;
 		$ip_status->{$_}-- foreach ( split(/;/, $ip_list ) );
-		$ip_status->{$_}++ foreach ( split(/;/, $ip ) );
+		$ip_status->{$_}++ foreach ( split(/;/, $ip_only ) );
 		foreach my $current_ip ( sort { $ip_status->{$b} <=> $ip_status->{$a} } keys %$ip_status ) {
-			warn "## current_ip = $current_ip\n";
 			if ( $ip_status->{$current_ip} < 0 ) {
-				warn "-- remove IP $current_ip\n";
+				warn "-- remove IP $current_ip\n" if $debug;
 				return "ip ipdelete addr=$current_ip";
 			} elsif ( $ip_status->{$current_ip} > 0 ) {
-				warn "-- add IP $current_ip\n";
+				warn "++ add IP $current_ip\n" if $debug;
 				return "ip ipadd intf=LocalNetwork addr=$current_ip";
 			}
 		}
 		return;
 	} else {
-		warn "!! can't find serial2ip mapping for $serial IP $ip_list\n";
+		once "WARNING: unknown serial $serial assigning $ip1;$ip2";
+		$serial2ip->{$serial} = $ip1++ . ';' . $ip2++;
 		return;
 	}
 }
 
-
-
+1;