Revision 8ff2e568
| src/datastore_mad/remotes/vcenter/rm | ||
|---|---|---|
| 79 | 79 |
ds.delete_file(img_src) |
| 80 | 80 |
end |
| 81 | 81 |
|
| 82 |
vcenter_version = vi_client.vim.serviceContent.about.apiVersion |
|
| 83 |
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5" |
|
| 82 |
#vcenter_version = vi_client.vim.serviceContent.about.apiVersion
|
|
| 83 |
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) #&& vcenter_version != "6.5"
|
|
| 84 | 84 |
|
| 85 | 85 |
rescue Exception => e |
| 86 | 86 |
if !e.message.start_with?('FileNotFound')
|
| src/tm_mad/vcenter/delete | ||
|---|---|---|
| 119 | 119 |
|
| 120 | 120 |
ds.delete_virtual_disk(img_path) |
| 121 | 121 |
img_dir = File.dirname(img_path) |
| 122 |
vcenter_version = vi_client.vim.serviceContent.about.apiVersion |
|
| 123 |
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5" |
|
| 122 |
#vcenter_version = vi_client.vim.serviceContent.about.apiVersion
|
|
| 123 |
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) #&& vcenter_version != "6.5"
|
|
| 124 | 124 |
|
| 125 | 125 |
rescue Exception => e |
| 126 | 126 |
if !e.message.start_with?('FileNotFound')
|
| src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb | ||
|---|---|---|
| 364 | 364 |
:datacenter => get_dc.item |
| 365 | 365 |
} |
| 366 | 366 |
|
| 367 |
get_fm.DeleteDatastoreFile_Task(rm_directory_params) |
|
| 367 |
get_fm.DeleteDatastoreFile_Task(rm_directory_params).wait_for_completion
|
|
| 368 | 368 |
end |
| 369 | 369 |
|
| 370 | 370 |
def dir_empty?(path) |
Also available in: Unified diff