opennebula 6.4.1 → 6.5.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 266777cd8cbee1a5dd1a31a5a13be7cebb30ea31fb570f250e86879ba3bdbb0e
-  data.tar.gz: 3a60b62aa8040d838ba5a838ee30e53ae3f120e63c9d348329e1ed01e82f982a
+  metadata.gz: 5cb427e39e8e2f581076e069b21c0da24b5e82dac56e29b0e7017c7e419b3a31
+  data.tar.gz: 59203c99872a0065565a336a0bc814f5f7f9acd15a79bcdf3e1df9c92f3b5209
 SHA512:
-  metadata.gz: 5b62bafc5c642cef2ba2b3f9e10c656cefe8c65a2c4835f3b9aaceda2b5eec3fc40513abbd77ee592369e805d14a936a925d5168e380e2c94b7e7ec9f9d05d3a
-  data.tar.gz: c10696616d94b1acaf6bc29912d92c331b7ff0f25d543312fbbec802dcfbe466616da36a74537e06f009315d25a762f375aa989910234ecc0bb879c4cb1b667c
+  metadata.gz: c20a43d2ade283e63fda2143c9fb8fc2d88f7191e81f75f17219d0d625c99f587f6aea2517dfde44d1dd65aea08c65fa349518045a58df2f912d3d7bc5afb197
+  data.tar.gz: 7e4f2365737cf9746b91834ff0af8cb01ff7dc198b5f143686d483f6c9aa927df6cbac4e4226682ce599c5afea85be716e2cb21dc2144986e288f8f2f33e5bbb

data/lib/CommandManager.rb

@@ -212,19 +212,22 @@ end
 # Executes commands in a remote machine ussing ssh. See documentation
 # for GenericCommand
 class SSHCommand < GenericCommand
-    attr_accessor :host
+
+    attr_accessor :host, :ssh_opts
 
     # Creates a command and runs it
-    def self.run(command, host, logger=nil, stdin=nil, timeout=nil)
-        cmd=self.new(command, host, logger, stdin, timeout)
+    def self.run(command, host, logger=nil, stdin=nil, timeout=nil, ssh_opts='')
+        cmd=self.new(command, host, logger, stdin, timeout, ssh_opts)
         cmd.run
         cmd
     end
 
     # This one takes another parameter. +host+ is the machine
     # where the command is going to be executed
-    def initialize(command, host, logger=nil, stdin=nil, timeout=nil)
+    def initialize(command, host, logger=nil, stdin=nil, timeout=nil, ssh_opts='')
         @host=host
+        @ssh_opts = ssh_opts
+
         super(command, logger, stdin, timeout)
     end
 
@@ -232,10 +235,10 @@ private
 
     def execute
         if @stdin
-            capture3_timeout("ssh #{@host} #{@command}",
+            capture3_timeout("ssh #{@ssh_opts} #{@host} #{@command}",
                             :pgroup => true, :stdin_data => @stdin)
         else
-            capture3_timeout("ssh -n #{@host} #{@command}",
+            capture3_timeout("ssh -n #{@ssh_opts} #{@host} #{@command}",
                             :pgroup => true)
         end
     end

data/lib/OpenNebulaDriver.rb

@@ -108,7 +108,7 @@ class OpenNebulaDriver < ActionManager
                                          @timeout)
         elsif options[:ssh_stream]
             if options[:stdin]
-                cmdin = "cat << EOT | #{command}"
+                cmdin = "cat << 'EOT' | #{command}"
                 stdin = "#{options[:stdin]}\nEOT\n"
             else
                 cmdin = command

data/lib/VirtualMachineDriver.rb

@@ -53,7 +53,9 @@ class VirtualMachineDriver < OpenNebulaDriver
         :resize_disk => "RESIZEDISK",
         :update_sg   => "UPDATESG",
         :update_conf => "UPDATECONF",
-        :resize      => "RESIZE"
+        :resize      => "RESIZE",
+        :backup      => "BACKUP",
+        :update_nic   => "UPDATENIC"
     }
 
     POLL_ATTRIBUTE = OpenNebula::VirtualMachine::Driver::POLL_ATTRIBUTE
@@ -76,23 +78,23 @@ class VirtualMachineDriver < OpenNebulaDriver
 
         super(directory, @options)
 
