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 downcase to OPENNEBULA_MANAGED=NO check

Browse Source
This commit is contained in:
mcabrerizo 2017-04-19 09:38:16 +02:00
parent 1362c8964a
commit 1743b05ee5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tm_mad/vcenter/clone
View File

@ -93,7 +93,7 @@ begin
# Unmanaged disks are those with OPENNEBULA_MANAGED=NO or volatile disks
# that are created in StorageDRS clusters
unmanaged_disk = (!!disk['OPENNEBULA_MANAGED'] && disk['OPENNEBULA_MANAGED'] == "NO") ||
unmanaged_disk = (!!disk['OPENNEBULA_MANAGED'] && disk['OPENNEBULA_MANAGED'].downcase == "no") ||
(target_ds_ref.start_with?('group-') && !!disk["TYPE"] && disk["TYPE"].downcase == "fs")
if !unmanaged_disk

2
src/tm_mad/vcenter/cpds
View File

@ -79,7 +79,7 @@ begin
source_ds_ref = ""
# If disk is unmanaged get the reference from template
if disk["OPENNEBULA_MANAGED"] && disk["OPENNEBULA_MANAGED"] == "NO"
if disk["OPENNEBULA_MANAGED"] && disk["OPENNEBULA_MANAGED"].downcase == "no"
unmanaged_keys = vm.get_unmanaged_keys
device_key = unmanaged_keys["opennebula.disk.#{disk["DISK_ID"]}"].to_i
image_path, source_ds_ref = vm.get_device_filename_and_ds_from_key(device_key)

6
src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
View File

@ -1212,7 +1212,7 @@ class VirtualMachine < Template
device_change = []
# Get unmanaged disks in OpenNebula's VM template
xpath = "TEMPLATE/DISK[OPENNEBULA_MANAGED=\"NO\"]"
xpath = "TEMPLATE/DISK[OPENNEBULA_MANAGED=\"NO\" or OPENNEBULA_MANAGED=\"no\"]"
unmanaged_disks = one_item.retrieve_xmlelements(xpath)
if !unmanaged_disks.empty?
@ -1241,7 +1241,7 @@ class VirtualMachine < Template
end
# Add info for existing nics in template in vm xml
xpath = "TEMPLATE/NIC[OPENNEBULA_MANAGED=\"NO\"]"
xpath = "TEMPLATE/NIC[OPENNEBULA_MANAGED=\"NO\" or OPENNEBULA_MANAGED=\"no\"]"
unmanaged_nics = one_item.retrieve_xmlelements(xpath)
if !unmanaged_nics.empty?
@ -1273,7 +1273,7 @@ class VirtualMachine < Template
vc_disks = get_vcenter_disks
# Look for unmanaged disks with original size changed
xpath = "TEMPLATE/DISK[OPENNEBULA_MANAGED=\"NO\" and boolean(ORIGINAL_SIZE)]"
xpath = "TEMPLATE/DISK[(OPENNEBULA_MANAGED=\"NO\" or OPENNEBULA_MANAGED=\"no\") and boolean(ORIGINAL_SIZE) and ORIGINAL_SIZE != SIZE]"
unmanaged_resized_disks = one_item.retrieve_xmlelements(xpath)
return if unmanaged_resized_disks.empty?