Repository: cloudstack Updated Branches: refs/heads/master f983e6ed8 -> 35ede0418
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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/455998ce Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/455998ce Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/455998ce Branch: refs/heads/master Commit: 455998ce959ef3d22c5ce85246a2dfe49a42432f Parents: f983e6e Author: Marcus Sorensen <marcus_soren...@apple.com> Authored: Fri Jan 23 02:44:08 2015 -0700 Committer: Marcus Sorensen <marcus_soren...@apple.com> Committed: Fri Jan 23 02:45:54 2015 -0700 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/455998ce/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- 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 9ae7a17..5912f72 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;