From bfa859925e4f6cda9d2ceb1e1cb7bd40e8d06a46 Mon Sep 17 00:00:00 2001 From: sergiojvg Date: Thu, 7 Mar 2019 05:42:13 -0600 Subject: [PATCH] B #3044: Fix image downloader (#3045) --- src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 93b9f5bfea..2b7a1c7c16 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/file_helper.rb @@ -172,8 +172,9 @@ class FileHelper # RW 2048000 VMFS "filename-flat.vdmdk" file_to_download = file.split(" ")[3][1..-2] files_to_download << file_to_download - if ds.is_descriptor?(descriptor_url.host + "/" + file_to_download) - files_to_download << download_all_filenames_in_descriptor(descriptor_url.host + "/" + file_to_download) + image_path = File.dirname(descriptor_url.host+descriptor_url.path) + if ds.is_descriptor?(image_path + "/" + file_to_download) + files_to_download << download_all_filenames_in_descriptor(image_path + "/" + file_to_download) end end @@ -202,8 +203,9 @@ class FileHelper descriptor_name = File.basename vcenter_url.path temp_folder = VAR_LOCATION + "/vcenter/" + descriptor_name + "/" FileUtils.mkdir_p(temp_folder) if !File.directory?(temp_folder) - - self.download_vmdks(files_to_download, vcenter_url.host, temp_folder, ds) + + image_path = File.dirname(vcenter_url.host+vcenter_url.path) + self.download_vmdks(files_to_download, image_path, temp_folder, ds) # Create tar.gz rs = system("cd #{temp_folder} && tar czf #{descriptor_name}.tar.gz #{files_to_download.join(' ')} > /dev/null 2>&1")