From 878b43bc64bf3070babc4a62f4c5c74f9cbb0b38 Mon Sep 17 00:00:00 2001 From: Rajani Karuturi Date: Mon, 30 Mar 2015 17:52:43 +0530 Subject: [PATCH] volume-upload: removed hardcoded vhd for Image format check. --- .../storage/resource/NfsSecondaryStorageResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index 8ccbcb6cf5f..1571f50dcec 100755 --- a/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -2666,13 +2666,13 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S String fileSavedTempLocation = uploadEntity.getInstallPathPrefix() + "/" + filename; String uploadedFileExtension = FilenameUtils.getExtension(filename); - String userSelectedFormat= "vhd"; + String userSelectedFormat= uploadEntity.getFormat().toString(); if(uploadedFileExtension.equals("zip") || uploadedFileExtension.equals("bz2") || uploadedFileExtension.equals("gz")) { userSelectedFormat += "." + uploadedFileExtension; } String formatError = ImageStoreUtil.checkTemplateFormat(fileSavedTempLocation, userSelectedFormat); if(StringUtils.isNotBlank(formatError)) { - String errorString = "File type mismatch between uploaded file and selected format. Selected file format: " + uploadEntity.getFormat() + ". Received: " + formatError; + String errorString = "File type mismatch between uploaded file and selected format. Selected file format: " + userSelectedFormat + ". Received: " + formatError; s_logger.error(errorString); return errorString; }