xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-03 03:50:08 +00:00
Code Issues Releases Wiki Activity

change network command from "," to space

Browse Source
This commit is contained in:
Casandra Qiu 2017-08-18 09:49:36 -04:00
parent 02c82d4a04
commit 9f2f40609a
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xCAT-server/lib/xcat/plugins/pdu.pm
View File

@ -177,7 +177,7 @@ sub process_request
my $subcmd = $exargs[0];
if ($subcmd eq 'sshcfg') {
process_sshcfg($noderange, $subcmd, $callback);
}elsif ($subcmd =~ /=/) {
}elsif ($subcmd =~ /ip|netmask|hostname/) {
process_netcfg($request, $subreq, $subcmd, $callback);
} else {
$callback->({ errorcode => [1],error => "The input $command $subcmd is not support for pdu"});
@ -481,7 +481,7 @@ sub connectTopdu {
'-n' set system ip netmask. e.g.:PduManager -i xxx.xxx.xxx.xxx -n xxx.xxx.xxx.xxx
example: rspconfig coralpdu hostname=coralpdu
rspconfig coralpdu ip=1.1.1.1,netmask=255.0.0.0
rspconfig coralpdu ip=1.1.1.1 netmask=255.0.0.0
=cut
@ -496,12 +496,16 @@ sub process_netcfg {
my $netmask;
my $args;
my $extrargs = $request->{arg};
my @exargs = ($request->{arg});
if (ref($extrargs)) {
@exargs = @$extrargs;
}
my $nodes = $request->{node};
my $rsp = {};
xCAT::MsgUtils->message("I", "set hostname ");
my @cmds = split(/,/,$subcmd);
foreach my $cmd (@cmds) {
foreach my $cmd (@exargs) {
my ($key, $value) = split(/=/, $cmd);
if ($key =~ /hostname/) {
$hostname = $value;
@ -510,14 +514,14 @@ sub process_netcfg {
node => $nodes,
arg => [ $args ] }, $subreq, 0, 1);
if ($::RUNCMD_RC != 0) {
xCAT::MsgUtils->message("I", "xdsh command to set hostname failed");
xCAT::SvrUtils::sendmsg("xdsh command to set hostname failed", $callback);
}
}elsif ($key =~ /ip/) {
$ip = $value;
} elsif ($key =~ /netmask/) {
$netmask = $value;
} else {
xCAT::MsgUtils->message("I", "rspconfig $cmd is not support yet");
xCAT::SvrUtils::sendmsg("rspconfig $cmd is not support yet, ignored", $callback);
}
}
@ -531,6 +535,7 @@ sub process_netcfg {
}
if ($opt) {
my $dshcmd = $args . $opt ;
xCAT::SvrUtils::sendmsg($dshcmd, $callback);
#comment this for now, coralPDU on the lab is not support PduManager yet
my $output = xCAT::Utils->runxcmd({ command => ['xdsh'], node => $nodes, arg => [ $dshcmd ] }, $subreq, 0, 1);
if ($::RUNCMD_RC != 0) {

2
xCAT-server/lib/xcat/plugins/switchdiscover.pm
View File

@ -407,7 +407,7 @@ sub process_request {
}
if (!($result)) {
send_msg( \%request, 0, " No switch found ");
send_msg( \%request, 0, " No $device found ");
return;
}