From f29002bf08a15c16af1c272896dff481bff96d15 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Wed, 29 Apr 2026 12:49:55 -0400 Subject: [PATCH] address comment --- .../cloud/hypervisor/kvm/storage/ClvmStorageAdaptor.java | 2 +- .../hypervisor/kvm/storage/KVMStoragePoolManager.java | 2 +- .../com/cloud/hypervisor/kvm/storage/StorageAdaptor.java | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptor.java index 1402ae96d6a..b04b15546d5 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptor.java @@ -207,7 +207,7 @@ public class ClvmStorageAdaptor extends LibvirtStorageAdaptor { } @Override - public void createTemplateOnClvmNg(String templatePath, String templateUuid, int timeout, KVMStoragePool pool) { + public void createTemplate(String templatePath, String templateUuid, int timeout, KVMStoragePool pool) { String vgName = getVgName(pool.getLocalPath()); String lvName = "template-" + templateUuid; String lvPath = "/dev/" + vgName + "/" + lvName; diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java index a92fadd4bc1..6555f00c2b5 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java @@ -527,7 +527,7 @@ public class KVMStoragePoolManager { public void createTemplateOnClvmNg(String templatePath, String templateUuid, int timeout, KVMStoragePool pool) { StorageAdaptor adaptor = getStorageAdaptor(pool.getType()); - adaptor.createTemplateOnClvmNg(templatePath, templateUuid, timeout, pool); + adaptor.createTemplate(templatePath, templateUuid, timeout, pool); } public Ternary, String> prepareStorageClient(StoragePoolType type, String uuid, Map details) { diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java index 08a40fc6bf5..fb474a6bc7d 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java @@ -149,11 +149,7 @@ public interface StorageAdaptor { return new Pair<>(true, ""); } - /** - * Creates a template LV on a CLVM_NG pool from the given QCOW2 template file. - * Default implementation is a no-op; overridden by ClvmStorageAdaptor. - */ - default void createTemplateOnClvmNg(String templatePath, String templateUuid, int timeout, KVMStoragePool pool) { - // no-op for non-CLVM adaptors + default void createTemplate(String templatePath, String templateUuid, int timeout, KVMStoragePool pool) { + // no-op } }