F #4913: Disable rm_directory for vCenter 6.5 again, wait_for_completion doesn't solve the issue

This commit is contained in:
mcabrerizo committed 2017-06-26 19:41:59 +02:00
1 parent 8ff2e568a8
commit d831d3ebf4
2 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -79,8 +79,8 @@ begin
ds.delete_file(img_src)
end
#vcenter_version = vi_client.vim.serviceContent.about.apiVersion
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) #&& vcenter_version != "6.5"
vcenter_version = vi_client.vim.serviceContent.about.apiVersion
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5"
rescue Exception => e
if !e.message.start_with?('FileNotFound')
+2 -2
View File
@@ -119,8 +119,8 @@ if path.match(/disk\.\d+$/)
ds.delete_virtual_disk(img_path)
img_dir = File.dirname(img_path)
#vcenter_version = vi_client.vim.serviceContent.about.apiVersion
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) #&& vcenter_version != "6.5"
vcenter_version = vi_client.vim.serviceContent.about.apiVersion
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5"
rescue Exception => e
if !e.message.start_with?('FileNotFound')