cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject [11/27] git commit: updated refs/heads/master to ae23144
Date Wed, 04 Sep 2013 22:42:20 GMT
CLOUDSTACK-3869: fix merge conflicts


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

Branch: refs/heads/master
Commit: 75bb38394b0c2efdba90506b9123b43581e66f3c
Parents: 362ef67
Author: Kelven Yang <kelveny@gmail.com>
Authored: Wed Aug 7 17:25:36 2013 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Wed Sep 4 14:49:45 2013 -0700

----------------------------------------------------------------------
 .../vmware/resource/VmwareResource.java         | 29 +-------------------
 1 file changed, 1 insertion(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75bb3839/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 6794239..448e918 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2833,38 +2833,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
                     assert (volumeDsDetails != null);
                     VirtualDevice device;
                     
-                    datastoreDiskPath = VmwareStorageLayoutHelper.syncVolumeToVmDefaultFolder(dcMo,
vmName, volumeDsDetails.second(), 
+                    datastoreDiskPath = VmwareStorageLayoutHelper.syncVolumeToVmDefaultFolder(dcMo,
vmNameOnVcenter, volumeDsDetails.second(), 
                     	volumeTO.getPath());
                     device = VmwareHelper.prepareDiskDevice(vmMo, controllerKey, new String[]
{ datastoreDiskPath }, volumeDsDetails.first(),
                         (controllerKey==ideControllerKey)?ideUnitNumber++:scsiUnitNumber++,
i + 1);
                     
-/*                    
-                    datastoreDiskPath = String.format("[%s] %s.vmdk", volumeDsDetails.second().getName(),
volumeTO.getPath());
-                    
-                    String chainInfo = volumeTO.getChainInfo();
-
-					// chainInfo is no longer in use
-                    if (chainInfo != null && !chainInfo.isEmpty()) {
-                        String[] diskChain = _gson.fromJson(chainInfo, String[].class);
-                        if (diskChain == null || diskChain.length < 1) {
-                            s_logger.warn("Empty previously-saved chain info, fall back to
the original");
-                            device = VmwareHelper.prepareDiskDevice(vmMo, controllerKey,
new String[] { datastoreDiskPath }, volumeDsDetails.first(),
-                                    (controllerKey==ideControllerKey)?ideUnitNumber++:scsiUnitNumber++,
i + 1);
-                        } else {
-                            s_logger.info("Attach the disk with stored chain info: " + chainInfo);
-                            for (int j = 0; j < diskChain.length; j++) {
-                                diskChain[j] = String.format("[%s] %s", volumeDsDetails.second().getName(),
diskChain[j]);
-                            }
-
-                            device = VmwareHelper.prepareDiskDevice(vmMo, controllerKey,
diskChain, volumeDsDetails.first(),
-                                    (controllerKey==ideControllerKey)?ideUnitNumber++:scsiUnitNumber++,
i + 1);
-                        }
-                    } else {
-                        device = VmwareHelper.prepareDiskDevice(vmMo, controllerKey, new
String[] { datastoreDiskPath }, volumeDsDetails.first(),
-                                (controllerKey==ideControllerKey)?ideUnitNumber++:scsiUnitNumber++,
i + 1);
-                    }
-*/
-                    
                     deviceConfigSpecArray[i].setDevice(device);
                     deviceConfigSpecArray[i].setOperation(VirtualDeviceConfigSpecOperation.ADD);
 


Mime
View raw message