From 2f24ebb7773653de9e389ca6637c47530e7eba46 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 2 Dec 2016 12:44:16 +0530 Subject: [PATCH] CLOUDSTACK-9633: Revert addition of `vhd` extention to snapshots This reverts commit f1fd325c085cd61336ac616ba76e2c1f3f916cd1 and changes introduced in commit f46651e6721106941deeb6b5e6bf51d7e9efc61c that changed the snapshot file name to include a `vhd` extension. With this change, CloudStack users should not hit upgrade issues. Signed-off-by: Rohit Yadav --- .../xenserver/resource/Xenserver625StorageProcessor.java | 4 ++-- tools/marvin/marvin/lib/utils.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java index ae5dbaf4368f..f4f95ef2645b 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java @@ -529,7 +529,7 @@ public Answer backupSnapshot(final CopyCommand cmd) { // finalPath = folder + File.separator + // snapshotBackupUuid; } else { - finalPath = folder + File.separator + snapshotBackupUuid + ".vhd"; + finalPath = folder + File.separator + snapshotBackupUuid; } } finally { @@ -562,7 +562,7 @@ public Answer backupSnapshot(final CopyCommand cmd) { final String[] tmp = result.split("#"); snapshotBackupUuid = tmp[0]; physicalSize = Long.parseLong(tmp[1]); - finalPath = folder + File.separator + snapshotBackupUuid + ".vhd"; + finalPath = folder + File.separator + snapshotBackupUuid; } } final String volumeUuid = snapshotTO.getVolume().getPath(); diff --git a/tools/marvin/marvin/lib/utils.py b/tools/marvin/marvin/lib/utils.py index 895d65c08ac0..68fb33690192 100644 --- a/tools/marvin/marvin/lib/utils.py +++ b/tools/marvin/marvin/lib/utils.py @@ -292,7 +292,7 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid): # snapshot extension to be appended to the snapshot path obtained from db snapshot_extensions = {"vmware": ".ovf", "kvm": "", - "xenserver": "", + "xenserver": ".vhd", "simulator":""} qresultset = dbconn.execute(