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

Merge pull request #3287 from whowutwut/rinv_firm_output

Browse Source 
[openbmc] Better format the output of rinv <> firm command when multiple software is uploaded to the BMC
This commit is contained in:
Mark Gurevich
2017-06-19 10:47:15 -04:00
committed by GitHub
parent 54a1e38ddd df1a5aeb52
commit 9c05fa3fef
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@@ -1036,25 +1036,31 @@ sub rinv_response {
# Handle printing out all posssible Software values in a generic format:
# node: <Purpose> Software: <version> (<Activation>)
#
my $sw_id = (split(/\//, $key_url))[-1];
if (defined($content{Version}) and $content{Version}) {
my $purpose_value = uc ((split(/\./, $content{Purpose}))[-1]);
my $activation_value = (split(/\./, $content{Activation}))[-1];
#
# The space below between "SOFTWARE:" and $content{Version} is intentional
# to cause the sorting of this line before any additional info lines
# For 'rinv firm', only print Active software. 'rflash list' will handle others
#
$content_info = "$purpose_value SOFTWARE: $content{Version} ($activation_value)";
push (@sorted_output, $content_info);
if ($content{ExtendedVersion} ne "") {
# ExtendedVersion is going to be a comma separated list of additional software
my @versions = split(',', $content{ExtendedVersion});
foreach my $ver (@versions) {
$content_info = "$purpose_value SOFTWARE: -- additional info: $ver";
push (@sorted_output, $content_info);
if ($activation_value =~ "Active") {
#
# The space below between "SOFTWARE:" and $content{Version} is intentional
# to cause the sorting of this line before any additional info lines
#
$content_info = "$purpose_value SOFTWARE[$sw_id]: $content{Version} ($activation_value)";
push (@sorted_output, $content_info);
if (defined($content{ExtendedVersion}) and $content{ExtendedVersion} ne "") {
# ExtendedVersion is going to be a comma separated list of additional software
my @versions = split(',', $content{ExtendedVersion});
foreach my $ver (@versions) {
$content_info = "$purpose_value SOFTWARE[$sw_id]: -- additional info: $ver";
push (@sorted_output, $content_info);
}
}
next;
}
next;
}
} else {
if (! defined $content{Present}) {