xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 01:56:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5211 from gurevichmark/openbmc_usage_filtering

Browse Source 
Display only OpenBMC usage
This commit is contained in:
xuweibj 2018-05-16 10:38:06 +08:00 committed by GitHub
commit a26832cc94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
perl-xCAT/xCAT/Usage.pm
View File

@ -618,7 +618,6 @@ $usage{"rspconfig.openbmc"} = $usage{"rspconfig.common"} .
$usage{"rinv"} = $usage{"rinv.common"} .
$usage{"rinv.begin"} .
$usage{"rinv.openbmc"} .
" " .
$usage{"rinv.end"};
$usage{"rinv.openbmc"} = $usage{"rinv.common"} .
@ -634,7 +633,6 @@ $usage{"rbeacon.openbmc"} = $usage{"rbeacon.common"} .
$usage{"rvitals"} = $usage{"rvitals.common"} .
$usage{"rvitals.begin"} .
$usage{"rvitals.openbmc"} .
" " .
$usage{"rvitals.end"};
$usage{"rvitals.openbmc"} = $usage{"rvitals.common"} .
@ -652,7 +650,6 @@ $usage{"rflash.openbmc"} = $usage{"rflash.common"} .
$usage{"rpower"} = $usage{"rpower.common"} .
$usage{"rpower.begin"} .
$usage{"rpower.openbmc"} .
" " .
$usage{"rpower.end"};
$usage{"rpower.openbmc"} = $usage{"rpower.common"} .

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

@ -73,8 +73,14 @@ sub preprocess_request {
if (ref($extrargs)) {
@exargs = @$extrargs;
}
my $usage_string = xCAT::Usage->parseCommand($command, @exargs);
# Request usage for openbmc sections only
my $usage_string = xCAT::Usage->parseCommand($command . ".openbmc", @exargs);
if ($usage_string) {
if ($usage_string =~ /cannot be found/) {
# Could not find usage for openbmc section, try getting usage for all sections
$usage_string = xCAT::Usage->parseCommand($command, @exargs);
}
$callback->({ data => [$usage_string] });
$request = {};
return;