shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

B #2610: vm saveas works with CDs

Browse Source 
B #2610: save as template treats iso cds
This commit is contained in:
Sergio Semedi Barranco 2018-11-20 09:40:05 +01:00 committed by Ruben S. Montero
parent 7bbf3e0b54
commit 23d527bcfa
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -840,17 +840,25 @@ module OpenNebula
image_id = disk["IMAGE_ID"]
if !image_id.nil? && !image_id.empty?
rc = disk_saveas(disk_id.to_i,"#{name}-disk-#{disk_id}","",-1)
if disk['TYPE'] == 'CDROM'
replace << "DISK = [ IMAGE_ID = #{image_id}"
if disk["OPENNEBULA_MANAGED"]
replace << ", OPENNEBULA_MANAGED=#{disk["OPENNEBULA_MANAGED"]}"
end
replace << " ]\n"
else
rc = disk_saveas(disk_id.to_i,"#{name}-disk-#{disk_id}","",-1)
raise if OpenNebula.is_error?(rc)
raise if OpenNebula.is_error?(rc)
if persistent == true
OpenNebula::Image.new_with_id(rc.to_i, @client).persistent()
if persistent == true
OpenNebula::Image.new_with_id(rc.to_i, @client).persistent()
end
img_ids << rc.to_i
replace << "DISK = [ IMAGE_ID = #{rc} ]\n"
end
img_ids << rc.to_i
replace << "DISK = [ IMAGE_ID = #{rc} ]\n"
else
# Volatile disks cannot be saved, so the definition is copied
replace << self.template_like_str(
@ -859,12 +867,13 @@ module OpenNebula
end
self.each('TEMPLATE/NIC') do |nic|
nic_id = nic["NIC_ID"]
if nic_id.nil? || nic_id.empty?
rc = Error.new('The NIC_ID is missing from the VM template')
raise
end
REMOVE_VNET_ATTRS.each do |attr|
nic.delete_element(attr)
end