-        @hosts   = Array.new
-
-        register_action(ACTION[:deploy].to_sym,      method("deploy"))
-        register_action(ACTION[:shutdown].to_sym,    method("shutdown"))
-        register_action(ACTION[:reboot].to_sym,      method("reboot"))
-        register_action(ACTION[:reset].to_sym,       method("reset"))
-        register_action(ACTION[:cancel].to_sym,      method("cancel"))
-        register_action(ACTION[:save].to_sym,        method("save"))
-        register_action(ACTION[:restore].to_sym,     method("restore"))
-        register_action(ACTION[:migrate].to_sym,     method("migrate"))
-        register_action(ACTION[:poll].to_sym,        method("poll"))
+        @hosts = Array.new
+
+        register_action(ACTION[:deploy].to_sym, method("deploy"))
+        register_action(ACTION[:shutdown].to_sym, method("shutdown"))
+        register_action(ACTION[:reboot].to_sym, method("reboot"))
+        register_action(ACTION[:reset].to_sym, method("reset"))
+        register_action(ACTION[:cancel].to_sym, method("cancel"))
+        register_action(ACTION[:save].to_sym, method("save"))
+        register_action(ACTION[:restore].to_sym, method("restore"))
+        register_action(ACTION[:migrate].to_sym, method("migrate"))
+        register_action(ACTION[:poll].to_sym, method("poll"))
         register_action(ACTION[:attach_disk].to_sym, method("attach_disk"))
         register_action(ACTION[:detach_disk].to_sym, method("detach_disk"))
         register_action(ACTION[:snapshot_create].to_sym, method("snapshot_create"))
         register_action(ACTION[:snapshot_revert].to_sym, method("snapshot_revert"))
         register_action(ACTION[:snapshot_delete].to_sym, method("snapshot_delete"))
-        register_action(ACTION[:cleanup].to_sym,    method("cleanup"))
+        register_action(ACTION[:cleanup].to_sym, method("cleanup"))
         register_action(ACTION[:attach_nic].to_sym, method("attach_nic"))
         register_action(ACTION[:detach_nic].to_sym, method("detach_nic"))
         register_action(ACTION[:disk_snapshot_create].to_sym, method("disk_snapshot_create"))
@@ -100,6 +102,8 @@ class VirtualMachineDriver < OpenNebulaDriver
         register_action(ACTION[:update_sg].to_sym, method("update_sg"))
         register_action(ACTION[:update_conf].to_sym, method("update_conf"))
         register_action(ACTION[:resize].to_sym, method("resize"))
+        register_action(ACTION[:backup].to_sym, method("backup"))
+        register_action(ACTION[:update_nic].to_sym, method("update_nic"))
     end
 
     # Decodes the encoded XML driver message received from the core
@@ -234,6 +238,16 @@ class VirtualMachineDriver < OpenNebulaDriver
         send_message(ACTION[:resize],RESULT[:failure],id,error)
     end
 
+    def backup(id, drv_message)
+        error = "Action not implemented by driver #{self.class}"
+        send_message(ACTION[:backup],RESULT[:failure],id,error)
+    end
+
+    def update_nic(id, drv_message)
+        error = "Action not implemented by driver #{self.class}"
+        send_message(ACTION[:update_nic],RESULT[:failure],id,error)
+    end
+
 private
 
     # Interface to handle the pending events from the ActionManager Interface

data/lib/cloud/CloudClient.rb

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

data/lib/datastore.rb

@@ -14,6 +14,19 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+# Ruby 3.x+ deprecated URI.escape, however rbvmomi still relies on it
+
+if RUBY_VERSION.split('.')[0].to_i >= 3
+    # Monkey patch the escape functionality
+    module URI
+
+        def self.escape(url)
+            URI::Parser.new.escape url
+        end
+
+    end
+end
+
 ##############################################################################
 # Module VCenterDriver
 ##############################################################################

data/lib/file_helper.rb

@@ -361,7 +361,7 @@ module VCenterDriver
                             .rm_rf(
                                 temp_folder
                             )
-                            raise "Error \ removing tar for #{descriptor_name}")
+                            raise "Error removing tar for #{descriptor_name}")
                     end # rubocop:disable Style/Semicolon
                 end
             end

data/lib/models/role.rb

