From 2286c74f33e220ee9aecdb93ff54089153f4e078 Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Tue, 7 Mar 2017 08:26:54 +0100 Subject: [PATCH] F #4913: Add VCENTER_DISK_TYPE attribute --- src/datastore_mad/remotes/vcenter/mkfs | 2 +- src/tm_mad/vcenter/mkimage | 5 ++--- src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/datastore_mad/remotes/vcenter/mkfs b/src/datastore_mad/remotes/vcenter/mkfs index 047e2a6f77..c6b4e2e0da 100755 --- a/src/datastore_mad/remotes/vcenter/mkfs +++ b/src/datastore_mad/remotes/vcenter/mkfs @@ -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"] diff --git a/src/tm_mad/vcenter/mkimage b/src/tm_mad/vcenter/mkimage index 5d233452d8..b5b2d74c3e 100755 --- a/src/tm_mad/vcenter/mkimage +++ b/src/tm_mad/vcenter/mkimage @@ -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" diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb index cb1906b9b9..d6f05fb365 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb @@ -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}",