You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/02/05 00:06:42 UTC
git commit: updated refs/heads/4.3-forward to d7ec9ca
Updated Branches:
refs/heads/4.3-forward a3caea7e0 -> d7ec9ca81
CLOUDSTACK-6027:CreateVolume from snapshot is failing with S3 on Vmware.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d7ec9ca8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d7ec9ca8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d7ec9ca8
Branch: refs/heads/4.3-forward
Commit: d7ec9ca815609d95c29b9db09ee1720bc7df4816
Parents: a3caea7
Author: Min Chen <mi...@citrix.com>
Authored: Tue Feb 4 15:04:11 2014 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Tue Feb 4 15:06:14 2014 -0800
----------------------------------------------------------------------
.../src/com/cloud/storage/resource/VmwareStorageProcessor.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7ec9ca8/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 fe568cd..6f3f2ef 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -1705,6 +1705,12 @@ public class VmwareStorageProcessor implements StorageProcessor {
throw new Exception(msg);
}
+ // strip off the extension since restoreVolumeFromSecStorage internally will append suffix there.
+ if (backedUpSnapshotUuid.endsWith(".ova")){
+ backedUpSnapshotUuid = backedUpSnapshotUuid.replace(".ova", "");
+ } else if (backedUpSnapshotUuid.endsWith(".ovf")){
+ backedUpSnapshotUuid = backedUpSnapshotUuid.replace(".ovf", "");
+ }
DatastoreMO primaryDsMo = new DatastoreMO(hyperHost.getContext(), morPrimaryDs);
restoreVolumeFromSecStorage(hyperHost, primaryDsMo,
newVolumeName, secondaryStorageUrl, backupPath, backedUpSnapshotUuid);