@@ -455,6 +455,9 @@ module OpenNebula
             extra_template << "\nSERVICE_ID = #{@service.id}"
             extra_template << "\nROLE_NAME = \"#{@body['name']}\""
 
+            # Evaluate attributes with parent roles
+            evaluate(extra_template)
+
             n_nodes.times do
                 vm_name = @@vm_name_template
                           .gsub('$SERVICE_ID', @service.id.to_s)
@@ -1168,6 +1171,49 @@ module OpenNebula
             new_cardinality
         end
 
+        # Evaluate rules that references to parent roles
+        #
+        # @param template [String] Role template with $ to replace
+        def evaluate(template)
+            client = service.client
+
+            template.scan(/\$\{(.*?)\}/).flatten.each do |value|
+                s_value = value.split('.') # 0 -> parent, 1..N -> XPATH
+
+                # If parent not found, instead of error, replace it by blank
+                unless parents.include?(s_value[0])
+                    template.gsub!("${#{value}}", '')
+                    next
+                end
+
+                found   = false
+                p_nodes = service.roles[s_value[0]].nodes
+                xpath   = "//#{s_value[1..-1].join('/').upcase}"
+
+                # Iterate over parent nodes to find the XPATH on their template
+                p_nodes.each do |node|
+                    id = node['deploy_id']
+                    vm = OpenNebula::VirtualMachine.new_with_id(id, client)
+
+                    # If error continue searching in other nodes
+                    next if OpenNebula.is_error?(vm.info)
+
+                    next unless vm[xpath]
+
+                    template.gsub!("${#{value}}", vm[xpath])
+
+                    # If found, continue with next expression
+                    found = true
+                    break
+                end
+
+                next if found
+
+                # If value not found, replace it by blank to avoid issues
+                template.gsub!("${#{value}}", '')
+            end
+        end
+
     end
 
 end

data/lib/opennebula/datastore.rb

@@ -34,12 +34,13 @@ module OpenNebula
             :enable     => "datastore.enable"
         }
 
-        DATASTORE_TYPES=%w{IMAGE SYSTEM FILE}
+        DATASTORE_TYPES=%w{IMAGE SYSTEM FILE BACKUP}
 
         SHORT_DATASTORE_TYPES = {
             "IMAGE" => "img",
             "SYSTEM"=> "sys",
-            "FILE"  => "fil"
+            "FILE"  => "fil",
+            "BACKUP"=> "bck"
         }
 
         DATASTORE_STATES=%w{READY DISABLED}

data/lib/opennebula/flow/service_pool.rb

@@ -66,12 +66,16 @@ module OpenNebula
             super('DOCUMENT_POOL', 'DOCUMENT', @client)
         end
 
-        def client
+        def client(user_name = nil)
             # If there's a client defined use it
             return @client unless @client.nil?
 
             # If not, get one via cloud_auth
-            @cloud_auth.client
+            if user_name.nil?
+                @cloud_auth.client
+            else
+                @cloud_auth.client(user_name)
+            end
         end
 
         def info
@@ -129,14 +133,17 @@ module OpenNebula
         #   The mutex will be unlocked after the block execution.
         #
         # @return [Service, OpenNebula::Error] The Service in case of success
-        def get(service_id, external_client = nil, &block)
+        def get(service_id, external_user = nil, &block)
             service_id = service_id.to_i if service_id
             aux_client = nil
 
-            if external_client.nil?
+            # WARNING!!!
+            # No validation will be performed for external_user, the credentials
+            # for this user must be validated previously.
+            if external_user.nil?
                 aux_client = client
             else
-                aux_client = external_client
+                aux_client = client(external_user)
             end
 
             service = Service.new_with_id(service_id, aux_client)
@@ -172,7 +179,7 @@ module OpenNebula
                         return rc
                     end
 
-                    block.call(service)
+                    block.call(service, client)
                 end
 
                 @@mutex.synchronize do

data/lib/opennebula/flow/service_template.rb

@@ -549,8 +549,7 @@ module OpenNebula
                 end
 
                 if role['elasticity_policies']
-                    role['elasticity_policies'].each_with_index do |policy,
-                                                                    index|
+                    role['elasticity_policies'].each_with_index do |policy, index|
                         exp = policy['expression']
 
                         if exp.empty?

