Skip to content

Set UefiCapabilty for all hypervisors in hostresponse #6140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvazquez merged 1 commit into from
Mar 21, 2022
Merged

Set UefiCapabilty for all hypervisors in hostresponse #6140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,13 +533,6 @@ public void setDetails(Map details) {
detailsCopy.remove("username");
detailsCopy.remove("password");

if (detailsCopy.containsKey(Host.HOST_UEFI_ENABLE)) {
this.setUefiCapabilty(Boolean.parseBoolean((String) detailsCopy.get(Host.HOST_UEFI_ENABLE)));
detailsCopy.remove(Host.HOST_UEFI_ENABLE);
} else {
this.setUefiCapabilty(new Boolean(false)); // in case of existing host which is not scanned for UEFI capability
}

this.details = detailsCopy;
}

Expand Down
11 changes: 10 additions & 1 deletion server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.inject.Inject;
Expand Down Expand Up @@ -230,10 +231,18 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail
}
}

Map<String, String> hostDetails = hostDetailsDao.findDetails(host.getId());
if (hostDetails != null) {
if (hostDetails.containsKey(Host.HOST_UEFI_ENABLE)) {
hostResponse.setUefiCapabilty(Boolean.parseBoolean((String) hostDetails.get(Host.HOST_UEFI_ENABLE)));
} else {
hostResponse.setUefiCapabilty(new Boolean(false));
}
}
if (details.contains(HostDetails.all) && host.getHypervisorType() == Hypervisor.HypervisorType.KVM) {
//only kvm has the requirement to return host details
try {
hostResponse.setDetails(hostDetailsDao.findDetails(host.getId()));
hostResponse.setDetails(hostDetails);
} catch (Exception e) {
s_logger.debug("failed to get host details", e);
}
Expand Down