--- lib/PXElator/amt.pm 2009/08/30 15:54:30 379 +++ lib/PXElator/amt.pm 2009/08/30 16:36:37 380 @@ -15,26 +15,15 @@ use Carp qw/confess/; sub ip { - my $client_ip = shift || confess "no ip"; - my ( $passwd, $ip ) = split(/\s+/, client::conf( $client_ip => 'amt' )); + my ( $client_ip, $amt ) = @_; + $amt ||= client::conf( $client_ip => 'amt' ); + my ( $passwd, $ip ) = split(/\s+/, $amt); ( $ip, $passwd ) = ( $passwd, $ip ) if $passwd =~ m/$RE{net}{IPv4}/; $ip ||= $client_ip; - if ( ! ping::host( $ip ) ) { - warn "W: ping $ip unreachable\n"; - } - - warn "amt $ip ", '*' x length($passwd), "\n"; - $ENV{AMT_PASSWORD} = $passwd; $ENV{AMT_HOST} = $ip; - -} - -sub power_on { - ip @_; - ( power_state() & 0x0f ) == 0; } sub power_state { @@ -43,6 +32,12 @@ return $state; } +sub power_on { + ip @_; + my $state = power_state; + defined $state && ( $state & 0x0f ) == 0; +} + sub info { ip @_; @@ -53,18 +48,7 @@ CouchDB::audit('network', $amt ); }; warn "ERROR amt $@" if $@; - - my $out; - my $ip = $ENV{AMT_HOST}; - - $out = - qq| amt| - . qq| ip| - . qq|
| - . html::pre_dump( $amt ) - ; - - return $out; + $amt; }