From bdae23ed5369e42d2067e206602c81cefccd59b7 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 28 Feb 2025 10:24:23 -0500 Subject: [PATCH] Fix listing disk offerings for newly created VMs that haven't yet been started (#10476) --- .../src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java | 3 +++ server/src/main/java/com/cloud/api/ApiDBUtils.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index 7b231d02cb0..472fe148a5d 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -6071,6 +6071,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public Map getDiskOfferingSuitabilityForVm(long vmId, List diskOfferingIds) { VMInstanceVO vm = _vmDao.findById(vmId); + if (userVmDetailsDao.findDetail(vm.getId(), VmDetailConstants.DEPLOY_VM) != null) { + return new HashMap<>(); + } VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); Pair clusterAndHost = findClusterAndHostIdForVm(vm, false); Long clusterId = clusterAndHost.first(); diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java index 944f60d292c..4ef1b28b9c0 100644 --- a/server/src/main/java/com/cloud/api/ApiDBUtils.java +++ b/server/src/main/java/com/cloud/api/ApiDBUtils.java @@ -2137,7 +2137,7 @@ public class ApiDBUtils { for (DiskOfferingJoinVO offering : offerings) { DiskOfferingResponse response = s_diskOfferingJoinDao.newDiskOfferingResponse(offering); if (vmId != null) { - response.setSuitableForVm(suitability.get(offering.getId())); + response.setSuitableForVm(suitability.getOrDefault(offering.getId(), true)); } list.add(response); }