xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-11 15:21:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #72 from bybai/master

Browse Source 
defect#66 rest api for vitals all return 500 Internal Server Error
This commit is contained in:
bybai
2015-08-11 10:48:03 +08:00
parent 22a3be42ee 9199cda4d9
commit bf4a153287
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xCAT-server/xCAT-wsapi/xcatws.cgi
View File

@ -1763,7 +1763,8 @@ sub actionout {
push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}->{$param->{'resourcename'}}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
} elsif ($param->{'resourcename'} =~ /(vitals|inventory)/) {
# handle output of rvital and rinv for ppc node
push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
#push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}->{Message}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
} else {
$jsonnode->{$d->{node}->[0]->{name}->[0]}->{$param->{'resourcename'}} = $d->{node}->[0]->{data}->[0]->{contents}->[0];
}