Skip to content

npe guard for get host info on vmware #11054

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
DaanHoogland merged 4 commits into from
Jul 17, 2025
Merged

npe guard for get host info on vmware #11054

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fbdf69
npe guard for get host info on vmware
Jun 18, 2025
b19c425
return ESXi by default
DaanHoogland Jun 19, 2025
c6f8b9b
semis
DaanHoogland Jun 23, 2025
0a92c41
wrong double quote
Jun 23, 2025
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: 6 additions & 1 deletion vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

public class HostMO extends BaseMO implements VmwareHypervisorHost {
private static final Logger s_logger = Logger.getLogger(HostMO.class);
Map<String, VirtualMachineMO> _vmCache = new HashMap<String, VirtualMachineMO>();
Map<String, VirtualMachineMO> _vmCache = new HashMap<>();

//Map<String, String> _vmInternalNameMapCache = new HashMap<String, String>();

Expand Down Expand Up @@ -320,6 +320,11 @@

public VmwareHostType getHostType() throws Exception {
AboutInfo aboutInfo = getHostAboutInfo();
if (aboutInfo == null) {
String msg = "no type info about host known, assuming ESXi";
s_logger.warn(msg);
return VmwareHostType.ESXi;

Check warning on line 326 in vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java

View check run for this annotation

Codecov / codecov/patch

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java#L324-L326 

Added lines #L324 - L326 were not covered by tests
}
if ("VMware ESXi".equals(aboutInfo.getName()))
return VmwareHostType.ESXi;
else if ("VMware ESX".equals(aboutInfo.getName()))
Expand Down
Loading