cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject git commit: updated refs/heads/4.4-forward to 1053952
Date Tue, 22 Apr 2014 21:56:54 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward b32fb37c5 -> 1053952b2


CLOUDSTACK-6469


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

Branch: refs/heads/4.4-forward
Commit: 1053952b2ac4203b486bccf246b9be34d2b20d7b
Parents: b32fb37
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Tue Apr 22 15:51:59 2014 -0600
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Tue Apr 22 15:56:22 2014 -0600

----------------------------------------------------------------------
 .../resource/VmwareStorageProcessor.java        | 26 --------------------
 1 file changed, 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1053952b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index e413524..ff893b2 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -358,10 +358,6 @@ public class VmwareStorageProcessor implements StorageProcessor {
             throw new Exception(msg);
         }
 
-        if (dsMo.folderExists(String.format("[%s]", dsMo.getName()), vmdkName)) {
-            dsMo.deleteFile(String.format("[%s] %s/", dsMo.getName(), vmdkName), dcMo.getMor(),
false);
-        }
-
         s_logger.info("creating linked clone from template");
 
         if (!vmTemplate.createLinkedClone(vmdkName, morBaseSnapshot, dcMo.getVmFolder(),
morPool, morDatastore)) {
@@ -372,24 +368,11 @@ public class VmwareStorageProcessor implements StorageProcessor {
             throw new Exception(msg);
         }
 
-        // we can't rely on un-offical API (VirtualMachineMO.moveAllVmDiskFiles() any more,
use hard-coded disk names that we know to move files
-        s_logger.info("Move volume out of volume-wrapper VM ");
-
-        dsMo.moveDatastoreFile(String.format("[%s] %s/%s.vmdk", dsMo.getName(), vmdkName,
vmdkName), dcMo.getMor(), dsMo.getMor(),
-            String.format("[%s] %s.vmdk", dsMo.getName(), vmdkName), dcMo.getMor(), true);
-
-        dsMo.moveDatastoreFile(String.format("[%s] %s/%s-delta.vmdk", dsMo.getName(), vmdkName,
vmdkName), dcMo.getMor(), dsMo.getMor(),
-            String.format("[%s] %s-delta.vmdk", dsMo.getName(), vmdkName), dcMo.getMor(),
true);
-
         return true;
     }
 
     private boolean createVMFullClone(VirtualMachineMO vmTemplate, DatacenterMO dcMo, DatastoreMO
dsMo, String vmdkName, ManagedObjectReference morDatastore,
             ManagedObjectReference morPool) throws Exception {
-        if (dsMo.folderExists(String.format("[%s]", dsMo.getName()), vmdkName)) {
-            dsMo.deleteFile(String.format("[%s] %s/", dsMo.getName(), vmdkName), dcMo.getMor(),
false);
-        }
-
         s_logger.info("creating full clone from template");
 
         if (!vmTemplate.createFullClone(vmdkName, dcMo.getVmFolder(), morPool, morDatastore))
{
@@ -400,15 +383,6 @@ public class VmwareStorageProcessor implements StorageProcessor {
             throw new Exception(msg);
         }
 
-        // we can't rely on un-offical API (VirtualMachineMO.moveAllVmDiskFiles() any more,
use hard-coded disk names that we know to move files
-        s_logger.info("Move volume out of volume-wrapper VM ");
-
-        dsMo.moveDatastoreFile(String.format("[%s] %s/%s.vmdk", dsMo.getName(), vmdkName,
vmdkName), dcMo.getMor(), dsMo.getMor(),
-            String.format("[%s] %s.vmdk", dsMo.getName(), vmdkName), dcMo.getMor(), true);
-
-        dsMo.moveDatastoreFile(String.format("[%s] %s/%s-flat.vmdk", dsMo.getName(), vmdkName,
vmdkName), dcMo.getMor(), dsMo.getMor(),
-            String.format("[%s] %s-flat.vmdk", dsMo.getName(), vmdkName), dcMo.getMor(),
true);
-
         return true;
     }
 


Mime
View raw message