=================================================================== RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v retrieving revision 1.31 retrieving revision 1.33 diff -u -r1.31 -r1.33 --- trango/Net-Telnet-Trango/scripts/update_trango.pl 2007/02/06 23:15:53 1.31 +++ trango/Net-Telnet-Trango/scripts/update_trango.pl 2007/02/07 22:07:35 1.33 @@ -1,10 +1,15 @@ #!/usr/bin/perl -# $RedRiver: update_trango.pl,v 1.30 2007/02/06 23:00:31 andrew Exp $ +# $RedRiver: update_trango.pl,v 1.32 2007/02/07 19:25:05 andrew Exp $ ######################################################################## # update_trango.pl *** Updates trango hosts with a new firmware -# +# # 2005.11.15 #*#*# andrew fresh ######################################################################## +# Copyright (C) 2005, 2006, 2007 by Andrew Fresh +# +# This program is free software; you can redistribute it and/or modify +# it under the same terms as Perl itself. +######################################################################## use strict; use warnings; @@ -22,30 +27,31 @@ my $hosts; if (@ARGV) { - @{ $hosts } = map { { name => $_, group => 'Trango-Client' } } @ARGV -} else { - $hosts = parse_hosts($conf->{hosts}); + @{$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) { +while ( $global_tries > 0 ) { $global_tries--; my $processed = 0; - foreach my $host (@{ $hosts }) { + foreach my $host ( @{$hosts} ) { - if (! exists $host->{retry}) { + if ( !exists $host->{retry} ) { $host->{tries} = 0; $host->{retry} = 1; } - if ($host->{tries} >= $max_tries) { + if ( $host->{tries} >= $max_tries ) { $host->{retry} = 0; } - if ($host->{retry} <= 0) { + if ( $host->{retry} <= 0 ) { next; } @@ -57,12 +63,12 @@ my $needs_reboot = 0; ## Connect and login. - my $t = new Net::Telnet::Trango ( + my $t = new Net::Telnet::Trango( Timeout => 5, Errmode => 'return', ) or die "Couldn't make new connection: $!"; $l->p("Connecting to $host->{name}"); - unless ( $t->open($host->{name}) ) { + unless ( $t->open( $host->{name} ) ) { $l->sp("Error connecting: $!"); next; } @@ -82,7 +88,7 @@ if ($sudb) { foreach my $su (@{ $sudb }) { $l->p("Getting su info $su->{suid}"); - my $su_info = $t->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}"); @@ -102,32 +108,32 @@ } } - foreach my $firmware_type ('Firmware', 'FPGA') { + foreach my $firmware_type ( 'Firmware', 'FPGA' ) { - if (! exists $conf->{$firmware_type}) { + if ( !exists $conf->{$firmware_type} ) { $l->s("No configs for '$firmware_type'"); next; } my $host_type = $t->host_type; - if ($firmware_type eq 'FPGA') { + if ( $firmware_type eq 'FPGA' ) { $host_type =~ s/\s.*$//; } - if (! exists $conf->{$firmware_type}->{$host_type}) { + if ( !exists $conf->{$firmware_type}->{$host_type} ) { $l->sp("No '$firmware_type' config for type $host_type"); next; } - if ($firmware_type eq 'Firmware' && - $t->firmware_version eq - $conf->{$firmware_type}->{$host_type}->{ver} - ) { + 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) { + if ( !$t->logged_in ) { $l->p("Logging in"); $t->login($password); unless ($t->logged_in) { @@ -137,25 +143,27 @@ } } - 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}->{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}); + my $rc = upload( $t, $conf->{$firmware_type}->{$host_type} ); if ($rc) { $l->sp("Successfull!"); $host->{retry}--; $needs_reboot = 1; - } elsif (defined $rc) { + } + elsif ( defined $rc ) { $l->sp("Already up to date"); $host->{retry}--; - } else { + } + else { $l->sp("Failed"); $t->bye; next; @@ -166,21 +174,21 @@ if ($needs_reboot) { $l->sp("Rebooting $host->{name}"); $t->reboot; - } else { + } + else { $l->sp("Bye $host->{name}"); $t->bye(); } } - if (! $processed) { + if ( !$processed ) { $l->sp(""); $l->sp("Finished. No more hosts."); last; } } -sub upload -{ +sub upload { my $t = shift; my $conf = shift; @@ -190,18 +198,19 @@ my $ver = $t->ver; - if (! ( - $ver->{$fw_type . ' Version'} && - $ver->{$fw_type . ' Checksum'} - )) { + 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'} - ) { + if ( $ver->{ $fw_type . ' Version' } eq $conf->{'ver'} + && $ver->{ $fw_type . ' Checksum' } eq $conf->{'cksum'} ) + { return 0; } @@ -218,84 +227,99 @@ my $try = 0; while (1) { - if ($try >= $max_tries) { + if ( $try >= $max_tries ) { $l->sp("Couldn't update in $max_tries tries!"); return; } $try++; $l->p("Enabling TFTPd"); - unless ($t->enable_tftpd) { + unless ( $t->enable_tftpd ) { $l->sp("Couldn't enable tftpd"); next; } $l->p("Uploading file ($conf->{file_name})"); + # use tftp to push the file up - my $tftp = Net::TFTP->new($t->Host, Mode => 'octet'); + my $tftp = Net::TFTP->new( $t->Host, Mode => 'octet' ); - unless ($tftp->put($file, $file)) { - $l->sp("Error uploading: " . $tftp->error); + unless ( $tftp->put( $file, $file ) ) { + $l->sp( "Error uploading: " . $tftp->error ); next; } $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'} - )) { + 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'} . ")!" - ); + if ( $results->{'File Checksum'} ne $conf->{'file_cksum'} ) { + $l->sp( "File checksum (" + . $results->{'File Checksum'} + . ") does not match config file (" + . $conf->{'file_cksum'} + . ")!" ); next; - } + } $l->p("File checksum matches . . . "); - if ($results->{'File Length'} !~ /^$conf->{'file_size'} bytes/) { - $l->sp( - "File length (" . $results->{'File Length'} . - ") does not match config file (" . $conf->{'file_size'} . " bytes)!" - ); + if ( $results->{'File Length'} !~ /^$conf->{'file_size'} bytes/ ) { + $l->sp( "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($file) ) { - $l->sp( - "File name (" . $results->{'File Name'} . - ") does not match config file (" . $file . ")!" - ); + if ( uc( $results->{'File Name'} ) ne uc($file) ) { + $l->sp( "File name (" + . $results->{'File Name'} + . ") does not match config file (" + . $file + . ")!" ); next; } $l->p("File name matches . . . "); my $image_type = 'mainimage'; - if ($fw_type eq 'FPGA') { + if ( $fw_type eq 'FPGA' ) { $image_type = 'fpgaimage'; } $l->p("Updating $image_type (new checksum '$conf->{'cksum'}')"); - unless ($results = $t->updateflash( - args => $image_type . ' ' . $ver->{$fw_type . ' Checksum'} . - ' ' . $conf->{'cksum'}, + unless ( + $results = $t->updateflash( + args => $image_type . ' ' + . $ver->{ $fw_type . ' Checksum' } . ' ' + . $conf->{'cksum'}, Timeout => 90, - ) ) { + ) + ) + { $l->sp("Couldn't update flash: $!"); next; } - unless ( - defined $results->{'Checksum'} && - $results->{'Checksum'} eq $conf->{'cksum'} - ) { - $l->sp("Saved checksum " . $results->{'Checksum'} . " does not match config file " . $conf->{'cksum'} . "!"); + unless ( defined $results->{'Checksum'} + && $results->{'Checksum'} eq $conf->{'cksum'} ) + { + $l->sp( "Saved checksum " + . $results->{'Checksum'} + . " does not match config file " + . $conf->{'cksum'} + . "!" ); next; } @@ -305,24 +329,25 @@ } } -sub parse_hosts -{ +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) { + 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 }) { + foreach my $k ( keys %{$h} ) { $cur_host{$k} = $h->{$k}; } $cur_host{name} = $1 . $_; - if (! grep { $cur_host{name} eq $h->{name} } @hosts) { + if ( !grep { $cur_host{name} eq $h->{name} } @hosts ) { push @hosts, \%cur_host; } } - } else { + } + else { push @hosts, $h; } } @@ -332,14 +357,15 @@ package Mylogger; -use Fcntl ':flock'; # import LOCK_* constants +use Fcntl ':flock'; # import LOCK_* constants + #use YAML; use constant LOG_PRINT => 128; -use constant LOG_SAVE => 64; +use constant LOG_SAVE => 64; DESTROY { my $self = shift; - if ($self->{'MYLOG'}) { + if ( $self->{'MYLOG'} ) { $self->p("Closing log ($self->{'log_path'}/$self->{'log_file'})"); close $self->{'MYLOG'}; } @@ -352,36 +378,30 @@ $self->{'base_path'} ||= '.'; $self->{'log_path'} ||= $self->{'base_path'}; $self->{'log_prefix'} ||= 'LOG'; - $self->{'log_file'} ||= GetLogName( - $self->{'log_prefix'}, - $self->{'log_path'} - ); + $self->{'log_file'} ||= + GetLogName( $self->{'log_prefix'}, $self->{'log_path'} ); bless $self, $package; } -sub s -{ +sub s { my $self = shift; - my $m = shift; - return $self->mylog($m, LOG_SAVE); + my $m = shift; + return $self->mylog( $m, LOG_SAVE ); } -sub p -{ +sub p { my $self = shift; - my $m = shift; - return $self->mylog($m, LOG_PRINT); + my $m = shift; + return $self->mylog( $m, LOG_PRINT ); } -sub sp -{ +sub sp { my $self = shift; - my $m = shift; - return $self->mylog($m, LOG_SAVE | LOG_PRINT); + my $m = shift; + return $self->mylog( $m, LOG_SAVE | LOG_PRINT ); } -sub mylog -{ +sub mylog { my $self = shift; my $thing = shift; @@ -390,60 +410,61 @@ my $which = shift; my $MYLOG; - if ($which & LOG_PRINT) { + if ( $which & LOG_PRINT ) { print $thing, "\n"; } - if ($which & LOG_SAVE) { - if ($self->{'MYLOG'}) { + if ( $which & LOG_SAVE ) { + if ( $self->{'MYLOG'} ) { $MYLOG = $self->{'MYLOG'}; - } else { + } + else { unless ($MYLOG) { - open ($MYLOG, '>>', $self->{'log_path'} . '/' . - $self->{'log_file'}) or die "Couldn't open logfile!\n"; + open( $MYLOG, '>>', + $self->{'log_path'} . '/' . $self->{'log_file'} ) + or die "Couldn't open logfile!\n"; my $ofh = select $MYLOG; - $|=1; + $| = 1; select $ofh; $self->{'MYLOG'} = $MYLOG; - $self->p("Opened log ($self->{'log_path'}/$self->{'log_file'})"); + $self->p( + "Opened log ($self->{'log_path'}/$self->{'log_file'})"); } } - flock($MYLOG, LOCK_EX); - print $MYLOG (scalar gmtime), "\t", $thing, "\n" - or die "Couldn't print to MYLOG: $!"; - flock($MYLOG, LOCK_UN); + flock( $MYLOG, LOCK_EX ); + print $MYLOG ( scalar gmtime ), "\t", $thing, "\n" + or die "Couldn't print to MYLOG: $!"; + flock( $MYLOG, LOCK_UN ); } } -sub GetLogName -{ - my $prefix = shift || die "Invalid prefix passed for log"; +sub GetLogName { + my $prefix = shift || die "Invalid prefix passed for log"; my $logdate = GetLogDate(); my $logver = 0; my $logname; do { - $logname = $prefix . $logdate . sprintf("%02d", $logver) . '.log'; + $logname = $prefix . $logdate . sprintf( "%02d", $logver ) . '.log'; $logver++; - } until (not -e $logname); + } until ( not -e $logname ); return $logname; } -sub GetLogDate -{ - my ($sec,$min,$hour,$mday,$mon,$year,,,) = localtime(); +sub GetLogDate { + my ( $sec, $min, $hour, $mday, $mon, $year,,, ) = localtime(); $mon++; $year += 1900; - if ($min < 10) { $min = "0$min" } - if ($sec < 10) { $sec = "0$sec" } - if ($hour < 10) { $hour = "0$hour" } - if ($mday < 10) { $mday = "0$mday" } - if ($mon < 10) { $mon = "0$mon" } + if ( $min < 10 ) { $min = "0$min" } + if ( $sec < 10 ) { $sec = "0$sec" } + if ( $hour < 10 ) { $hour = "0$hour" } + if ( $mday < 10 ) { $mday = "0$mday" } + if ( $mon < 10 ) { $mon = "0$mon" } my $time = $year . $mon . $mday;