From 2ffa7a4c01a6362d89ff284cf8e1e6359c90712f Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Wed, 19 Apr 2017 09:39:05 +0200 Subject: [PATCH] F #4913: Fix get_img_name for non persistent images and CDROM images --- .../remotes/lib/vcenter_driver/file_helper.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb b/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb index 6eb569a729..a42a2e4193 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb @@ -6,14 +6,17 @@ module VCenterDriver class FileHelper def self.get_img_name(disk, vm_id, vm_name) - if disk["PERSISTENT"] == "YES" + if disk["PERSISTENT"] == "YES" || disk["TYPE"] == "CDROM" return disk["SOURCE"] else - disk_id = disk["DISK_ID"] - return disk["SOURCE"] if disk["SOURCE"] - - ds_volatile_dir = disk["VCENTER_DS_VOLATILE_DIR"] || "one-volatile" - return "#{ds_volatile_dir}/#{vm_id}/one-#{vm_id}-#{disk_id}.vmdk" + if disk["SOURCE"] + disk_id = disk["DISK_ID"] + image_name = disk["SOURCE"].split(".").first + return "#{image_name}-#{vm_id}-#{disk_id}.vmdk" + else + ds_volatile_dir = disk["VCENTER_DS_VOLATILE_DIR"] || "one-volatile" + return "#{ds_volatile_dir}/#{vm_id}/one-#{vm_id}-#{disk_id}.vmdk" + end end end