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: Add delete_file method using DeleteDatastoreFile_Task. Move some methods from Datastore class to Storage class

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

142
src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb
View File

@ -183,6 +183,71 @@ class Storage
return one_tmp
end
def create_virtual_disk(img_name, size, adapter_type, disk_type)
leading_dirs = img_name.split('/')[0..-2]
if !leading_dirs.empty?
create_directory(leading_dirs.join('/'))
end
ds_name = self['name']
vmdk_spec = RbVmomi::VIM::FileBackedVirtualDiskSpec(
:adapterType => adapter_type,
:capacityKb => size.to_i*1024,
:diskType => disk_type
)
get_vdm.CreateVirtualDisk_Task(
:datacenter => get_dc.item,
:name => "[#{ds_name}] #{img_name}.vmdk",
:spec => vmdk_spec
).wait_for_completion
"#{img_name}.vmdk"
end
def create_directory(directory)
ds_name = self['name']
return if self.class == VCenterDriver::StoragePod
directory_name = "[#{ds_name}] #{directory}"
create_directory_params = {
:name => directory_name,
:datacenter => get_dc.item,
:createParentDirectories => true
}
begin
get_fm.MakeDirectory(create_directory_params)
rescue RbVmomi::VIM::FileAlreadyExists => e
# Do nothing if directory already exists
end
end
def get_fm
self['_connection.serviceContent.fileManager']
end
def get_vdm
self['_connection.serviceContent.virtualDiskManager']
end
def get_dc
item = @item
while !item.instance_of? RbVmomi::VIM::Datacenter
item = item.parent
if item.nil?
raise "Could not find the parent Datacenter"
end
end
Datacenter.new(item)
end
end # class Storage
@ -217,29 +282,6 @@ class Datastore < Storage
@one_item = {}
end
def create_virtual_disk(img_name, size, adapter_type, disk_type)
leading_dirs = img_name.split('/')[0..-2]
if !leading_dirs.empty?
create_directory(leading_dirs.join('/'))
end
ds_name = self['name']
vmdk_spec = RbVmomi::VIM::FileBackedVirtualDiskSpec(
:adapterType => adapter_type,
:capacityKb => size.to_i*1024,
:diskType => disk_type
)
get_vdm.CreateVirtualDisk_Task(
:datacenter => get_dc.item,
:name => "[#{ds_name}] #{img_name}.vmdk",
:spec => vmdk_spec
).wait_for_completion
"#{img_name}.vmdk"
end
def delete_virtual_disk(img_name)
ds_name = self['name']
@ -256,6 +298,23 @@ class Datastore < Storage
end
end
def delete_file(img_name)
ds_name = self['name']
begin
get_fm.DeleteDatastoreFile_Task(
:name => "[#{ds_name}] #{img_name}",
:datacenter => get_dc.item
).wait_for_completion
rescue Exception => e
# Ignore if file not found
if !e.message.start_with?('ManagedObjectNotFound')
raise e
end
end
end
# Copy a VirtualDisk
def copy_virtual_disk(src_path, target_ds, target_path, new_size=nil)
source_ds_name = self['name']
@ -292,22 +351,6 @@ class Datastore < Storage
target_path
end
def create_directory(directory)
ds_name = self['name']
create_directory_params = {
:name => "[#{ds_name}] #{directory}",
:datacenter => get_dc.item,
:createParentDirectories => true
}
begin
get_fm.MakeDirectory(create_directory_params)
rescue RbVmomi::VIM::FileAlreadyExists => e
# Do nothing if directory already exists
end
end
def rm_directory(directory)
ds_name = self['name']
@ -403,27 +446,6 @@ class Datastore < Storage
return search_params
end
def get_fm
self['_connection.serviceContent.fileManager']
end
def get_vdm
self['_connection.serviceContent.virtualDiskManager']
end
def get_dc
item = @item
while !item.instance_of? RbVmomi::VIM::Datacenter
item = item.parent
if item.nil?
raise "Could not find the parent Datacenter"
end
end
Datacenter.new(item)
end
def get_dc_path
dc = get_dc
p = dc.item.parent