mirror of
https://github.com/xcat2/xcat-core.git
synced 2025-05-29 17:23:08 +00:00
Merge pull request #3450 from xuweibj/hierarchy
To support hierarchy for openbmc
This commit is contained in:
commit
753c443165
@ -352,11 +352,17 @@ sub preprocess_request {
|
||||
#-------------------------------------------------------
|
||||
sub process_request {
|
||||
my $request = shift;
|
||||
$callback = shift;
|
||||
my $command = $request->{command}->[0];
|
||||
my $noderange = $request->{node};
|
||||
my $extrargs = $request->{arg};
|
||||
my @exargs = ($request->{arg});
|
||||
if (ref($extrargs)) {
|
||||
@exargs = @$extrargs;
|
||||
}
|
||||
|
||||
my $check = parse_node_info($noderange);
|
||||
my $rst = parse_command_status($command);
|
||||
my $rst = parse_command_status($command, \@exargs);
|
||||
return if ($rst);
|
||||
|
||||
if ($request->{command}->[0] ne "getopenbmccons") {
|
||||
@ -554,7 +560,8 @@ sub parse_args {
|
||||
|
||||
#-------------------------------------------------------
|
||||
sub parse_command_status {
|
||||
my $command = shift;
|
||||
my $command = shift;
|
||||
my $subcommands = shift;
|
||||
my $subcommand;
|
||||
|
||||
xCAT::SvrUtils::sendmsg("[OpenBMC development support] Using this version of xCAT, ensure firware level is at v1.99.6-0-r1, or higher.", $callback);
|
||||
@ -570,7 +577,7 @@ sub parse_command_status {
|
||||
}
|
||||
|
||||
if ($command eq "rpower") {
|
||||
$subcommand = $ARGV[0];
|
||||
$subcommand = $$subcommands[0];
|
||||
|
||||
if ($subcommand eq "on") {
|
||||
$next_status{LOGIN_RESPONSE} = "RPOWER_ON_REQUEST";
|
||||
@ -599,8 +606,8 @@ sub parse_command_status {
|
||||
}
|
||||
|
||||
if ($command eq "rinv") {
|
||||
if (defined($ARGV[0])) {
|
||||
$subcommand = $ARGV[0];
|
||||
if (defined($$subcommands[0])) {
|
||||
$subcommand = $$subcommands[0];
|
||||
} else {
|
||||
$subcommand = "all";
|
||||
}
|
||||
@ -628,7 +635,7 @@ sub parse_command_status {
|
||||
return 1;
|
||||
}
|
||||
|
||||
$subcommand = $ARGV[0];
|
||||
$subcommand = $$subcommands[0];
|
||||
if ($subcommand =~ /^hd$|^net$|^cd$|^default$|^def$/) {
|
||||
$next_status{LOGIN_RESPONSE} = "RSETBOOT_SET_REQUEST";
|
||||
$next_status{RSETBOOT_SET_REQUEST} = "RSETBOOT_SET_RESPONSE";
|
||||
@ -658,8 +665,8 @@ sub parse_command_status {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (defined($ARGV[0])) {
|
||||
$subcommand = $ARGV[0];
|
||||
if (defined($$subcommands[0])) {
|
||||
$subcommand = $$subcommands[0];
|
||||
} else {
|
||||
$subcommand = "all";
|
||||
}
|
||||
@ -679,7 +686,7 @@ sub parse_command_status {
|
||||
|
||||
if ($command eq "rspconfig") {
|
||||
my @options = ();
|
||||
foreach $subcommand (@ARGV) {
|
||||
foreach $subcommand (@$subcommands) {
|
||||
if ($subcommand =~ /^ip$|^netmask$|^gateway$|^vlan$/) {
|
||||
$next_status{LOGIN_RESPONSE} = "RSPCONFIG_GET_REQUEST";
|
||||
$next_status{RSPCONFIG_GET_REQUEST} = "RSPCONFIG_GET_RESPONSE";
|
||||
@ -711,8 +718,8 @@ sub parse_command_status {
|
||||
}
|
||||
|
||||
if ($command eq "rvitals") {
|
||||
if (defined($ARGV[0])) {
|
||||
$subcommand = $ARGV[0];
|
||||
if (defined($$subcommands[0])) {
|
||||
$subcommand = $$subcommands[0];
|
||||
} else {
|
||||
$subcommand = "all";
|
||||
}
|
||||
@ -737,7 +744,7 @@ sub parse_command_status {
|
||||
return 1;
|
||||
}
|
||||
|
||||
my $update_file = $ARGV[0];
|
||||
my $update_file = $$subcommands[0];
|
||||
my $filename = undef;
|
||||
my $file_id = undef;
|
||||
my $grep_cmd = "/usr/bin/grep -a";
|
||||
|
Loading…
x
Reference in New Issue
Block a user