F #4913: Add VCENTER_DISK_TYPE attribute

This commit is contained in:
mcabrerizo committed 2017-03-07 08:26:54 +01:00
1 parent e7c5228f10
commit 2286c74f33
3 files changed
+4 -5

No files matched your search

+1 -1
View File
@@ -44,7 +44,7 @@ host_id = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_ONE
ds_image_dir = drv_action["/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VCENTER_DS_IMAGE_DIR"] || "one"
img_id = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/ID"]
adapter_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/VCENTER_ADAPTER_TYPE"]
disk_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/DISK_TYPE"]
disk_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/VCENTER_DISK_TYPE"]
size = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/SIZE"]
fs_type = drv_action["/DS_DRIVER_ACTION_DATA/IMAGE/FSTYPE"]
+2 -3
View File
@@ -64,9 +64,8 @@ one_vm = VCenterDriver::VIHelper.one_item(OpenNebula::VirtualMachine, vmid)
adapter_type = one_vm["/VM/TEMPLATE/DISK[DISK_ID=#{disk_id}]/VCENTER_ADAPTER_TYPE"]
# TODO disk_type support, that info is not coming thin, thick...
# disk_type = one_vm["/VM/TEMPLATE/DISK[DISK_ID=#{disk_id}]/DISK_TYPE"]
# disk_type = "thin" if disk_type.nil? || disk_type.empty?
disk_type = "thin"
disk_type = one_vm["/VM/TEMPLATE/DISK[DISK_ID=#{disk_id}]/VCENTER_DISK_TYPE"]
disk_type = "thin" if disk_type.nil? || disk_type.empty?
check_valid adapter_type, "adapter_type"
@@ -510,7 +510,7 @@ class Datastore < Storage
one_image << "PATH=\"vcenter://#{image_path}\"\n"
one_image << "PERSISTENT=\"YES\"\n"
one_image << "TYPE=\"#{image_type}\"\n"
one_image << "DISK_TYPE=\"#{disk_type}\"\n" if disk_type
one_image << "VCENTER_DISK_TYPE=\"#{disk_type}\"\n" if disk_type
if VCenterDriver::VIHelper.find_by_name(OpenNebula::ImagePool,
"#{image_name} - #{ds_name}",