data/lib/opennebula/image.rb

@@ -26,20 +26,21 @@ module OpenNebula
         #######################################################################
 
         IMAGE_METHODS = {
-            :info        => "image.info",
-            :allocate    => "image.allocate",
-            :update      => "image.update",
-            :enable      => "image.enable",
-            :persistent  => "image.persistent",
-            :delete      => "image.delete",
-            :chown       => "image.chown",
-            :chmod       => "image.chmod",
-            :chtype      => "image.chtype",
-            :clone       => "image.clone",
-            :rename      => "image.rename",
-            :snapshotdelete => "image.snapshotdelete",
-            :snapshotrevert => "image.snapshotrevert",
-            :snapshotflatten=> "image.snapshotflatten",
+            :info       => "image.info",
+            :allocate   => "image.allocate",
+            :update     => "image.update",
+            :enable     => "image.enable",
+            :persistent => "image.persistent",
+            :delete     => "image.delete",
+            :chown      => "image.chown",
+            :chmod      => "image.chmod",
+            :chtype     => "image.chtype",
+            :clone      => "image.clone",
+            :rename     => "image.rename",
+            :snapshotdelete  => "image.snapshotdelete",
+            :snapshotrevert  => "image.snapshotrevert",
+            :snapshotflatten => "image.snapshotflatten",
+            :restore    => "image.restore",
             :lock       => "image.lock",
             :unlock     => "image.unlock"
         }
@@ -61,7 +62,7 @@ module OpenNebula
             "LOCKED_USED_PERS" => "lock"
         }
 
-        IMAGE_TYPES=%w{OS CDROM DATABLOCK KERNEL RAMDISK CONTEXT}
+        IMAGE_TYPES=%w{OS CDROM DATABLOCK KERNEL RAMDISK CONTEXT BACKUP}
 
         SHORT_IMAGE_TYPES={
             "OS"        => "OS",
@@ -69,7 +70,8 @@ module OpenNebula
             "DATABLOCK" => "DB",
             "KERNEL"    => "KL",
             "RAMDISK"   => "RD",
-            "CONTEXT"   => "CX"
+            "CONTEXT"   => "CX",
+            "BACKUP"    => "BK"
         }
 
         DISK_TYPES=%w{FILE CD_ROM BLOCK RBD}
@@ -163,8 +165,8 @@ module OpenNebula
         end
 
         # Deletes the Image
-        def delete()
-            super(IMAGE_METHODS[:delete])
+        def delete(force=false)
+            call(IMAGE_METHODS[:delete], @pe_id, force)
         end
 
         # Changes the owner/group
@@ -229,7 +231,7 @@ module OpenNebula
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def rename(name)
-            return call(IMAGE_METHODS[:rename], @pe_id, name)
+            call(IMAGE_METHODS[:rename], @pe_id, name)
         end
 
         # Deletes Image from snapshot
@@ -238,7 +240,7 @@ module OpenNebula
         #
         # @return [nil, OpenNebula::Error] nil in case of success or Error
         def snapshot_delete(snap_id)
-            return call(IMAGE_METHODS[:snapshotdelete], @pe_id, snap_id)
+            call(IMAGE_METHODS[:snapshotdelete], @pe_id, snap_id)
         end
 
         # Reverts Image state to a previous snapshot
@@ -247,7 +249,7 @@ module OpenNebula
         #
         # @return [nil, OpenNebula::Error] nil in case of success or Error
         def snapshot_revert(snap_id)
-            return call(IMAGE_METHODS[:snapshotrevert], @pe_id, snap_id)
+            call(IMAGE_METHODS[:snapshotrevert], @pe_id, snap_id)
         end
 
         # Flattens an image snapshot
@@ -256,7 +258,15 @@ module OpenNebula
         #
         # @return [nil, OpenNebula::Error] nil in case of success or Error
         def snapshot_flatten(snap_id)
-            return call(IMAGE_METHODS[:snapshotflatten], @pe_id, snap_id)
+            call(IMAGE_METHODS[:snapshotflatten], @pe_id, snap_id)
+        end
+
+        # Restore the VM backup stored by the image
+        #
+        # @param dst_id [Integer] Datastore destination ID
+        # @param restore_opts [String] Template with additional restore options
+        def restore(dst_id, restore_opts)
+            @client.call(IMAGE_METHODS[:restore], @pe_id, dst_id, restore_opts)
         end
 
         #######################################################################

