xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-11-04 05:12:30 +00:00
Code Issues Releases Wiki Activity

defect 3660: display the correct message when run nodediscoverdef command defines a request a node which has not correct IP.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16854 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
2013-07-01 09:10:18 +00:00
parent ec54b30aa4
commit 3260c52a35
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/nodediscover.pm
View File

@@ -324,6 +324,12 @@ sub process_request {
}
}
}
# make sure the node has the correct ip configured
unless ($clientip) {
$callback->({error=> ["The node [$node] should have a correct IP address which belongs to the management network."], errorcode=>["1"]});
return;
}
my $restartstring = "restart";
if (scalar @forcenics > 0) {

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

@@ -1060,8 +1060,12 @@ Usage:
$request->{node} = [$node];
$request->{discoverymethod} = ['manual'];
$request->{updateswitch} = ['yes'];
$subreq->($request);
xCAT::MsgUtils->message("I", {data=>["Defined [$uuid] to node $node."]}, $callback);
my $rsp = $subreq->($request);
if (defined ($rsp->{errorcode}->[0])) {
xCAT::MsgUtils->message("E", $rsp, $callback);
} else {
xCAT::MsgUtils->message("I", {data=>["Defined [$uuid] to node $node."]}, $callback);
}
} else {
$usage->($callback);
return;