shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F #4913: Fix CDROM images can be deleted in datastore rm action

Browse Source
This commit is contained in:
mcabrerizo 2017-04-17 17:03:27 +02:00
parent fc0f484c8e
commit 47a5a6babe
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/datastore_mad/remotes/vcenter/rm
View File

@ -48,6 +48,8 @@ check_valid ds_ref, "ds_ref"
check_valid host_id, "vcenter_cluster"
check_valid img_src, "img_src"
CDROM = "1"
begin
#TODO should imported disks be deleted?
if imported.nil? || imported.empty?
@ -57,7 +59,16 @@ begin
img_dir = img_src.split('/')[0..-2].join('/')
ds.delete_virtual_disk(img_src)
img_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TYPE"]
if img_type != CDROM
# delete the disk
ds.delete_virtual_disk(img_src)
else
# delete the CDROM iso
ds.delete_file(img_src)
end
ds.rm_directory(img_dir) if ds.dir_empty?(img_dir)
end
rescue Exception => e