===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.21
retrieving revision 1.29
diff -u -r1.21 -r1.29
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/01 17:08:44	1.21
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/05 16:37:20	1.29
@@ -1,145 +1,272 @@
 #!/usr/bin/perl
-# $RedRiver: update_trango.pl,v 1.20 2007/01/31 22:19:07 mike Exp $
+# $RedRiver: update_trango.pl,v 1.28 2007/02/02 22:37:24 andrew Exp $
 ########################################################################
-# update_trango.pl *** Updates trango foxes with a new firmware
+# update_trango.pl *** Updates trango hosts with a new firmware
 # 
 # 2005.11.15 #*#*# andrew fresh <andrew@mad-techies.org>
 ########################################################################
 use strict;
 use warnings;
 
+use YAML qw/ LoadFile /;
 use Net::TFTP;
 use lib '.';
 use Net::Telnet::Trango;
+use RedRiver::Wireless;
 
-my $config_file = shift || 'update_trango.conf';
+my $config_file = shift || 'update_trango.yaml';
 my $max_tries = 3;
 
+my $l = Mylogger->new( { log_prefix => 'UT' } );
 
+$l->sp("Reading config file '$config_file'");
+my $conf = LoadFile($config_file);
 
-my $l = Mylogger->new( { log_prefix => 'UT' } );
+my $hosts;
+if (@ARGV) {
+  @{ $hosts } = map { { name => $_, group => 'Trango-Client' } } @ARGV
+} else {
+  $l->sp("Reading hosts");
+  $hosts = RedRiver::Wireless::Read_Hosts();
+}
 
+#@{ $hosts } = grep { $_->{name} eq '10.100.7.2' } @{ $hosts };
 
-$l->sp("Reading config file '$config_file'");
-my $conf = read_conf($config_file);
+my $global_tries = $max_tries * 2;
+while ($global_tries > 0) { 
+  $global_tries--;
+  my $processed = 0;
 
-$l->sp("  Hardware Type: $conf->{'type'}");
-$l->sp("  File Name:     $conf->{'file_name'}");
-$l->sp("  File Size:     $conf->{'file_size'}");
-$l->sp("  File Checksum: $conf->{'file_cksum'}");
-$l->sp("  FW Version:    $conf->{'ver'}");
-$l->sp("  FW Checksum:   $conf->{'cksum'}");
-$l->sp("");
 
+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++;
 
-foreach my $fox (@{ $conf->{'ips'} }) {
-  $l->sp("Updating: $fox");
+  $l->sp("");
+  $l->sp("Checking: $host->{name} (try $host->{tries})");
+  my $needs_reboot = 0;
 
   ## Connect and login.
   my $t = new Net::Telnet::Trango (
     Timeout => 5,
     Errmode => 'return',
   ) or die "Couldn't make new connection: $!";
-  $l->p("Connecting to $fox");
-  unless ( $t->open($fox) ) {
+  $l->p("Connecting to $host->{name}");
+  unless ( $t->open($host->{name}) ) {
     $l->sp("Error connecting: $!");
     next;
   }
 
-  my $host_type = $t->host_type;
+  my $password = $host->{Telnet_Password} || $conf->{general}->{password};
 
-  if (lc($conf->{'firmware_type'}) eq 'fpga') {
-    $host_type =~ s/\s.*$//;
-  }
+  # XXX I am not sure this is the best way to check if we should look for
+  # XXX associated stations.
+  if ($host->{group} !~ /Client$/) {
+    $l->p("Logging in");
+    $t->login($password);
+    unless ($t->logged_in) {
+      $l->p('Failed!');
+      $t->close;
+      next;
+    }
 
-  if ($host_type ne $conf->{'type'}) {
-    $l->sp("Wrong type of unit ('" . $t->host_type . "' should be '$conf->{'type'}')");
-    $t->close;
-    next;
-  }
+    $l->sp("Getting sudb");
+    my $sudb = $t->sudb_view;
+    if ($sudb) {
+      $t->su_password($password);
+      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 = {
+            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}");
+          }
+        }
+      }
+    }
+  } 
 
-  if ($t->firmware_version eq $conf->{'ver'}) {
-    $l->sp("Already up to date with firmware version '" . $t->firmware_version . "'");
-    $t->close;
-    next;
-  }
+  foreach my $firmware_type ('Firmware', 'FPGA') {
 
-  $l->p("Logging in");
-  $t->login($conf->{'password'}) || die "Couldn't login: $!";
+    if (! exists $conf->{$firmware_type}) {
+      $l->s("No configs for '$firmware_type'");
+      $t->close;
+      next;
+    }
 
-  $l->p("Sending commands");
-  ## Send commands
-  if ( upload($t, $conf->{'file_name'}) ) {
-     $l->p("Rebooting");
+    my $host_type = $t->host_type;
+    if ($firmware_type eq 'FPGA') {
+      $host_type =~ s/\s.*$//;
+    }
+
+    if (! exists $conf->{$firmware_type}->{$host_type}) {
+      $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);
+      unless ($t->logged_in) {
+        $l->p('Failed!');
+        $t->close;
+        next;
+      }
+    }
+
+    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;
+
+    $l->sp("$host_type $firmware_type");
+    ## Send commands
+    my $rc = upload($t, $conf->{$firmware_type}->{$host_type});
+    if ($rc) {
+      $l->sp("Successfull!");
+      $host->{retry}--;
+      $needs_reboot = 1;
+    } elsif (defined $rc) {
+      $l->sp("Already up to date");
+      $host->{retry}--;
+    } else {
+      $l->sp("Failed");
+      $t->bye;
+      next;
+    }
+  
+  }
+
+  if ($needs_reboot) {
+    $l->sp("Rebooting $host->{name}");
     $t->reboot;
   } else {
-    $l->p("Exiting");
-    $t->exit;
+    $l->sp("Bye $host->{name}");
+    $t->bye();
   }
