From 762f75c041d7c14c9d4846bf095381778735a171 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 29 Aug 2025 18:42:59 +0530 Subject: [PATCH 1/2] kvm: fix vm deployment with direct-download iso (#11532) --- .../cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java index cdb523a50fd..4ea8d1e80fb 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java @@ -84,9 +84,8 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - +import org.apache.logging.log4j.Logger; import org.libvirt.Connect; import org.libvirt.Domain; import org.libvirt.DomainInfo; @@ -2476,7 +2475,9 @@ public class KVMStorageProcessor implements StorageProcessor { if (template != null) { templatePath = template.getPath(); } - if (StringUtils.isEmpty(templatePath)) { + if (ImageFormat.ISO.equals(cmd.getFormat())) { + logger.debug("Skipping template validations as image format is {}", cmd.getFormat()); + } else if (StringUtils.isEmpty(templatePath)) { logger.warn("Skipped validation whether downloaded file is QCOW2 for template {}, due to downloaded template path is empty", template.getName()); } else if (!new File(templatePath).exists()) { logger.warn("Skipped validation whether downloaded file is QCOW2 for template {}, due to downloaded template path is not valid: {}", template.getName(), templatePath); From d161dc76699535d460950ad16dcac1bd8abf7c19 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 29 Aug 2025 18:36:30 +0200 Subject: [PATCH 2/2] api: use single quote instead of double quote in StatsResponse (#11537) --- .../java/org/apache/cloudstack/api/response/StatsResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/StatsResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/StatsResponse.java index 5dd76fa5eef..287d78bb612 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/StatsResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/StatsResponse.java @@ -27,7 +27,7 @@ import com.google.gson.annotations.SerializedName; public class StatsResponse extends BaseResponse { @SerializedName("timestamp") - @Param(description = "the time when the VM stats were collected. The format is \"yyyy-MM-dd hh:mm:ss\"") + @Param(description = "the time when the VM stats were collected. The format is 'yyyy-MM-dd hh:mm:ss'") private Date timestamp; @SerializedName("cpuused")