===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.18
retrieving revision 1.23
diff -u -r1.18 -r1.23
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/01/31 19:01:12	1.18
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/01 18:44:30	1.23
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: update_trango.pl,v 1.17 2007/01/31 18:44:27 mike Exp $
+# $RedRiver: update_trango.pl,v 1.22 2007/02/01 17:58:33 andrew Exp $
 ########################################################################
 # update_trango.pl *** Updates trango foxes with a new firmware
 # 
@@ -8,37 +8,30 @@
 use strict;
 use warnings;
 
+use YAML qw/ LoadFile /;
 use Net::TFTP;
 use lib '.';
 use Net::Telnet::Trango;
 
-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 = read_conf($config_file);
+my $conf = LoadFile($config_file);
 
-$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("");
+my @foxes = (
+'10.100.1.2',
+'10.100.2.2',
+'10.100.3.2',
+'10.100.4.2',
+);
 
+foreach my $fox (@foxes) {
+  $l->sp("Checking: $fox");
+  my $needs_reboot = 0;
 
-
-
-
-
-foreach my $fox (@{ $conf->{'ips'} }) {
-  $l->sp("Updating: $fox");
-
   ## Connect and login.
   my $t = new Net::Telnet::Trango (
     Timeout => 5,
@@ -50,83 +43,129 @@
     next;
   }
 
-  if ($t->host_type ne $conf->{'type'}) {
-    $l->sp("Wrong type of unit ('" . $t->host_type . "' should be '$conf->{'type'}')");
-    $t->close;
-    next;
-  }
+  foreach my $firmware_type ('Firmware', 'FPGA') {
 
-  if ($t->firmware_version eq $conf->{'ver'}) {
-    $l->sp("Already up to date with firmware version '" . $t->firmware_version . "'");
-    $t->close;
-    next;
-  }
+    if (! exists $conf->{$firmware_type}) {
+	  $l->s("No configs for '$firmware_type'");
+	  $t->close();
+	  next;
+	}
 
-  $l->p("Logging in");
-  $t->login($conf->{'password'}) || die "Couldn't login: $!";
+    my $host_type = $t->host_type;
+    if ($firmware_type eq 'FPGA') {
+      $host_type =~ s/\s.*$//;
+    }
 
-  $l->p("Sending commands");
-  ## Send commands
-  if ( upload($t, $conf->{'file_name'}) ) {
-     $l->p("Rebooting");
+    if (! exists $conf->{$firmware_type}->{$host_type}) {
+	  $l->sp("No '$firmware_type' config for type $host_type");
+	  $t->close();
+	  next;
+	}
+
+    if (! $t->logged_in) {
+      $l->p("Logging in");
+      $t->login($conf->{general}->{'password'});
+      unless ($t->logged_in) {
+        $l->p('Failed!');
+        $t->bye();
+        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");
+    $l->p("Sending commands");
+    ## Send commands
+    my $rc = upload($t, $conf->{$firmware_type}->{$host_type});
+	if ($rc) {
+      $l->sp("Successfull!");
+	  $needs_reboot = 1;
+    } elsif (defined $rc) {
+	  $l->sp("Already up to date");
+    } else {
+	  $l->sp("Failed");
+	  $t->bye;
+	  next;
+    }
+  
+  }
+
+  if ($needs_reboot) {
+    $l->sp("Rebooting $fox");
     $t->reboot;
   } else {
-    $l->p("Exiting");
-    $t->exit;
+    $l->sp("Bye $fox");
+    $t->bye();
   }
-  
   $l->sp("");
 }
 
 sub upload
 {
   my $t    = shift;
-  my $file = shift;
+  my $conf = shift;
 
+  my $file = $conf->{firmware_path} . '/' . $conf->{file_name};
+
+  my $fw_type = $conf->{firmware_type};
+
   my $ver = $t->ver;
-  $l->p("Current version '$ver->{'Firmware Version'}'");
 
   if (
-    $ver->{'Firmware Version'}  eq $conf->{'ver'} && 
-    $ver->{'Firmware Checksum'} eq $conf->{'cksum'}
+    $ver->{$fw_type . ' Version'}  eq $conf->{'ver'} && 
+    $ver->{$fw_type . ' Checksum'} eq $conf->{'cksum'}
   ) {
-    $l->sp("Already updated!");
-    return 1;
+    return 0;
   }
 
+  $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'}");
+
+  $l->sp("Updating");
   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)");
     # use tftp to push the file up
     my $tftp = Net::TFTP->new($t->Host, Mode => 'octet');
 
-    $tftp->put($file, $file) 
-      or die "Error uploading: " . $tftp->error;
+    unless ($tftp->put($file, $file)) {
+      $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'} ne $conf->{'file_cksum'}) {
       $l->sp(
         "File checksum '" . $results->{'File Checksum'} .
-        "does not match config file '" . $conf->{'file_cksum'} . "'!"
+        " does not match config file '" . $conf->{'file_cksum'} . "'!"
       );
       next;
     } 
@@ -150,9 +189,13 @@
     }
     $l->p("File name  matches . . . ");
 
-    $l->p("Updating flash (new checksum '$conf->{'cksum'}')");
+    my $image_type = 'mainimage';
+    if ($fw_type eq 'FPGA') {
+      $image_type = 'fpgaimage';
+    }
+    $l->p("Updating $image_type (new checksum '$conf->{'cksum'}')");
     unless ($results = $t->updateflash(
-      args => 'mainimage ' . $ver->{'Firmware Checksum'} . 
+      args => $image_type . ' ' . $ver->{$fw_type . ' Checksum'} . 
               ' '          . $conf->{'cksum'},
       Timeout => 90,
     ) ) {
@@ -173,57 +216,6 @@
     $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;