data/lib/opennebula/ldap_auth.rb

@@ -213,7 +213,9 @@ class OpenNebula::LdapAuth
         groups = []
         ldap_groups.each do |group|
             if (g = in_hash_ignore_case?(@mapping, group))
-                if ldap_groups.include? @options[:group_admin_group_dn]
+                if ldap_groups.any? {
+                        |s| s.casecmp(@options[:group_admin_group_dn])==0
+                }
                     groups << "*#{@mapping[g]}"
                 else
                     groups << @mapping[g]

data/lib/opennebula/template_ext.rb

@@ -63,9 +63,7 @@ module OpenNebula::TemplateExt
                 #---------------------------------------------------------------
                 logger.info 'Processing VM disks' if logger
 
-                retrieve_xmlelements('TEMPLATE/DISK').each_with_index do
-                    |disk, idx|
-
+                retrieve_xmlelements('TEMPLATE/DISK').each_with_index do |disk, idx|
                     image = image_lookup(disk)
 
                     next unless image

data/lib/opennebula/virtual_machine.rb

@@ -56,7 +56,9 @@ module OpenNebula
             :scheddelete    => "vm.scheddelete",
             :schedupdate    => "vm.schedupdate",
             :attachsg       => "vm.attachsg",
-            :detachsg       => "vm.detachsg"
+            :detachsg       => "vm.detachsg",
+            :backup         => "vm.backup",
+            :updatenic      => "vm.updatenic"
         }
 
         VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED
@@ -132,6 +134,8 @@ module OpenNebula
             HOTPLUG_RESIZE
             HOTPLUG_SAVEAS_UNDEPLOYED
             HOTPLUG_SAVEAS_STOPPED
+            BACKUP
+            BACKUP_POWEROFF
         }
 
         SHORT_VM_STATES={
@@ -216,7 +220,9 @@ module OpenNebula
             "HOTPLUG_NIC_POWEROFF"   => "hotp",
             "HOTPLUG_RESIZE"         => "hotp",
             "HOTPLUG_SAVEAS_UNDEPLOYED"  => "hotp",
-            "HOTPLUG_SAVEAS_STOPPED"     => "hotp"
+            "HOTPLUG_SAVEAS_STOPPED"     => "hotp",
+            "BACKUP"            => "back",
+            "BACKUP_POWEROFF"   => "back",
         }
 
         HISTORY_ACTION=%w{none migrate live-migrate shutdown shutdown-hard
@@ -228,6 +234,7 @@ module OpenNebula
             snapshot-resize snapshot-delete snapshot-revert disk-saveas
             disk-snapshot-revert recover retry monitor disk-snapshot-rename
             alias-attach alias-detach poweroff-migrate poweroff-hard-migrate
+            backup nic-update
             }
 
         EXTERNAL_IP_ATTRS = [
@@ -462,6 +469,18 @@ module OpenNebula
             return call(VM_METHODS[:detachnic], @pe_id, nic_id)
         end
 
+        # Updates a NIC for a running VM
+        #
+        # @param nic_id [Integer] Id of the NIC to be updated
+        # @param nic_template [String] Template with updated attributes
+        # @param append [true|false] True to append new attributes instead of
+        #   replace the whole template
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def nic_update(nic_id, nic_template, append = false)
+            return call(VM_METHODS[:updatenic], @pe_id, nic_id, nic_template, append ? 1 : 0)
+        end
+
         # Attaches a Security Groupt to a running VM
         #
         # @param nic_id [Integer] Id of the NIC, where to attach SG
@@ -779,6 +798,15 @@ module OpenNebula
                 sched_template)
         end
 
+        # Generate a backup for the VM (backup config must be set)
+        #
+        # @param ds_id  [Integer] Id of the datastore to save the backup
+        # @return [Integer, OpenNebula::Error] ID of the resulting BACKUP image
+        # in case of success, Error otherwise.
+        def backup(ds_id, reset = false)
+            return @client.call(VM_METHODS[:backup], @pe_id, ds_id, reset)
+        end
+
         ########################################################################
         # Helpers to get VirtualMachine information
         ########################################################################

data/lib/opennebula/virtual_machine_ext.rb

