arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defect 4603: fix the code logic of how to get the fsp of cec

Browse Source
This commit is contained in:
daniceexi 2015-03-13 04:52:55 -04:00
parent f6ea4a1bbc
commit 56d468f669
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/energy.pm
View File

@ -345,7 +345,7 @@ sub process_request {
unless (@ppc_all_entry) {
@ppc_all_entry = $ppc_tab->getAllNodeAttribs(['node', 'parent', 'hcp', 'nodetype']);
foreach my $ppcentry (@ppc_all_entry) {
if (defined($ppcentry->{parent})) {
if (defined($ppcentry->{parent}) && defined($ppcentry->{nodetype}) && $ppcentry->{nodetype} =~ /fsp/) {
$cec2fsp->{$ppcentry->{parent}} .= "$ppcentry->{node},";
}
}
@ -387,7 +387,7 @@ sub process_request {
unless ($ip) { next; }
my $real_ip = xCAT::NetworkUtils->getipaddr($ip);
unless ($real_ip) {
xCAT::MsgUtils->message("E", {error => ["$node: Cannot get ip for $ip"], errorcode => 1}, $callback);
xCAT::MsgUtils->message("E", {error => ["$node: Cannot get ip for $ip"], errorcode => [1]}, $callback);
next;
}
my %args = (
@ -653,8 +653,8 @@ sub run_cim
$http_params->{timeout} = 5;
my ($ret, $value) = xCAT::CIMUtils->enum_instance($http_params, $cimargs);
if ($ret->{rc}) {
if ($ret->{msg} =~ /Couldn't connect to server/) {
xCAT::MsgUtils->message("E", data => ["$node: Couldn not connect to server [$http_params->{ip}]."], $callback);
if ($ret->{msg} =~ /(Couldn't connect to server)|(Can't connect to)/) {
xCAT::MsgUtils->message("E", {data => ["$node: Couldn't connect to server [$http_params->{ip}]."]}, $callback);
return 10;
} else {
xCAT::MsgUtils->message("E", {data => ["$node: $ret->{msg}"]}, $callback);