opennebula 6.10.2 → 6.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05521e61ef3a50f232f6c0374ad78c1fa45cb8a4b643491590129a79296ae7a1
-  data.tar.gz: a9bc63b7e4b714de8c4de4c0f1928911dc47b9425b8d701fc33fa80c782e1ec7
+  metadata.gz: c9f38674fbfb0bc1c85d57a9216bff2e3929490a256b4bef2edbed00d04d737f
+  data.tar.gz: 1b813fee4f173f921da960533764ed60ce88630f4d8e3a9665ed492b67c934e7
 SHA512:
-  metadata.gz: f193bf2093a1b44197f0a0230d27cf9c05dffd46d5d945db93d3028ff58bae9a36fda41e2bd8cd3503ea5d468aee665d1c54ed10fe336b2c32cd4cb801dff8a9
-  data.tar.gz: 1e125fca63ab7aa69fe51e29008c3b44495ff80caf330d5763c81ab904fea70ee27ab9f51204b57a441f8793265961076fa0e3ea8232b5acf31feece55fff5cf
+  metadata.gz: bfdfc7cef8b97086f8a35495232f6ff3e7e842a04e3a443974aa5d14b5b2bbb253cf55933805db39db759321195ddce72e391d2d04206d37b0263387cce45c74
+  data.tar.gz: 7ca0f4c7f8dc8f517cabeca31af482799a7caab968336e2d1ccd8fc8096dcab7ff606ee6b78a045b93539fc4a0ef771fb1ad1b33d89956ac154f875fbfce6d7f

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.10.2'
+    VERSION = '6.10.3'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/opennebula/virtual_machine_ext.rb

@@ -51,12 +51,13 @@ module OpenNebula::VirtualMachineExt
                                  '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 @@ module OpenNebula::VirtualMachineExt
                     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 @@ module OpenNebula::VirtualMachineExt
                 # --------------------------------------------------------------
                 # 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

data/lib/opennebula/xml_element.rb

@@ -294,6 +294,8 @@ module OpenNebula
         end
 
         # Returns elements in text form
+        # Known bug: For some older versions of REXML, the xpath expression
+        #            returns more nodes than expected
         # root_element:: _String_ base element
         # indent:: _Boolean_ indents the resulting string, default true
         # xpath_exp:: _String_ filter elements with a XPath

data/lib/opennebula.rb

@@ -79,5 +79,5 @@ require 'opennebula/backupjob_pool'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.10.2'
+    VERSION = '6.10.3'
 end

data/lib/vm_template.rb

@@ -1041,10 +1041,8 @@ module VCenterDriver
                 :template_id=>           vm_id
             }
 
-            if nic[:pg_type] ==
-                VCenterDriver::Network::NETWORK_TYPE_NSXV ||
-                nic[:pg_type] ==
-                    VCenterDriver::Network::NETWORK_TYPE_NSXT
+            if [VCenterDriver::Network::NETWORK_TYPE_NSXV,
+                VCenterDriver::Network::NETWORK_TYPE_NSXT].include?(nic[:pg_type])
                 import_opts[:nsx_id] = config[:nsx_id]
                 import_opts[:nsx_vni] = config[:nsx_vni]
                 import_opts[:nsx_tz_id] = config[:nsx_tz_id]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.10.2
+  version: 6.10.3
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri