===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.25
retrieving revision 1.30
diff -u -r1.25 -r1.30
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/02 17:50:09	1.25
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/06 23:00:31	1.30
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: update_trango.pl,v 1.24 2007/02/02 16:29:58 mike Exp $
+# $RedRiver: update_trango.pl,v 1.29 2007/02/05 16:37:20 mike Exp $
 ########################################################################
 # update_trango.pl *** Updates trango hosts with a new firmware
 # 
@@ -10,9 +10,7 @@
 
 use YAML qw/ LoadFile /;
 use Net::TFTP;
-use lib '.';
 use Net::Telnet::Trango;
-use RedRiver::Wireless;
 
 my $config_file = shift || 'update_trango.yaml';
 my $max_tries = 3;
@@ -22,15 +20,41 @@
 $l->sp("Reading config file '$config_file'");
 my $conf = LoadFile($config_file);
 
-$l->sp("Reading hosts");
-my $hosts = RedRiver::Wireless::Read_Hosts();
+my $hosts;
+if (@ARGV) {
+    @{ $hosts } = map { { name => $_, group => 'Trango-Client' } } @ARGV
+} else {
+    $hosts = parse_hosts($conf->{hosts});
+}
 
+#@{ $hosts } = grep { $_->{name} eq '10.100.7.2' } @{ $hosts };
 
