You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/04/09 01:35:53 UTC

git commit: updated refs/heads/4.4 to 73c4e83

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 7cd4319ee -> 73c4e83ac


make sure volumeUuid is not full path


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/73c4e83a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/73c4e83a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/73c4e83a

Branch: refs/heads/4.4
Commit: 73c4e83aceda78e23a00a8b5e47e39508479bc75
Parents: 7cd4319
Author: Anthony Xu <an...@citrix.com>
Authored: Tue Apr 8 16:34:59 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Tue Apr 8 16:35:31 2014 -0700

----------------------------------------------------------------------
 .../com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/73c4e83a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
index 936ccf7..605d154 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
@@ -123,8 +123,13 @@ public class LibvirtStoragePool implements KVMStoragePool {
     }
 
     @Override
-    public KVMPhysicalDisk getPhysicalDisk(String volumeUuid) {
+    public KVMPhysicalDisk getPhysicalDisk(String volumeUid) {
         KVMPhysicalDisk disk = null;
+        String volumeUuid = volumeUid;
+        if ( volumeUid.contains("/") ) {
+            String[] tokens = volumeUid.split("/");
+            volumeUuid = tokens[tokens.length -1];
+        }
         try {
             disk = this._storageAdaptor.getPhysicalDisk(volumeUuid, this);
         } catch (CloudRuntimeException e) {