opennebula 5.7.85.pre → 5.7.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b256cdb614bb0023edc036f04ee8042e25e44b97
-  data.tar.gz: 84b055846759a9388ad7a2237548fd169c84e0c7
+  metadata.gz: f58b279afbf33a3a7b1a328b4f4d9ca08a434a8a
+  data.tar.gz: 4d16da8ba66d0212c450b706abe60029db91bacb
 SHA512:
-  metadata.gz: d5fd4ad8d73fcaee3b0c26cce1bb45ede90a9928c6b81f76b1405a4c711dca35877f469b04cdc7a0780ff636f5dc56b1f42c475377780e4c7d16be7cd637081e
-  data.tar.gz: d683dab0fa543b85ee8753b663154bab86511846b08df3435c5084feadcff1ecb5c29d6e2ba66b12bf7e0beced5c2b9a816752ede48768a27100205540591fa0
+  metadata.gz: ed53aa2554a1b4112851cdaa898f72ba8313412a31980f68ead9dd99324f8c07aad3dd24d5730112706069777642b5d1bda7053a0284bf944b7779ac949a4c5e
+  data.tar.gz: ed7c9f250ab0fbe4ea381dbabeb47b9868946a8729b5572d772de016be08d82699a9097523fdea450f049ea21817acc445aac6864f80764540fb608c9b64d65c

data/lib/cloud/CloudClient.rb

@@ -50,7 +50,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.7.85'
+    VERSION = '5.7.90'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/opennebula.rb

@@ -71,5 +71,5 @@ require 'opennebula/vntemplate_pool'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.7.85'
+    VERSION = '5.7.90'
 end

data/lib/opennebula/virtual_machine.rb

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.7.85.pre
+  version: 5.7.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri