X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/762f3898849f6975286d7d0511f9e340cc2eb073..e50748d5af082b1fb20e868b5ac1c63eadd14c5a:/rsbs2.pl?ds=inline
diff --git a/rsbs2.pl b/rsbs2.pl
index 4d09c1b..ee2fa24 100755
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -151,7 +151,7 @@ sub _req {
$request->content(''.$xml.'');
$response = $ua->request($request);
die("Error in request: " . $response->status_line . "\n") unless ($response->is_success);
- XMLin($response->content, SuppressEmpty => '');
+ XMLin($response->content, SuppressEmpty => '')->{RESP};
}
sub _cmd {
@@ -159,12 +159,12 @@ sub _cmd {
my $reqstr='';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "${cmd} failed: ".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "${cmd} failed: ".$res->{RC}."\n";
undef;
}
- $res->{RESP};
+ $res;
}
sub _getprop {
@@ -175,8 +175,8 @@ sub _getprop {
print "get: ${property}\n" if ($verbose);
- if ($resp->{RESP}->{RC} ne '0x0') {
- $resp->{RESP}->{RC};
+ if ($resp->{RC} ne '0x0') {
+ $resp->{RC};
} else {
$resp;
}
@@ -197,7 +197,7 @@ sub setprop {
my $property = shift;
my $value = shift;
- my $oldval = _getprop($property)->{RESP}->{PROPLIST}->{PROP}->{VAL};
+ my $oldval = _getprop($property)->{PROPLIST}->{PROP}->{VAL};
if ($value eq $oldval) {
print "${property} is already ${value}\n" if ($verbose);
@@ -207,8 +207,8 @@ sub setprop {
my $reqstr=''.$value.'';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "Error setting ${property} to ${value}: ".$res->{RC}."\n";
undef;
} else {
print "${property}: ${oldval} -> ${value}\n" if ($verbose);
@@ -231,8 +231,8 @@ sub serveraction {
my $reqstr=''.$action.'';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "FAILED:".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "FAILED:".$res->{RC}."\n";
}
}
@@ -260,7 +260,7 @@ sub powercycle {
sub showprop {
my $property = shift;
- my $phash = _getprop($property)->{RESP}->{PROPLIST}->{PROP};
+ my $phash = _getprop($property)->{PROPLIST}->{PROP};
print "${property}: " . ${phash}->{VAL} . " (" . ${phash}->{PERMS} . ")\n";
}
@@ -270,20 +270,20 @@ sub board_properties {
my $resp = _req($reqstr);
print " * Board Properties:\n";
- foreach my $bprop (@{$resp->{RESP}->{BPROPLIST}->{BPROP}}) {
+ foreach my $bprop (@{$resp->{BPROPLIST}->{BPROP}}) {
print " * " . ${bprop}->{NAME} . ": " . ${bprop}->{VAL} . "\n";
}
}
sub show_boarddesc {
my $reqstr='';
- my $boarddesc64 = _req($reqstr)->{RESP}->{BPROPLIST}->{BPROP}->{VAL};
+ my $boarddesc64 = _req($reqstr)->{BPROPLIST}->{BPROP}->{VAL};
my $boarddesc = decode_base64($boarddesc64);
my @board = split(//, $boarddesc);
foreach my $byte (@board) {
printf ("0x%02x ", ord($byte));
-}
-print "\n";
+ }
+ print "\n";
}
sub show_all_vars {
@@ -315,7 +315,7 @@ sub getusrprops {
my $usr = shift;
my $reqstr = '';
- my $res = _req($reqstr)->{RESP}->{USER}->{PROP};
+ my $res = _req($reqstr)->{USER}->{PROP};
$res;
}
@@ -325,8 +325,8 @@ sub usradd {
my $reqstr='';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "FAILED:".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "FAILED:".$res->{RC}."\n";
}
}
@@ -338,7 +338,7 @@ sub setusrprop {
my $reqstr='';
my $res = _req($reqstr);
- my $oldval = ${res}->{RESP}->{USER}->{PROP}->{VAL};
+ my $oldval = ${res}->{USER}->{PROP}->{VAL};
if ($value eq $oldval) {
print "${property} is already ${value}\n" if ($verbose);
@@ -348,8 +348,8 @@ sub setusrprop {
$reqstr=''.$value.'';
$res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "Error setting ${property} to ${value}: ".$res->{RC}."\n";
undef;
} else {
print "${property}: ${oldval} -> ${value}\n" if ($verbose);
@@ -363,31 +363,66 @@ sub syslog_debug {
my $reqstr=''.${destination_ip}.''.${bcast}.'FALSE';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "FAILED:".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "FAILED:".$res->{RC}."\n";
return;
}
$reqstr='TRUE0x10x1FALSE';
$res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "FAILED:".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "FAILED:".$res->{RC}."\n";
return;
}
print "Debug messages will be sent to ${destination_ip} (broadcast: ${bcast})\n";
}
-sub sensors {
+sub get_sensors {
my $slist= _cmd("sensorlist");
- my %sens = ();
+ my @sensors;
if ($slist->{RC} ne '0x0') {
print "Error getting sensorlist: ".$slist->{RC}."\n";
return;
}
+ my $req = '0x1';
foreach my $s (@{$slist->{SENSORLIST}->{SENSOR}}) {
+ $req .= '';
+ }
+ $req .= '';
+
+ my $sprop = _req($req);
+ foreach my $s (@{$sprop->{SENSORLIST}->{SENSOR}}) {
+ my $sensor = {};
+ foreach my $sp (@{$s->{PROP}}) {
+ $sensor->{$sp->{NAME}} = $sp->{VAL};
+ }
+
+ next if (!defined($sensor->{NAME}));
+ $sensor->{VAL} = '0' if ($sensor->{VAL} eq '');
+ push @sensors, $sensor;
+ }
+ @sensors;
+}
+
+sub show_sensors {
+ my @sensors = get_sensors();
+
+ foreach my $sensor (@sensors) {
+ print $sensor->{NAME}.": ".$sensor->{VAL}.$sensor->{UNITS};
+
+ my @info = ();
+ foreach my $field qw(MIN MAX LOW_NON_CRITICAL UPPER_NON_CRITICAL LOW_CRITICAL UPPER_CRITICAL) {
+ if ($sensor->{$field} ne '') {
+ push @info, "${field}: ".$sensor->{$field}.$sensor->{UNITS};
+ }
+ }
+
+ print "\t(".join(", ",@info).")" if (@info);
+
+ print "\n";
}
}
@@ -439,7 +474,7 @@ sub status {
print "FW upgrade progress:\t${boardfwprogress}\n";
}
print "\nSensors:\n";
- sensors();
+ show_sensors();
}
sub login {
@@ -517,6 +552,7 @@ my $enable_debug = "";
my $save = "";
my $load = "";
my $showstat = 0;
+my $gui = 0;
my $hostalias;
while (defined($ARGV[0])) {
@@ -581,6 +617,11 @@ while (defined($ARGV[0])) {
shift @ARGV;
last SWITCH;
};
+ /^-G$/ && do {
+ $gui = 1;
+ shift @ARGV;
+ last SWITCH;
+ };
/^-save$/ && do {
shift @ARGV;
$save = shift @ARGV;
@@ -620,6 +661,7 @@ if (!$valid_arg) {
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-X\t\tsend raw XML string (start with REQ tag)\n";
+ print STDERR "\t-G\t\tstart GUI in appletviewer\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";
@@ -636,6 +678,19 @@ $host = ${$Config{$hostalias}}{"host"};
$poweronms = ${$Config{$hostalias}}{"poweronms"} if (defined(${$Config{$hostalias}}{"poweronms"}));
$poweroffms = ${$Config{$hostalias}}{"poweroffms"} if (defined(${$Config{$hostalias}}{"poweroffms"}));
+if ($gui) {
+ open(APPLET,"|appletviewer /dev/stdin");
+ print APPLET '
RSB S2 User Interface';
+ print APPLET '';
+ print APPLET '';
+ print APPLET '';
+ close(APPLET);
+}
+
$sid = login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});
if ($show) {
@@ -662,6 +717,7 @@ if (@sprop) {
if (@xmlsend) {
foreach my $x (@xmlsend) {
+ $Data::Dumper::Terse = 1;
print Dumper(_req($x));
}
}
@@ -678,7 +734,7 @@ if ($save ne '') {
foreach my $ts (@fw_vars) {
next if (grep(/^${ts}$/, @dontsave));
- my $phash = _getprop($ts)->{RESP}->{PROPLIST}->{PROP};
+ my $phash = _getprop($ts)->{PROPLIST}->{PROP};
next if ($phash->{PERMS} ne 'RW');
print SAVEFILE "${ts}=".$phash->{VAL}."\n";