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

To reuse the code to obtain functional software IDs, move the code to

Browse Source 
extract IDs into a function to be used by rinv response.
This commit is contained in:
Victor Hu
2017-10-17 15:07:41 -04:00
parent d6a2ba2bf0
commit 8ac06ef335
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1076,6 +1076,37 @@ sub parse_command_status {
return;
}
#-------------------------------------------------------
#
#=head3 get_functional_software_ids
#
# Checks if the FW response data contains "functional" which
# indicates the actual software version currently running on
# the Server.
#
# Returns: reference to hash
#
# =cut
#
#-------------------------------------------------------
sub get_functional_software_ids {
my $response = shift;
my %functional;
#
# Get the functional IDs to accurately mark the active running FW
#
if (${ $response->{data} }{'/xyz/openbmc_project/software/functional'} ) {
my %func_data = %{ ${ $response->{data} }{'/xyz/openbmc_project/software/functional'} };
foreach my $fw_idx (keys $func_data{endpoints}) {
my $fw_id = (split(/\//, $func_data{endpoints}[$fw_idx]))[-1];
$functional{$fw_id} = 1;
}
}
return \%functional;
}
#-------------------------------------------------------
=head3 parse_node_info
@@ -2077,21 +2108,11 @@ sub rflash_response {
my $update_priority = -1;
if ($node_info{$node}{cur_status} eq "RFLASH_LIST_RESPONSE") {
#
# Get the functional IDs to accurately mark the active running FW
#
my %functional;
if (${ $response_info->{data} }{'/xyz/openbmc_project/software/functional'} ) {
my %func_data = %{ ${ $response_info->{data} }{'/xyz/openbmc_project/software/functional'} };
foreach my $fw_idx (keys $func_data{endpoints}) {
my $fw_id = (split(/\//, $func_data{endpoints}[$fw_idx]))[-1];
$functional{$fw_id} = 1;
}
}
if (!%functional) {
my $functional = get_functional_software_ids($response_info);
if (!%{$functional}) {
# Inform users that the older firmware levels does not correctly reflect Active version
xCAT::SvrUtils::sendmsg("WARNING, The active firmware does not allow correct detecting of running firmware.", $callback, $node);
xCAT::SvrUtils::sendmsg("WARNING, The current firmware version is unable to detect running firmware version.", $callback, $node);
}
# Display "list" option header and data
@@ -2118,7 +2139,7 @@ sub rflash_response {
if (defined($content{Priority})) {
$update_priority = (split(/\./, $content{Priority}))[ -1 ];
}
if (exists($functional{$update_id}) ) {
if (exists($functional->{$update_id}) ) {
#
# If the firmware ID exists in the hash, this indicates the really active running FW
#
@@ -2126,7 +2147,7 @@ sub rflash_response {
} elsif ($update_priority == 0) {
# Priority attribute of 0 indicates the firmware to be activated on next boot
my $indicator = "(+)";
if (!%functional) {
if (!%{$functional}) {
# cannot detect, so mark firmware as Active
$indicator = "(*)";
}