+my $global_tries = $max_tries * 2;
+while ($global_tries > 0) { 
+  $global_tries--;
+  my $processed = 0;
 
+
 foreach my $host (@{ $hosts }) {
-  next if $host->{group} !~ /^Trango/;
+
+  if (! exists $host->{retry}) {
+    $host->{tries} = 0;
+    $host->{retry} = 1;
+  }
+
+  if ($host->{tries} >= $max_tries) {
+    $host->{retry} = 0;
+  }
+
+  if ($host->{retry} <= 0) {
+    next;
+  }
+
+  $host->{tries}++;
+  $processed++;
+
   $l->sp("");
-  $l->sp("Checking: $host->{name}");
+  $l->sp("Checking: $host->{name} (try $host->{tries})");
   my $needs_reboot = 0;
 
   ## Connect and login.
@@ -46,48 +70,46 @@
 
   my $password = $host->{Telnet_Password} || $conf->{general}->{password};
 
-  if ($host->{group} !~ /Client$/) {
-    $l->p("Logging in");
-    $t->login($password);
-    unless ($t->logged_in) {
-      $l->p('Failed!');
-      $t->close;
-      next;
-    }
+  $l->p("Logging in");
+  $t->login($password);
+  unless ($t->logged_in) {
+    $l->p('Failed!');
+    $t->close;
+    next;
+  }
 
-    $l->sp("Getting sudb");
-    my $sudb = $t->sudb_view;
-    if ($sudb) {
-      foreach my $su (@{ $sudb }) {
-        $l->p("Getting su info $su->{suid}");
-        my $su_info = $t->su_info( $su->{suid} ); 
-        if ($su_info->{ip}) {
-          $l->sp("Adding host $su_info->{ip}");
-          my $new_host = {
-            Telnet_Password => $host->{Telnet_Password},
-            group   => $host->{group} . '-Client',
-            name    => $su_info->{ip},
-            remarks => $su_info->{remarks},
-          };
-          push @{ $hosts }, $new_host;
-        } else {
-          $l->sp("Couldn't get su info for $su->{suid}");
-          if ($su_info->{ERR}) {
-            $l->sp("ERR: $su_info->{ERR}");
-          }
+  $l->sp("Getting sudb");
+  my $sudb = $t->sudb_view;
+  if ($sudb) {
+    foreach my $su (@{ $sudb }) {
+      $l->p("Getting su info $su->{suid}");
+      my $su_info = $t->su_info( $su->{suid} ); 
+      if ($su_info->{ip}) {
+        if (grep { $_->{name} eq $su_info->{'ip'} } @{ $hosts }) {
+          $l->p("Already have $su_info->{ip}");
           next;
         }
+        $l->sp("Adding host $su_info->{ip}");
+        my $new_host = {
+          password => $host->{password},
+          name     => $su_info->{ip},
+          remarks  => $su_info->{remarks},
+        };
+        push @{ $hosts }, $new_host;
+      } else {
+        $l->sp("Couldn't get su info for $su->{suid}");
+        $l->sp("ERR: " . $t->last_error);
       }
     }
-  } 
+  }
 
   foreach my $firmware_type ('Firmware', 'FPGA') {
 
     if (! exists $conf->{$firmware_type}) {
-	  $l->s("No configs for '$firmware_type'");
-	  $t->close;
-	  next;
-	}
+      $l->s("No configs for '$firmware_type'");
+      $t->close;
+      next;
+    }
 
     my $host_type = $t->host_type;
     if ($firmware_type eq 'FPGA') {
@@ -95,11 +117,19 @@
     }
 
     if (! exists $conf->{$firmware_type}->{$host_type}) {
-	  $l->sp("No '$firmware_type' config for type $host_type");
-	  $t->close;
-	  next;
-	}
+      $l->sp("No '$firmware_type' config for type $host_type");
+      $t->close;
+      next;
+    }
 
+    if ($firmware_type eq 'Firmware' && 
+      $t->firmware_version eq 
+      $conf->{$firmware_type}->{$host_type}->{ver}
+    ) {
+      $l->sp("Firmware already up to date");
+      next;
+    }
+
     if (! $t->logged_in) {
       $l->p("Logging in");
       $t->login($password);
@@ -110,25 +140,26 @@
       }
     }
 
-	foreach my $k (keys %{ $conf->{general} }) {
-	  $conf->{$firmware_type}->{$host_type}->{$k} ||= $conf->{general}->{$k};
+    foreach my $k (keys %{ $conf->{general} }) {
+      $conf->{$firmware_type}->{$host_type}->{$k} ||= $conf->{general}->{$k};
     }
-	$conf->{$firmware_type}->{$host_type}->{firmware_type} ||= $firmware_type;
-	$conf->{$firmware_type}->{$host_type}->{type} = $host_type;
+    $conf->{$firmware_type}->{$host_type}->{firmware_type} ||= $firmware_type;
+    $conf->{$firmware_type}->{$host_type}->{type} = $host_type;
 
     $l->sp("$host_type $firmware_type");
-    $l->p("Sending commands");
     ## Send commands
     my $rc = upload($t, $conf->{$firmware_type}->{$host_type});
-	if ($rc) {
+    if ($rc) {
       $l->sp("Successfull!");
-	  $needs_reboot = 1;
+      $host->{retry}--;
+      $needs_reboot = 1;
     } elsif (defined $rc) {
-	  $l->sp("Already up to date");
+      $l->sp("Already up to date");
+      $host->{retry}--;
     } else {
-	  $l->sp("Failed");
-	  $t->bye;
-	  next;
+      $l->sp("Failed");
+      $t->bye;
+      next;
     }
   
   }
@@ -142,6 +173,13 @@
   }
 }
 
+  if (! $processed) {
+    $l->sp("");
+    $l->sp("Finished.  No more hosts.");
+    last;
+  }
+}
+
 sub upload
 {
   my $t    = shift;
@@ -153,6 +191,14 @@
 
   my $ver = $t->ver;
 
+  if (! (
+    $ver->{$fw_type . ' Version'}  &&
+    $ver->{$fw_type . ' Checksum'} 
+  )) {
+    $l->sp("Error getting current version numbers");
+    return;
+  }
+
   if (
     $ver->{$fw_type . ' Version'}  eq $conf->{'ver'} && 
     $ver->{$fw_type . ' Checksum'} eq $conf->{'cksum'}
@@ -160,6 +206,7 @@
     return 0;
   }
 
+  $l->sp("Updating $fw_type");
   $l->sp("Config information:");
   $l->sp("  Hardware Type: $conf->{'type'}");
   $l->sp("  File Name:     $conf->{'file_name'}");
@@ -170,7 +217,6 @@
   $l->sp("  Conf Checksum: $conf->{'cksum'}");
   $l->sp("  Cur  Checksum: $ver->{$fw_type . ' Checksum'}");
 
-  $l->sp("Updating");
   my $try = 0;
   while (1) {
     if ($try >= $max_tries) {
@@ -179,15 +225,13 @@
     }
     $try++;
 
-    #sysinfo($self->{'_host'});
-    
     $l->p("Enabling TFTPd");
     unless ($t->enable_tftpd) {
       $l->sp("Couldn't enable tftpd");
       next;
     }
 
-    $l->p("Uploading file ($file)");
+    $l->p("Uploading file ($conf->{file_name})");
     # use tftp to push the file up
     my $tftp = Net::TFTP->new($t->Host, Mode => 'octet');
 
@@ -199,10 +243,18 @@
     $l->p("Checking upload ($conf->{'file_cksum'})");
     my $results = $t->tftpd;
     # check the 'File Length' against ???
+    if (! (
+      $results->{'File Checksum'} &&
+      $results->{'File Length'}   &&
+      $results->{'File Name'}
+    )) {
+      $l->sp("Unable to get results of upload");
+      next;
+    }
     if ( $results->{'File Checksum'} ne $conf->{'file_cksum'}) {
       $l->sp(
-        "File checksum '" . $results->{'File Checksum'} .
-        " does not match config file '" . $conf->{'file_cksum'} . "'!"
+        "File checksum (" . $results->{'File Checksum'} .
+        ") does not match config file (" . $conf->{'file_cksum'} . ")!"
       );
       next;
     } 
@@ -210,8 +262,8 @@
 
     if ($results->{'File Length'}   !~ /^$conf->{'file_size'} bytes/) {
       $l->sp(
-        "File length '" . $results->{'File Length'} .
-        "does not match config file '" . $conf->{'file_size'} . " bytes'!"
+        "File length (" . $results->{'File Length'} .
+        ") does not match config file (" . $conf->{'file_size'} . " bytes)!"
       );
       next;
     }
@@ -219,12 +271,12 @@
 
     if ( uc($results->{'File Name'}) ne uc($file) ) {
       $l->sp(
-        "File name '" . $results->{'File Name'} .
-        "' does not match config file '" . $file . "'!"
+        "File name (" . $results->{'File Name'} .
+        ") does not match config file (" . $file . ")!"
       );
       next;
     }
-    $l->p("File name  matches . . . ");
+    $l->p("File name matches . . . ");
 
     my $image_type = 'mainimage';
     if ($fw_type eq 'FPGA') {
@@ -247,14 +299,38 @@
       $l->sp("Saved checksum " . $results->{'Checksum'} . " does not match config file " .  $conf->{'cksum'} . "!");
       next;
     }
-    $l->p("Uploaded checksum ($results->{'Checksum'}) " . 
-          "matches ($conf->{'cksum'})");
+
+    $l->p("$fw_type saved checksum matches . . . ");
     
-    $l->sp("Successfully updated!");
     return 1;
   }
 }
 
+sub parse_hosts
+{
+    my $src = shift;
+
+    my @hosts;
+    foreach my $h (@{ $src }) {
+        if ($h->{name} =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.)(\d{1,3})-(\d{1,3})/) {
+            for ($2..$3) {
+                my %cur_host;
+                foreach my $k (keys %{ $h }) {
+                    $cur_host{$k} = $h->{$k};
+                }
+                $cur_host{name} = $1 . $_;
+                if (! grep { $cur_host{name} eq $h->{name} } @hosts) {
+                    push @hosts, \%cur_host;
+                }
+            }
+        } else {
+            push @hosts, $h;
+        }
+    }
+
+    return \@hosts;
+}
+
 package Mylogger;
 
 use Fcntl ':flock'; # import LOCK_* constants
@@ -324,7 +400,7 @@
       $MYLOG = $self->{'MYLOG'};
     } else {
       unless ($MYLOG) {
-		open ($MYLOG, '>>', $self->{'log_path'} . '/' . $self->{'log_file'}) 
+        open ($MYLOG, '>>', $self->{'log_path'} . '/' . $self->{'log_file'}) 
           or die "Couldn't open logfile!\n";
         my $ofh = select $MYLOG;
         $|=1;