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

B #1312: Fix Disk advanced params not saved to new template

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2019-02-06 15:14:49 +01:00 committed by Ruben S. Montero
parent 8d2d15c8ae
commit 6cb05dadb2
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/oca/ruby/opennebula/virtual_machine.rb
View File

@ -782,6 +782,12 @@ module OpenNebula
REMOVE_VNET_ATTRS = %w{AR_ID BRIDGE CLUSTER_ID IP MAC TARGET NIC_ID
NETWORK_ID VN_MAD SECURITY_GROUPS VLAN_ID}
REMOVE_IMAGE_ATTRS = %w{DEV_PREFIX SOURCE ORIGINAL_SIZE SIZE
DISK_SNAPSHOT_TOTAL_SIZE DRIVER IMAGE_STATE SAVE CLONE READONLY
PERSISTENT TARGET ALLOW_ORPHANS CLONE_TARGET CLUSTER_ID DATASTORE
DATASTORE_ID DISK_ID DISK_TYPE IMAGE_ID IMAGE IMAGE_UNAME IMAGE_UID
LN_TARGET TM_MAD TYPE OPENNEBULA_MANAGED}
def save_as_template(name,description, persistent=nil)
img_ids = []
new_tid = nil
@ -858,13 +864,19 @@ module OpenNebula
raise
end
image_id = disk["IMAGE_ID"]
image_id = disk["IMAGE_ID"]
opennebula_managed = disk["OPENNEBULA_MANAGED"]
type = disk["TYPE"]
REMOVE_IMAGE_ATTRS.each do |attr|
disk.delete_element(attr)
end
if !image_id.nil? && !image_id.empty?
if disk['TYPE'] == 'CDROM'
if type == 'CDROM'
replace << "DISK = [ IMAGE_ID = #{image_id}"
if disk["OPENNEBULA_MANAGED"]
replace << ", OPENNEBULA_MANAGED=#{disk["OPENNEBULA_MANAGED"]}"
if opennebula_managed
replace << ", OPENNEBULA_MANAGED=#{opennebula_managed}"
end
replace << " ]\n"
else
@ -878,7 +890,14 @@ module OpenNebula
img_ids << rc.to_i
replace << "DISK = [ IMAGE_ID = #{rc} ]\n"
disk_template = disk.template_like_str(".").tr("\n", ",\n")
if disk_template.empty?
replace << "DISK = [ IMAGE_ID = #{rc} ] \n"
else
replace << "DISK = [ IMAGE_ID = #{rc}, " <<
disk_template << " ] \n"
end
end
else
# Volatile disks cannot be saved, so the definition is copied