B #6831: Fix onevm save duplicated disks

Author: paczerny

src/oca/ruby/opennebula/virtual_machine_ext.rb

@@ -51,12 +51,13 @@ class << obj
                                  'NETWORK_ID', 'VN_MAD', 'SECURITY_GROUPS', 'VLAN_ID',
                                  'BRIDGE_TYPE']
 
-            REMOVE_IMAGE_ATTRS = ['DEV_PREFIX', 'SOURCE', 'ORIGINAL_SIZE', 'SIZE',
-                                  'DISK_SNAPSHOT_TOTAL_SIZE', 'DRIVER', 'IMAGE_STATE', 'SAVE',
+            REMOVE_IMAGE_ATTRS = ['DEV_PREFIX', 'SOURCE', 'DRIVER', 'FORMAT', 'ORIGINAL_SIZE',
+                                  'DISK_SNAPSHOT_TOTAL_SIZE', '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']
+                                  'IMAGE_UID', 'LN_TARGET', 'TM_MAD', 'TM_MAD_SYSTEM',
+                                  'OPENNEBULA_MANAGED']
 
             def save_as_template(name, desc, opts = {})
                 opts = {
@@ -171,17 +172,17 @@ def save_as_template(name, desc, opts = {})
                     if !valid?(image_id)
                         logger.info 'Adding volatile disk' if logger
 
-                        disk_str = template_like_str(
-                            'TEMPLATE',
-                            true,
-                            "DISK [ DISK_ID = #{disk_id} ]"
-                        )
+                        disk_str = disk.template_like_str('.').tr("\n", ",\n")
 
-                        replace << "#{disk_str}\n"
+                        replace << "DISK = [ #{disk_str} ]\n"
 
                         next
                     end
 
+                    # SIZE, TYPE is important for volatile disk, remove them now
+                    disk.delete_element('SIZE')
+                    disk.delete_element('TYPE')
+
                     # CDROM disk, copy definition
                     if type == 'CDROM'
                         logger.info 'Adding CDROM disk' if logger
@@ -272,7 +273,7 @@ def save_as_template(name, desc, opts = {})
                 # --------------------------------------------------------------
                 # Rollback. Delete the template and the images created
                 # --------------------------------------------------------------
-                if ntid
+                if ntid && !OpenNebula.is_error?(ntid)
                     ntmpl = OpenNebula::Template.new_with_id(ntid, @client)
                     ntmpl.delete
                 end