@@ -286,160 +286,6 @@ module OpenNebula::VirtualMachineExt
                 raise
             end
 
-            #-------------------------------------------------------------------
-            #  Backups a VM. TODO Add final description
-            #  @param keep [Bool]
-            #  @param logger[Logger]
-            #  @param binfo[Hash] Oneshot
-            #-------------------------------------------------------------------
-            def backup(keep = false, logger = nil, binfo = nil)
-                # --------------------------------------------------------------
-                # Check backup consistency
-                # --------------------------------------------------------------
-                rc = info
-
-                raise rc.message if OpenNebula.is_error?(rc)
-
-                binfo.merge!(backup_info) do |_key, old_val, new_val|
-                    new_val.nil? ? old_val : new_val
-                end
-
-                raise 'No backup information' if binfo.nil?
-
-                raise 'No frequency defined' unless valid?(binfo[:freq])
-
-                raise 'No marketplace defined' unless valid?(binfo[:market])
-
-                return if Time.now.to_i - binfo[:last].to_i < binfo[:freq].to_i
-
-                # --------------------------------------------------------------
-                # Save VM as new template
-                # --------------------------------------------------------------
-                logger.info 'Saving VM as template' if logger
-
-                tid = save_as_template(
-                    binfo[:name], '', :poweroff => true, :logger => logger
-                )
-
-                tmp = OpenNebula::Template.new_with_id(tid, @client)
-                rc  = tmp.info
-
-                raise rc.message if OpenNebula.is_error?(rc)
-
-                # --------------------------------------------------------------
-                # Import template into Marketplace & update VM info
-                # --------------------------------------------------------------
-                logger.info "Importing template #{tmp.id} to marketplace "\
-                    "#{binfo[:market]}" if logger
-
-                tmp.extend(OpenNebula::TemplateExt)
-
-                rc, ids = tmp.mp_import(binfo[:market], true, binfo[:name],
-                                        :wait => true, :logger => logger)
-
-                raise rc.message if OpenNebula.is_error?(rc)
-
-                logger.info "Imported app ids: #{ids.join(',')}" if logger
-
-                rc = update(backup_attr(binfo, ids), true)
-
-                if OpenNebula.is_error?(rc)
-                    raise 'Could not update the backup reference: ' \
-                      " #{rc.message}. New backup ids are #{ids.join(',')}."
-                end
-
-                # --------------------------------------------------------------
-                # Cleanup
-                # --------------------------------------------------------------
-                backup_cleanup(keep, logger, binfo, tmp)
-            rescue Error, StandardError => e
-                backup_cleanup(keep, logger, binfo, tmp)
-
-                logger.fatal(e.inspect) if logger
-
-                raise
-            end
-
-            #-------------------------------------------------------------------
-            # Restores VM information from previous backup
-            #
-            # @param datastore [Integer] Datastore ID to import app backup
-            # @param logger    [Logger]  Logger instance to print debug info
-            #
-            # @return [Integer] VM ID
-            #-------------------------------------------------------------------
-            def restore(datastore, logger = nil)
-                rc = info
-
-                if OpenNebula.is_error?(rc)
-                    raise "Error getting VM: #{rc.message}"
-                end
-
-                logger.info 'Reading backup information' if logger
-
-                backup_ids = backup_info[:apps]
-
-                # highest (=last) of the app ids is the template id
-                app_id = backup_ids.last
-
-                app = OpenNebula::MarketPlaceApp.new_with_id(app_id, @client)
-                rc  = app.info
-
-                if OpenNebula.is_error?(rc)
-                    raise "Can not find appliance #{app_id}: #{rc.message}."
-                end
-
-                if logger
-                    logger.info "Restoring VM #{self['ID']} from " \
-                                "saved appliance #{app_id}"
-                end
-
-                app.extend(OpenNebula::MarketPlaceAppExt)
-
-                exp = app.export(:dsid => Integer(datastore),
-                                 :name => "#{self['NAME']} - RESTORED")
-
-                if OpenNebula.is_error?(exp)
-                    raise "Can not restore app: #{exp.message}."
-                end
-
-                # Check possible errors when exporting apps
-                exp[:image].each do |image|
-                    next unless OpenNebula.is_error?(image)
-
-                    raise "Error restoring image: #{image.message}."
-                end
-
-                template = exp[:vmtemplate].first
-
-                if OpenNebula.is_error?(template)
-                    raise "Error restoring template: #{template.message}."
-                end
-
-                if logger
-                    logger.info(
-                        "Backup restored, VM template: #{exp[:vmtemplate]}, " \
-                        "images: #{exp[:image]}"
-                    )
-
-                    logger.info(
-                        "Instantiating the template #{exp[:vmtemplate]}"
-                    )
-                end
-
-                tmpl = OpenNebula::Template.new_with_id(template, @client)
-                rc   = tmpl.instantiate
-
-                if OpenNebula.is_error?(rc)
-                    raise "Can not instantiate the template: #{rc.message}."
-                end
-
-                rc
-            rescue Error, StandardError => e
-                logger.fatal(e.inspect) if logger
-                raise
-            end
-
             ####################################################################
             # Private extended interface
             ####################################################################
