From 0a8e73e8fe6a7077c90c55880d556f0f883fc83f Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Fri, 23 Jan 2015 02:44:08 -0700 Subject: [PATCH] LibvirtComputingResource: Expose KVMStoragePoolManager KVMStoragePoolManager is a singleton in practice, any plugin or extension of LibvirtComputingResource will need to act on the specific instance of KVMStoragePoolManager that LibvirtComputingResource has initialized. Therefore, expose this variable for those who wish to call storage commands from plugins or extensions. Conflicts: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 691601fc8e8..f2dfc4ceb8b 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -4075,6 +4075,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv return _storagePoolMgr.disconnectPhysicalDiskByPath(path); } + protected KVMStoragePoolManager getPoolManager() { + return _storagePoolMgr; + } + protected synchronized String attachOrDetachISO(Connect conn, String vmName, String isoPath, boolean isAttach) throws LibvirtException, URISyntaxException, InternalErrorException { String isoXml = null;