opennebula 6.10.1 → 6.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d584a32fed229118ffbe16f0f785ff25d85ae6dba699deafb78997536a4011c8
-  data.tar.gz: bc2e5bf010746e436295c48bae487f54ff3c39b2faae24f90a6ab22742abcdd3
+  metadata.gz: c9f38674fbfb0bc1c85d57a9216bff2e3929490a256b4bef2edbed00d04d737f
+  data.tar.gz: 1b813fee4f173f921da960533764ed60ce88630f4d8e3a9665ed492b67c934e7
 SHA512:
-  metadata.gz: 93e03cb9d4a0638107a0a349fdcc0541bf639b47262a8e4ba87b55b12dfc8dbad534080034bd0d621a57a962dfd0a7fc1bc58e986400bc7bc4c368854abc8f7e
-  data.tar.gz: c3bdb91b12d32e8c828aa30db8d4475829c28502017703acdc54478a136e7f82b5f1511f5fde245a042e6360e027c65effca4eab9b64d0a187ad94eab6181dc9
+  metadata.gz: bfdfc7cef8b97086f8a35495232f6ff3e7e842a04e3a443974aa5d14b5b2bbb253cf55933805db39db759321195ddce72e391d2d04206d37b0263387cce45c74
+  data.tar.gz: 7ca0f4c7f8dc8f517cabeca31af482799a7caab968336e2d1ccd8fc8096dcab7ff606ee6b78a045b93539fc4a0ef771fb1ad1b33d89956ac154f875fbfce6d7f

data/lib/DriverExecHelper.rb

@@ -67,9 +67,7 @@ module DriverExecHelper
     # @param [String, nil] default_name alternative name for the script
     # @param [String, ''] directory to append to the scripts path for actions
     # @return [String] command line needed to execute the action
-    def action_command_line(action, parameters,
-                            default_name = nil, directory = '')
-
+    def action_command_line(action, parameters, default_name = nil, directory = '')
         if action.is_a?(String) && action[0] == '/'
             return action + ' ' + parameters if parameters
 
@@ -110,9 +108,7 @@ module DriverExecHelper
     #
     # Sends a message to the OpenNebula core through stdout
     # rubocop:disable Metrics/ParameterLists
-    def send_message(action = '-', result = RESULT[:failure],
-                     id = '-', info = '-')
-
+    def send_message(action = '-', result = RESULT[:failure], id = '-', info = '-')
         @send_mutex.synchronize do
             STDOUT.puts "#{action} #{result} #{id} #{info}"
             STDOUT.flush

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.10.1'
+    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.1'
+    VERSION = '6.10.3'
 end

data/lib/rest_client.rb

@@ -86,13 +86,7 @@ module VCenterDriver
             new(connection)
         end
 
-        def get_or_create_tag(
-            api_client,
-            category_id,
-            tag_name,
-            tag_description
-        )
-
+        def get_or_create_tag(api_client, category_id, tag_name, tag_description)
             tag_api = VSphereAutomation::CIS::TaggingTagApi.new(api_client)
             tag = tag_api.list.value.find do |id|
                 c = tag_api.get(id).value

data/lib/vi_client.rb

@@ -239,8 +239,8 @@ module VCenterDriver
             begin
                 orig_stderr = $stderr.clone
                 orig_stdout = $stdout.clone
-                $stderr.reopen File.new('/dev/null', 'w')
-                $stdout.reopen File.new('/dev/null', 'w')
+                $stderr.reopen File.new(File::NULL, 'w')
+                $stdout.reopen File.new(File::NULL, 'w')
                 retval = yield
             rescue StandardError => e
                 $stdout.reopen orig_stdout
@@ -256,7 +256,7 @@ module VCenterDriver
         def self.in_stderr_silence
             begin
                 orig_stderr = $stderr.clone
-                $stderr.reopen File.new('/dev/null', 'w')
+                $stderr.reopen File.new(File::NULL, 'w')
                 retval = yield
             rescue StandardError => e
                 $stderr.reopen orig_stderr

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]
@@ -1117,12 +1115,7 @@ module VCenterDriver
             one_vn
         end
 
-        def import_vcenter_nics(
-            opts,
-            vm_id = nil,
-            dc_name = nil
-        )
-
+        def import_vcenter_nics(opts, vm_id = nil, dc_name = nil)
             vi_client = opts[:vi_client]
             vc_uuid = opts[:vc_uuid]
             npool = opts[:npool]

metadata

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