From 8fbdf696b58c69dda9950838faa180ab67146725 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 18 Jun 2025 16:56:00 +0200 Subject: [PATCH 1/4] npe guard for get host info on vmware --- .../main/java/com/cloud/hypervisor/vmware/mo/HostMO.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java index 3b96e7e19990..431d39d747ed 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java @@ -75,7 +75,7 @@ public class HostMO extends BaseMO implements VmwareHypervisorHost { private static final Logger s_logger = Logger.getLogger(HostMO.class); - Map _vmCache = new HashMap(); + Map _vmCache = new HashMap<>(); //Map _vmInternalNameMapCache = new HashMap(); @@ -320,6 +320,11 @@ public AboutInfo getHostAboutInfo() throws Exception { public VmwareHostType getHostType() throws Exception { AboutInfo aboutInfo = getHostAboutInfo(); + if (aboutInfo == null) { + String msg = "no type info about host known" + s_logger.error(msg) + throw new Exception(msg); + } if ("VMware ESXi".equals(aboutInfo.getName())) return VmwareHostType.ESXi; else if ("VMware ESX".equals(aboutInfo.getName())) From b19c4254f8c8f2ad47289c15858e333b2d19f177 Mon Sep 17 00:00:00 2001 From: dahn Date: Thu, 19 Jun 2025 10:15:53 +0200 Subject: [PATCH 2/4] return ESXi by default --- .../main/java/com/cloud/hypervisor/vmware/mo/HostMO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java index 431d39d747ed..116492b659ae 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java @@ -321,9 +321,9 @@ public AboutInfo getHostAboutInfo() throws Exception { public VmwareHostType getHostType() throws Exception { AboutInfo aboutInfo = getHostAboutInfo(); if (aboutInfo == null) { - String msg = "no type info about host known" - s_logger.error(msg) - throw new Exception(msg); + String msg = "no type info about host known, assuming ESXi" + s_logger.warn(msg) + return VmwareHostType.ESXi; } if ("VMware ESXi".equals(aboutInfo.getName())) return VmwareHostType.ESXi; From c6f8b9bb2638e2bf1b015511d511645e77a6f9ea Mon Sep 17 00:00:00 2001 From: dahn Date: Mon, 23 Jun 2025 13:43:08 +0200 Subject: [PATCH 3/4] semis --- .../src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java index 116492b659ae..543dbecf36eb 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java @@ -321,8 +321,8 @@ public AboutInfo getHostAboutInfo() throws Exception { 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) + String msg = "no type info about host known, assuming ESXi”; + s_logger.warn(msg); return VmwareHostType.ESXi; } if ("VMware ESXi".equals(aboutInfo.getName())) From 0a92c4108c18ac0989feeca17a5adbfea90f7662 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 23 Jun 2025 17:58:45 +0200 Subject: [PATCH 4/4] wrong double quote --- .../src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java index 543dbecf36eb..93a471d56bb5 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java @@ -321,7 +321,7 @@ public AboutInfo getHostAboutInfo() throws Exception { public VmwareHostType getHostType() throws Exception { AboutInfo aboutInfo = getHostAboutInfo(); if (aboutInfo == null) { - String msg = "no type info about host known, assuming ESXi”; + String msg = "no type info about host known, assuming ESXi"; s_logger.warn(msg); return VmwareHostType.ESXi; }