add option to show board/server status

diff --git a/rsbs2.pl b/rsbs2.pl
index debcc8744051d85aaa8d2ab4c1eb6ccbec22cec4..0d2a682940d6373a9649d431dc49653d7aafc928 100755 (executable)
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -154,6 +154,19 @@ sub _req {
        XMLin($response->content, SuppressEmpty => '');
 }
 
        XMLin($response->content, SuppressEmpty => '');
 }
 

+sub _cmd {
+       my $cmd = shift;
+
+       my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="'.$cmd.'"></REQ></RMCSEQ>';
+       my $res = _req($reqstr);
+       if ($res->{RESP}->{RC} ne '0x0') {
+               print "${cmd} failed: ".$res->{RESP}->{RC}."\n";
+               undef;
+       }
+
+       $res->{RESP};
+}
+

 sub _getprop {
        my $property = shift;
 
 sub _getprop {
        my $property = shift;
 


@@ -311,7 +324,7 @@ sub getusrprops {
 sub usradd {
        my $usr = shift;
 
 sub usradd {
        my $usr = shift;
 

-       my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="usradd"><USER NAME="michael"/></REQ></RMCSEQ>';
+       my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="usradd"><USER NAME="'.$usr.'"/></REQ></RMCSEQ>';

        my $res = _req($reqstr);
        if ($res->{RESP}->{RC} ne '0x0') {
                print "FAILED:".$res->{RESP}->{RC}."\n";
        my $res = _req($reqstr);
        if ($res->{RESP}->{RC} ne '0x0') {
                print "FAILED:".$res->{RESP}->{RC}."\n";


@@ -366,6 +379,53 @@ sub syslog_debug {
        print "Debug messages will be sent to ${destination_ip} (broadcast: ${bcast})\n";
 }
 
        print "Debug messages will be sent to ${destination_ip} (broadcast: ${bcast})\n";
 }
 

+sub status {
+       my $boardstatus = _cmd("boardstatus")->{STATUS};
+       my $fw = _cmd("boardfwstatus");
+       my $boardfwstatus = $fw->{STATUS};
+       my $boardfwprogress = $fw->{PROGRESS};
+       $bs = hex($boardstatus);
+
+       print "Server Power:\t\t" . (($bs & 0x01) ? "ON" : "OFF") . "\n";
+       print "External PSU:\t\t" . (($bs & 0x02) ? "ON" : "OFF") . "\n";
+       print "Battery:\t\t";
+       if ($bs & 0x04) {
+               if ($bs & 0x08) {
+                       print "LOW\n";
+               } elsif ($bs & 0x800) {
+                       print "ON\n";
+               } else {
+                       print "UNKNOWN\n";
+               }
+       } else {
+               print "OFF\n";
+       }
+       print "Standby Power:\t\t" . (($bs & 0x08) ? "ON" : "OFF") . "\n";
+       print "LAN:\t\t\t" . (($bs & 0x10) ? "CONNECTED" : "NC") . "\n";
+       print "I2C:\t\t\t" . (($bs & 0x20) ? "CONNECTED" : "NC") . "\n";
+       print "SMM:\t\t\t" . (($bs & 0x40) ? "CONNECTED" : "NC") . "\n";
+       print "Instrumentation:\t" . (($bs & 0x200) ? "CONNECTED" : "NC") . "\n";
+       print "ICMB:\t\t\t" . (($bs & 0x400) ? "CONNECTED" : "NC") . "\n";
+       print "PPP:\t\t\t" . (($bs & 0x10000) ? "ON" : "OFF") . "\n";
+       print "Paging:\t\t\t" . (($bs & 0x20000) ? "ON" : "OFF") . "\n";
+       print "COM redirection:\t" . (($bs & 0x100000) ? "ON" : "OFF") . "\n";
+       print "UART redirect:\t\t" . (($bs & 0x200000) ? "ON" : "OFF") . "\n";
+       print "UART redirect pending:\t" . (($bs & 0x400000) ? "TRUE" : "FALSE") . "\n";
+       my $fws = hex ($boardfwstatus);
+       print "FW status:\t\t";
+       if ($fws == 3 || $fws == 32771) {
+               print "WAITING\n";
+       } else {
+               print "DONE\n";
+       }
+       if (($fws & 0x8080) || ($fws & 0x80)) {
+               printf("FW error:\t\t0x%02x\n", ($fws & 0xff));
+       }
+       print "boardstatus:\t\t${boardstatus}\n";
+       print "boardfwstatus:\t\t${boardfwstatus}\n";
+       print "fw upgrade progress:\t${boardfwprogress}\n";
+}
+

 sub login {
        my $user = shift;
        my $pass = shift;
 sub login {
        my $user = shift;
        my $pass = shift;


@@ -438,6 +498,7 @@ my $show = 0;
 my $enable_debug = "";
 my $save = "";
 my $load = "";
 my $enable_debug = "";
 my $save = "";
 my $load = "";

+my $showstat = 0;

 my $hostalias;
 
 while (defined($ARGV[0])) {
 my $hostalias;
 
 while (defined($ARGV[0])) {


@@ -487,6 +548,11 @@ while (defined($ARGV[0])) {
                                shift @ARGV;
                                last SWITCH;
                        };
                                shift @ARGV;
                                last SWITCH;
                        };

+               /^-b$/ && do {
+                               $showstat = 1;
+                               shift @ARGV;
+                               last SWITCH;
+                       };

                /^-save$/ && do {
                                shift @ARGV;
                                $save = shift @ARGV;
                /^-save$/ && do {
                                shift @ARGV;
                                $save = shift @ARGV;


@@ -523,6 +589,7 @@ if (!$valid_arg) {
        print STDERR "\t-r\t\treset\n";
        print STDERR "\t-x\t\tshow all properties, variables and settings\n";
        print STDERR "\t-l IP\t\tsend SYSLOG debug messages to IP\n";
        print STDERR "\t-r\t\treset\n";
        print STDERR "\t-x\t\tshow all properties, variables and settings\n";
        print STDERR "\t-l IP\t\tsend SYSLOG debug messages to IP\n";

+       print STDERR "\t-b\t\tshow board/server status\n";

        print STDERR "\t-v\t\tverbose\n";
        print STDERR "\t-save file\tsave configuration to 'file'\n";
        print STDERR "\t-load file\tload configuration from 'file'\n";
        print STDERR "\t-v\t\tverbose\n";
        print STDERR "\t-save file\tsave configuration to 'file'\n";
        print STDERR "\t-load file\tload configuration from 'file'\n";


@@ -617,8 +684,7 @@ if ($load ne '') {
        }
        print STDERR "done\n" if (!$verbose);
        print "Settings loaded, resetting board...\n";
        }
        print STDERR "done\n" if (!$verbose);
        print "Settings loaded, resetting board...\n";

-       my $reqstr='<?XML version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="boardreset"></REQ></RMCSEQ>';
-       _req($reqstr);
+       _cmd("boardreset");

        exit(0);
 }
 
        exit(0);
 }
 


@@ -643,4 +709,8 @@ if ($powcyc) {
        powercycle();
 }
 
        powercycle();
 }
 

+if ($showstat) {
+       status();
+}
+

 logout();
 logout();