-  
-  $l->sp("");
 }
 
+  if (! $processed) {
+    $l->sp("");
+    $l->sp("Finished.  No more hosts.");
+    last;
+  }
+}
+
 sub upload
 {
   my $t    = shift;
-  my $file = shift;
+  my $conf = shift;
 
-  my $fw_type = 'Firmware';
-  if (uc($conf->{'firmware_type'}) eq 'FPGA') {
-    $fw_type = 'FPGA';
-  }
+  my $file = $conf->{firmware_path} . '/' . $conf->{file_name};
 
+  my $fw_type = $conf->{firmware_type};
+
   my $ver = $t->ver;
-  $l->p("Current version '" . $ver->{$fw_type . ' Version'} . "'");
 
+  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'}
   ) {
-    $l->sp("Already updated!");
     return 0;
   }
 
+  $l->sp("Updating $fw_type");
+  $l->sp("Config information:");
+  $l->sp("  Hardware Type: $conf->{'type'}");
+  $l->sp("  File Name:     $conf->{'file_name'}");
+  $l->sp("  File Size:     $conf->{'file_size'}");
+  $l->sp("  File Checksum: $conf->{'file_cksum'}");
+  $l->sp("  Conf Version:  $conf->{'ver'}");
+  $l->sp("  Cur  Version:  $ver->{$fw_type . ' Version'}");
+  $l->sp("  Conf Checksum: $conf->{'cksum'}");
+  $l->sp("  Cur  Checksum: $ver->{$fw_type . ' Checksum'}");
+
   my $try = 0;
   while (1) {
     if ($try >= $max_tries) {
       $l->sp("Couldn't update in $max_tries tries!");
-      return undef;
+      return;
     }
     $try++;
 
-    #sysinfo($self->{'_host'});
-    
     $l->p("Enabling TFTPd");
-    $t->enable_tftpd || die "Couldn't enable 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');
 
     unless ($tftp->put($file, $file)) {
-      print "Error uploading: " . $tftp->error;
+      $l->sp("Error uploading: " . $tftp->error);
       next;
     }
 
-    # waitfor some sort of output
-    # make sure it says 'Success.' otherwise error
-    #print "LAST: " . $self->lastline;
-    #my @lines = $self->getlines;
-    #print Dump \@lines;
-    
     $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;
     } 
@@ -147,21 +274,21 @@
 
     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;
     }
     $l->p("File length matches . . . ");
 
-    if ( uc($results->{'File Name'}) ne uc($conf->{'file_name'}) ) {
+    if ( uc($results->{'File Name'}) ne uc($file) ) {
       $l->sp(
-        "File name '" . $results->{'File Name'} .
-        "' does not match config file '" . $conf->{'file_name'} . "'!"
+        "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') {
@@ -184,65 +311,13 @@
       $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 read_conf
-{
-  my $file = shift;
-  my %conf;
-  my $in_ip_list = 0;
-  open my $fh, $file or die "Couldn't open file $file: $!";
-  while (<$fh>) {
-    chomp;
-    next if /^#/;
-    next if /^$/;
-    if ($in_ip_list) {
-      s/\s+//g; # Whitespace is a no no
-
-      if (/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.)(\d{1,3})-(\d{1,3})/) {
-        push @{ $conf{'ips'} }, $1 . $_ for ($2..$3);
-      } else {
-        push @{ $conf{'ips'} }, $_;
-      }
-    } else {
-      my ($key, $val) = split /\s+/, $_, 2;
-
-      if (lc($key) eq 'ips') {
-        $in_ip_list = 1;
-        next;
-      }
-
-      $key =~ s/^\s+//;
-      $key =~ s/\s+$//;
-      $val =~ s/^\s+//;
-      $val =~ s/\s+$//;
-
-      $conf{ lc($key) } = $val;
-    }
-  }
-  close $fh;
-
-  #print Dump \%conf;
-  foreach (
-    'password', 
-    'file_name', 'file_size', 'file_cksum', 
-    'ver', 'cksum', 'ips',
-  ) {
-    die "No $_ specified in config file!"
-      if (not exists $conf{$_});
-  }
-
-  #print Dump \%conf;
-  #exit;
-  return \%conf;
-}
-
 package Mylogger;
 
 use Fcntl ':flock'; # import LOCK_* constants
@@ -312,7 +387,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;