@@ -457,58 +303,6 @@ module OpenNebula::VirtualMachineExt
                 !att.nil?
             end
 
-            #-------------------------------------------------------------------
-            #  Get backup information from the VM
-            #-------------------------------------------------------------------
-            def backup_info
-                base  = '//USER_TEMPLATE/BACKUP'
-                binfo = {}
-
-                app_ids = self["#{base}/MARKETPLACE_APP_IDS"] || ''
-
-                binfo[:name] = "#{self['NAME']} - BACKUP " \
-                               " - #{Time.now.strftime('%Y%m%d_%k%M')}"
-
-                binfo[:freq]   = self["#{base}/FREQUENCY_SECONDS"]
-                binfo[:last]   = self["#{base}/LAST_BACKUP_TIME"]
-                binfo[:market] = Integer(self["#{base}/MARKETPLACE_ID"])
-                binfo[:apps]   = app_ids.split(',')
-
-                binfo
-            rescue StandardError
-                binfo
-            end
-
-            #-------------------------------------------------------------------
-            # Generate backup information string
-            #-------------------------------------------------------------------
-            def backup_attr(binfo, ids)
-                'BACKUP=[' \
-                "  MARKETPLACE_APP_IDS = \"#{ids.join(',')}\"," \
-                "  FREQUENCY_SECONDS   = \"#{binfo[:freq]}\"," \
-                "  LAST_BACKUP_TIME    = \"#{Time.now.to_i}\"," \
-                "  MARKETPLACE_ID      = \"#{binfo[:market]}\" ]"
-            end
-
-            #-------------------------------------------------------------------
-            # Cleanup backup leftovers in case of failure
-            #-------------------------------------------------------------------
-            def backup_cleanup(keep, logger, binfo, template)
-                if template
-                    logger.info "Deleting template #{template.id}" if logger
-
-                    template.delete(true)
-                end
-
-                binfo[:apps].each do |id|
-                    logger.info "Deleting appliance #{id}" if logger
-
-                    papp = OpenNebula::MarketPlaceApp.new_with_id(id, @client)
-
-                    papp.delete
-                end if !keep && binfo[:apps]
-            end
-
         end
     end
 

data/lib/opennebula/virtual_network.rb

@@ -44,7 +44,7 @@ module OpenNebula
             :recover    => "vn.recover"
         }
 
-        VN_STATES=%w{INIT READY LOCK_CREATE LOCK_DELETE DONE ERROR}
+        VN_STATES=%w{INIT READY LOCK_CREATE LOCK_DELETE DONE ERROR UPDATE_FAILURE}
 
         SHORT_VN_STATES={
             "INIT"          => "init",
@@ -52,7 +52,8 @@ module OpenNebula
             "LOCK_CREATE"   => "lock",
             "LOCK_DELETE"   => "lock",
             "DONE"          => "done",
-            "ERROR"         => "err"
+            "ERROR"         => "err",
+            "UPDATE_FAILURE"=> "fail"
         }
 
         # Creates a VirtualNetwork description with just its identifier
@@ -326,7 +327,7 @@ module OpenNebula
         # Recovers an stuck Virtual Network
         #
         # @param result [Integer] Recover with failure (0), success (1),
-        # delete (2)
+        # delete (2), retry (3)
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def recover(result)
@@ -377,6 +378,34 @@ module OpenNebula
             SHORT_VN_STATES[state_str]
         end
 
