You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2013/07/29 13:05:23 UTC
[1/2] git commit: updated refs/heads/4.2 to 6154c52
Updated Branches:
refs/heads/4.2 4a6fcd253 -> 6154c5224
refs/heads/master e34a75005 -> 9fe5d398a
CLOUDSTACK-3849: Set volume size in CopyAnswer for Vmware when cloning volume from bas template
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6154c522
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6154c522
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6154c522
Branch: refs/heads/4.2
Commit: 6154c52242611b5c258371eda269466dabcd2c11
Parents: 4a6fcd2
Author: Kishan Kavala <ki...@cloud.com>
Authored: Mon Jul 29 16:34:03 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon Jul 29 16:34:15 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/storage/resource/VmwareStorageProcessor.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6154c522/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 02e4e64..6451828 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -363,6 +363,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
VolumeObjectTO newVol = new VolumeObjectTO();
newVol.setPath(vmdkName);
+ newVol.setSize(volume.getSize());
return new CopyCmdAnswer(newVol);
} finally {
vmMo.detachAllDisks();
@@ -400,6 +401,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
dsMo.deleteFile(srcFile, dcMo.getMor(), true);
VolumeObjectTO newVol = new VolumeObjectTO();
newVol.setPath(vmdkName);
+ newVol.setSize(volume.getSize());
return new CopyCmdAnswer(newVol);
}
} catch (Throwable e) {
[2/2] git commit: updated refs/heads/master to 9fe5d39
Posted by ki...@apache.org.
CLOUDSTACK-3849: Set volume size in CopyAnswer for Vmware when cloning volume from bas template
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9fe5d398
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9fe5d398
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9fe5d398
Branch: refs/heads/master
Commit: 9fe5d398a2673e26c7c2f6a54018974630991d4e
Parents: e34a750
Author: Kishan Kavala <ki...@cloud.com>
Authored: Mon Jul 29 16:34:03 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon Jul 29 16:34:46 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/storage/resource/VmwareStorageProcessor.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9fe5d398/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 65a0cb5..6f569e0 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -363,6 +363,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
VolumeObjectTO newVol = new VolumeObjectTO();
newVol.setPath(vmdkName);
+ newVol.setSize(volume.getSize());
return new CopyCmdAnswer(newVol);
} finally {
vmMo.detachAllDisks();
@@ -400,6 +401,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
dsMo.deleteFile(srcFile, dcMo.getMor(), true);
VolumeObjectTO newVol = new VolumeObjectTO();
newVol.setPath(vmdkName);
+ newVol.setSize(volume.getSize());
return new CopyCmdAnswer(newVol);
}
} catch (Throwable e) {