From 455998ce959ef3d22c5ce85246a2dfe49a42432f 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 9ae7a17a5c1..5912f72503b 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -4080,6 +4080,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;