+        # Returns three arrays with the numeric VM IDs for VMs updated,
+        # outdated (include updating) and error
+        def vm_ids
+            updated = Array.new
+
+            self.each('UPDATED_VMS/ID') do |id|
+                updated << id.text.to_i
+            end
+
+            outdated = Array.new
+
+            self.each('OUTDATED_VMS/ID') do |id|
+                outdated << id.text.to_i
+            end
+
+            self.each('UPDATING_VMS/ID') do |id|
+                outdated << id.text.to_i
+            end
+
+            error = Array.new
+
+            self.each('ERROR_VMS/ID') do |id|
+                error << id.text.to_i
+            end
+
+            [updated, outdated, error]
+        end
+
     private
         def set_publish(published)
             group_u = published ? 1 : 0

data/lib/opennebula/x509_auth.rb

@@ -29,9 +29,9 @@ class OpenNebula::X509Auth
     #Constants with paths to relevant files and defaults
     ###########################################################################
     if !ENV["ONE_LOCATION"]
-        ETC_LOCATION      = "/etc/one"
+        ETC_LOCATION = "/etc/one"
     else
-        ETC_LOCATION      = ENV["ONE_LOCATION"] + "/etc"
+        ETC_LOCATION = ENV["ONE_LOCATION"] + "/etc"
     end
 
     X509_AUTH_CONF_PATH = ETC_LOCATION + "/auth/x509_auth.conf"
@@ -173,8 +173,7 @@ private
         # Check start time and end time of certificates
         @cert_chain.each do |cert|
             if cert.not_before > now || cert.not_after < now
-                raise failed +  "Certificate not valid. Current time is " +
-                  now.localtime.to_s + "."
+                raise "Certificate not valid. Current time is #{now.localtime}"
             end
         end
 
@@ -187,16 +186,16 @@ private
             @cert_chain[1..-1].each do |cert|
                 if !((signee.issuer.to_s == cert.subject.to_s) &&
                      (signee.verify(cert.public_key)))
-                    raise  failed + signee.subject.to_s + " with issuer " +
-                           signee.issuer.to_s + " was not verified by " +
-                           cert.subject.to_s + "."
+                    raise "#{signee.subject} with issuer #{signee.issuer} " \
+                          "was not verified by #{cert.subject}"
                 end
+
                 signee = cert
             end
 
             # Validate the End Entity certificate
             if !@options[:ca_dir]
-                raise failed + "No certifcate authority directory was specified."
+                raise "No certifcate authority directory was specified."
             end
 
             begin
@@ -207,9 +206,8 @@ private
 
                 if !((signee.issuer.to_s == ca_cert.subject.to_s) &&
                      (signee.verify(ca_cert.public_key)))
-                    raise  failed + signee.subject.to_s + " with issuer " +
-                           signee.issuer.to_s + " was not verified by " +
-                           ca_cert.subject.to_s + "."
+                    raise "#{signee.subject} with issuer #{signee.issuer} " \
+                          "was not verified by #{ca_cert.subject}"
                 end
 
                 signee = ca_cert
@@ -229,7 +227,7 @@ private
 
         if !File.exist?(crl_path)
             if @options[:check_crl]
-                raise failed + "CRL file #{crl_path} does not exist"
+                raise "#{failed} CRL file #{crl_path} does not exist"
             else
                 return
             end
@@ -240,7 +238,7 @@ private
 
         # First verify the CRL itself with its signer
         unless crl_cert.verify( ca_cert.public_key ) then
-            raise failed + "CRL is not verified by its Signer"
+            raise "#{failed} CRL is not verified by its Signer"
         end
 
         # Extract the list of revoked certificates from the CRL
@@ -250,8 +248,8 @@ private
         # certificate
         rc_array.each do |e|
             if e.serial.eql?(signee.serial) then
-                raise failed + "#{signee.subject.to_s} is found in the "<<
-                    "CRL, i.e. it is revoked"
+                raise "#{failed} #{signee.subject} is found in the " \
+                      "CRL, i.e. it is revoked"
             end
         end
     end

data/lib/opennebula.rb

@@ -77,5 +77,5 @@ require 'opennebula/flow'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.4.0'
+    VERSION = '6.5.80'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.5.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -255,9 +255,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: