=================================================================== RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v retrieving revision 1.25 retrieving revision 1.28 diff -u -r1.25 -r1.28 --- 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/02 22:37:24 1.28 @@ -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.27 2007/02/02 21:36:00 andrew Exp $ ######################################################################## # update_trango.pl *** Updates trango hosts with a new firmware # @@ -22,15 +22,43 @@ $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 { + $l->sp("Reading hosts"); + $hosts = RedRiver::Wireless::Read_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,6 +74,8 @@ my $password = $host->{Telnet_Password} || $conf->{general}->{password}; + # 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); @@ -62,6 +92,10 @@ $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}, @@ -75,7 +109,6 @@ if ($su_info->{ERR}) { $l->sp("ERR: $su_info->{ERR}"); } - next; } } } @@ -84,10 +117,10 @@ 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 +128,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 +151,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 +184,13 @@ } } + if (! $processed) { + $l->sp(""); + $l->sp("Finished. No more hosts."); + last; + } +} + sub upload { my $t = shift; @@ -153,6 +202,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 +217,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 +228,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 +236,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 +254,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 +273,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 +282,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,10 +310,9 @@ $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; } } @@ -324,7 +386,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;