opennebula-cli 6.4.2 → 6.5.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e72258e445621b7bb43729bce0ef5f95f4a0debd990f3983bd8845fa19eebc0
-  data.tar.gz: 4776aa4b2f7e59f114dee073504b2029f37cbf99ca544be0924af26a3f969a5c
+  metadata.gz: fcdc66bd05f8d1764a49ddc05846af9544aec14538d28361836286a637db4762
+  data.tar.gz: c29bd48679f35bd2ad33535cb6c89c6d960eb79b9e16c19d4294c0f1646a8b77
 SHA512:
-  metadata.gz: 8293cbaf48c76f3601a0dd2d06b63aa3ff52bbbbb4c2fd510578224a4555cee0b0c9b6fae7486de1bc922d9cbc2a9844a4bac06e8b394ebea1b145dc6bae2718
-  data.tar.gz: e42b6fc85a88aa97ca9be7d1f464b048993ca443c9119121cae800018ef1f27a90899e2d0cbcd18e72ac142b7bd8aac2568bcf1997933e42388f7896f96bd289
+  metadata.gz: c9dffa57c55ca6b21db509f772754baea08f83e8313d58c76b2655a1cce55e824ef24245b971a04fa77c304ce649e5da7b9cc80e241b5d3e01a2ba22db2e6698
+  data.tar.gz: 3e77e5c5e2b9622c54c60e7bda07767092ab72d33a7563fb164d6da99f7befd398f19ce28b0c92281bda54a795cad5fb34222842e43c37b2d6f4f298518a8e42

data/bin/oneimage

@@ -94,6 +94,18 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Do not add context when building from Dockerfile'
     }
 
+    NO_IP = {
+        :name => 'no_ip',
+        :large => '--no_ip',
+        :description => 'Do not keep NIC addresses (MAC, IP and IP6)'
+    }
+
+    NO_NIC = {
+        :name => 'no_nic',
+        :large => '--no_nic',
+        :description => 'Do not keep network mappings'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -251,9 +263,11 @@ CommandParser::CmdParser.new(ARGV) do
         Deletes the given Image
     EOT
 
-    command :delete, delete_desc, [:range, :imageid_list] do
+    command :delete, delete_desc, [:range, :imageid_list],
+            :options => [OpenNebulaHelper::FORCE] do
+        force = (options[:force] == true)
         helper.perform_actions(args[0], options, 'deleting') do |image|
-            image.delete
+            image.delete(force)
         end
     end
 
@@ -410,6 +424,41 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    restore_desc = <<-EOT.unindent
+        Restore a backup image. It will restore the associated VM template to the VM template pool and
+        the disk images to the selected image datastore.
+    EOT
+
+    command :restore,
+            restore_desc,
+            :imageid,
+            :options => [OneDatastoreHelper::DATASTORE, NO_NIC, NO_IP] do
+        helper.perform_action(args[0], options, 'vm backup restored') do |o|
+            if options[:datastore].nil?
+                STDERR.puts 'Datastore to restore the backup is mandatory: '
+                STDERR.puts "\t -d datastore_id | name"
+                exit(-1)
+            end
+
+            restore_opts = ''
+
+            restore_opts << "NO_NIC=\"YES\"\n" if options[:no_nic]
+            restore_opts << "NO_IP=\"YES\"\n" if options[:no_ip]
+
+            rc = o.restore(options[:datastore].to_i, restore_opts)
+
+            if !OpenNebula.is_error?(rc)
+                ids = rc.split(' ')
+
+                puts "VM Template: #{ids[0]}" if ids[0]
+                puts "Images: #{ids[1..-1].join(' ')}" if ids.length > 1
+            else
+                puts rc.message
+                exit(-1)
+            end
+        end
+    end
+
     list_desc = <<-EOT.unindent
         Lists Images in the pool
     EOT

data/bin/oneirb

@@ -63,7 +63,6 @@ require 'json'
 require 'nokogiri'
 require 'openssl'
 require 'ox'
-require 'pp'
 require 'set'
 require 'socket'
 require 'sqlite3'

data/bin/onevm

@@ -195,32 +195,6 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'lock all actions'
     }
 
-    LOGGER = {
-        :name   => 'logger',
-        :large  => '--logger logger',
-        :format => String,
-        :description => 'Set logger to STDOUT or FILE'
-    }
-
-    KEEP = {
-        :name  => 'keep',
-        :large => '--keep-backup',
-        :description => 'Keep previous backup when creating a new one'
-    }
-
-    ONESHOT = {
-        :name  => 'oneshot',
-        :large => '--oneshot',
-        :description => 'Take an snapshot of the VM without saving backup info'
-    }
-
-    MARKET = {
-        :name   => 'market',
-        :large  => '--market market_id',
-        :format => Integer,
-        :description => 'Market to save oneshot'
-    }
-
     NIC_ID = {
         :name   => 'nic_id',
         :large  => '--nic-id nic_id',
@@ -249,6 +223,40 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'VNC client to use'
     }
 
+    PCI = {
+        :name => 'pci',
+        :large => '--pci short_address',
+        :format => String,
+        :description => 'Select PCI device by its short address'
+    }
+
+    PCI_DEVICE = {
+        :name => 'pci_device',
+        :large => '--pci_device device ID',
+        :format => String,
+        :description => 'Select PCI device by its device ID'
+    }
+
+    PCI_VENDOR = {
+        :name => 'pci_vendor',
+        :large => '--pci_vendor vendor ID',
+        :format => String,
+        :description => 'Select PCI device by its vendor ID'
+    }
+
+    PCI_CLASS = {
+        :name => 'pci_class',
+        :large => '--pci_class class ID',
+        :format => String,
+        :description => 'Select PCI device by its class ID'
+    }
+
+    RESET_BACKUP = {
+        :name => 'reset',
+        :large => '--reset',
+        :description => 'Creates a new backup image, from a new full backup (only for incremental)'
+    }
+
     OpenNebulaHelper::TEMPLATE_OPTIONS_VM.delete_if do |v|
         %w[as_gid as_uid].include?(v[:name])
     end
@@ -853,8 +861,11 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     nic_attach_desc = <<-EOT.unindent
-        Attaches a NIC to a running VM. When using --file add only one
-        NIC instance.
+        Attaches a NIC to a VM. When using --file add only one NIC instance.
+
+        To hotplug a PCI device and use it as a NIC interface in the VM select
+        it with --pci (short_address) or --pci_device (device ID),
+        --pci_class (class ID) and/or --pci_vendor (vendor ID).
 
         To attach a nic alias, use --file or --alias option.
 
@@ -866,7 +877,11 @@ CommandParser::CmdParser.new(ARGV) do
                          OneVMHelper::NETWORK,
                          OneVMHelper::IP,
                          OneVMHelper::ALIAS,
-                         OneVMHelper::NIC_NAME] do
+                         OneVMHelper::NIC_NAME,
+                         PCI,
+                         PCI_CLASS,
+                         PCI_VENDOR,
+                         PCI_DEVICE] do
         if options[:file].nil? && options[:network].nil?
             STDERR.puts 'Provide a template file or a network:'
             STDERR.puts "\t--file    <file>"
@@ -878,36 +893,36 @@ CommandParser::CmdParser.new(ARGV) do
             template = File.read(options[:file])
         else
             network_id = options[:network]
-            ip = options[:ip]
-            nic_alias = options[:alias]
-            nic_name = options[:nic_name]
-
-            if ip
-                if !nic_alias && !nic_name
-                    template = "NIC = [ NETWORK_ID = #{network_id}, \
-                                IP = #{ip} ]"
-                elsif !nic_alias && nic_name
-                    template = "NIC = [ NETWORK_ID = #{network_id},
-                                        IP = #{ip},
-                                        NAME = #{nic_name} ]"
-                else
-                    template = "NIC_ALIAS = \
-                                [ NETWORK_ID = #{network_id},\
-                                  IP = #{ip},\
-                                  PARENT = #{nic_alias} ]"
-                end
+            ip         = options[:ip]
+            nic_alias  = options[:alias]
+            nic_name   = options[:nic_name]
+
+            is_pci = [:pci, :pci_device, :pci_vendor, :pci_class].any? do |o|
+                !options[o].nil?
+            end
+
+            if is_pci
+                pcia = options[:pci]
+                pcid = options[:pci_device]
+                pcic = options[:pci_class]
+                pciv = options[:pci_vendor]
+
+                template  = 'PCI = [ TYPE = NIC'
+                template << ", NETWORK_ID    = #{network_id}"
+                template << ", SHORT_ADDRESS = \"#{pcia}\"" if pcia
+                template << ", DEVICE        = \"#{pcid}\"" if pcid
+                template << ", CLASS         = \"#{pcic}\"" if pcic
+                template << ", VENDOR        = \"#{pciv}\"" if pciv
+            elsif nic_alias
+                template  = "NIC_ALIAS = [ PARENT = #{nic_alias}"
+                template << ", NETWORK_ID = #{network_id}"
             else
-                if !nic_alias && !nic_name
-                    template = "NIC = [ NETWORK_ID = #{network_id} ]"
-                elsif !nic_alias && nic_name
-                    template = "NIC = [ NETWORK_ID = #{network_id},
-                                        NAME = #{nic_name} ]"
-                else
-                    template = "NIC_ALIAS = \
-                                [ NETWORK_ID = #{network_id},\
-                                  PARENT = #{nic_alias} ]"
-                end
+                template = "NIC = [ NETWORK_ID = #{network_id}"
             end
+
+            template << ", IP   = #{ip}" if ip
+            template << ", NAME = #{nic_name}" if nic_name
+            template << ']'
         end
 
         helper.perform_action(args[0], options, 'Attaching NIC') do |vm|
@@ -929,6 +944,40 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    nic_update_desc = <<-EOT.unindent
+        Updates a NIC for a VM. In case the VM is running, trigger NIC update on the host.
+
+        States: Almost all, except BOOT*, MIGRATE and HOTPLUG-NIC
+    EOT
+
+    command :"nic-update", nic_update_desc, :vmid, :nicid,
+            [:file, nil], :options => OpenNebulaHelper::APPEND do
+        vm_id = args[0].to_i
+        nic_id = args[1].to_i
+        file = args[2]
+        helper.perform_action(vm_id, options, 'Updating VM NIC') do |obj|
+            if options[:append]
+                str = OpenNebulaHelper
+                      .append_template(vm_id, obj, file,
+                                       "TEMPLATE/NIC[NIC_ID=#{nic_id}]")
+            else
+                str = OpenNebulaHelper
+                      .update_template(vm_id, obj, file,
+                                       "TEMPLATE/NIC[NIC_ID=#{nic_id}]")
+            end
+
+            # Ensure the updated attributes are in NIC section
+            unless str.gsub(' ', '').match(/NIC=\[/)
+                str = "NIC=[\n#{str.split("\n").join(",\n")}]"
+            end
+
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
+            obj.nic_update(nic_id, str, options[:append])
+        end
+    end
+
     sg_attach_desc = <<-EOT.unindent
         Attaches a Security Group to a VM.
 
@@ -1340,8 +1389,8 @@ CommandParser::CmdParser.new(ARGV) do
     updateconf_desc = <<-EOT.unindent
         Updates the configuration of a VM. Valid states are: running, pending,
         failure, poweroff, undeploy, hold or cloning.
-        In running state only changes in CONTEXT take effect immediately,
-        other values may need a VM restart.
+        In running state only changes in CONTEXT and BACKUP_CONFIG take effect
+        immediately, other values may need a VM restart.
 
         This command accepts a template file or opens an editor, the full list of
         configuration attributes are:
@@ -1352,6 +1401,7 @@ CommandParser::CmdParser.new(ARGV) do
         GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
         RAW       = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
         CPU_MODEL = ["MODEL"]
+        BACKUP_CONFIG = ["FS_FREEZE", "KEEP_LAST", "BACKUP_VOLATILE", "MODE"]
         CONTEXT (any value, **variable substitution will be made**)
     EOT
 
@@ -1376,10 +1426,15 @@ CommandParser::CmdParser.new(ARGV) do
                     exit(-1)
                 end
 
+                backup   = vm.template_like_str('BACKUPS', true,
+                                                'BACKUP_CONFIG')
                 template = vm.template_like_str('TEMPLATE', true,
                                                 'OS | FEATURES | INPUT | '\
                                                 'GRAPHICS | RAW | CONTEXT | '\
                                                 'CPU_MODEL')
+
+                template << "\n" << backup
+
                 template = OpenNebulaHelper.editor_input(template)
             end
 
@@ -1497,108 +1552,43 @@ CommandParser::CmdParser.new(ARGV) do
     end
 
     backup_vm_desc = <<-EOT.unindent
-        Creates a VM backup and stores it in the marketplace
+        Creates a VM backup on the given datastore
+
+        States: RUNNING, POWEROFF
     EOT
 
     command :backup,
             backup_vm_desc,
             :vmid,
-            :options => [LOGGER, KEEP, ONESHOT, MARKET] do
-        require 'logger'
-
-        if options.key?(:oneshot) && !options.key?(:market)
-            STDERR.puts 'ERROR: no market given'
-            exit(-1)
-        end
-
-        helper.perform_action(args[0], options, 'Backup') do |vm|
-            vm.extend(OpenNebula::VirtualMachineExt)
-
-            # Read user options
-            if options[:verbose]
-                log_to = STDOUT
-            elsif !options[:logger].nil?
-                log_to = options[:logger]
-            end
-
-            keep = options.key?(:keep)
-
-            if log_to
-                logger = Logger.new(log_to)
-                format = '%Y-%m-%d %H:%M:%S'
-
-                logger.formatter = proc do |severity, datetime, _p, msg|
-                    "#{datetime.strftime(format)} " \
-                    "#{severity.ljust(5)} : #{msg}\n"
-                end
-            end
-
-            binfo          = {}
-            binfo[:market] = options[:market]
-
-            if options.key?(:oneshot)
-                binfo[:name] = "VM #{vm.id} BACKUP - " \
-                               "#{Time.now.strftime('%Y%m%d_%k%M')}"
-                binfo[:freq]   = 1
-                binfo[:last]   = Time.now.to_i - 100
-            end
-
-            begin
-                rc = vm.backup(keep, logger, binfo)
-
-                if OpenNebula.is_error?(rc)
-                    STDERR.puts rc.message
-                    exit(-1)
-                else
-                    0
-                end
-            rescue StandardError => e
-                STDERR.puts e
-                exit(-1)
-            end
-        end
-    end
-
-    restore_vm_desc = <<-EOT.unindent
-        Restores a VM from a previous backup
-    EOT
-
-    command :restore,
-            restore_vm_desc,
-            :vmid,
-            :options => [OneDatastoreHelper::DATASTORE, LOGGER] do
-        require 'logger'
-
-        unless options[:datastore]
-            STDERR.puts 'ERROR: no datastore given'
+            :options => [RESET_BACKUP,
+                         OneDatastoreHelper::DATASTORE,
+                         OneVMHelper::SCHEDULE,
+                         OneVMHelper::WEEKLY,
+                         OneVMHelper::MONTHLY,
+                         OneVMHelper::YEARLY,
+                         OneVMHelper::HOURLY,
+                         OneVMHelper::END_TIME] do
+        if options[:datastore].nil?
+            STDERR.puts 'Datastore to save the backup is mandatory: '
+            STDERR.puts "\t -d datastore_id | name"
             exit(-1)
         end
 
-        helper.perform_action(args[0], options, 'Restore') do |vm|
-            vm.extend(OpenNebula::VirtualMachineExt)
+        reset = options[:reset] == true
 
-            # If logger is specified use it, if not use STDOUT
-            options[:logger].nil? ? log_to = STDOUT : log_to = options[:logger]
-            logger = Logger.new(log_to)
-            format = '%Y-%m-%d %H:%M:%S'
+        if !options[:schedule].nil?
+            options[:args] = options[:datastore]
 
-            logger.formatter = proc do |severity, datetime, _p, msg|
-                "#{datetime.strftime(format)} #{severity.ljust(5)} : #{msg}\n"
-            end
+            helper.schedule_actions([args[0]], options, @comm_name)
+        else
 
-            begin
-                rc = vm.restore(options[:datastore], logger)
+            helper.perform_action(args[0], options, 'Backup') do |vm|
+                rc = vm.backup(options[:datastore], reset)
 
                 if OpenNebula.is_error?(rc)
-                    STDERR.puts rc.message
+                    STDERR.puts "Error creating VM backup: #{rc.message}"
                     exit(-1)
-                else
-                    puts "ID: #{rc}"
-                    0
                 end
-            rescue StandardError => e
-                STDERR.puts e
-                exit(-1)
             end
         end
     end

data/bin/onevnet

@@ -114,6 +114,13 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'No recover action possible, delete the Virtual Network'
     }
 
+    RETRY = {
+        :name => 'retry',
+        :large => '--retry',
+        :description => 'Recover a Virtual Network by retrying the last ' \
+                        'failed action'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -363,6 +370,8 @@ CommandParser::CmdParser.new(ARGV) do
     update_desc = <<-EOT.unindent
         Update the template contents. If a path is not provided the editor will
         be launched to modify the current content.
+
+        Note: Triggers Virtual Machine updates for used leases.
     EOT
 
     command :update, update_desc, :vnetid, [:file, nil],
@@ -456,19 +465,22 @@ CommandParser::CmdParser.new(ARGV) do
         YOU NEED TO MANUALLY CHECK THE VN STATUS, to decide if the
         operation was successful or not, or if it can be retried.
 
-        States for success/failure recovers: LOCK_CREATE, LOCK_DELETE state.
-        States for a retry recover: LOCK_CREATE, LOCK_DELETE state
+        States for success recovers: LOCK_CREATE, LOCK_DELETE, UPDATE_FAILURE state.
+        States for failure recovers: LOCK_CREATE, LOCK_DELETE state.
+        States for a retry recover: UPDATE_FAILURE
         States for delete: Any but READY
     EOT
 
     command :recover, recover_desc, [:range, :vmid_list],
-            :options => [SUCCESS, FAILURE, DELETE] do
+            :options => [SUCCESS, FAILURE, DELETE, RETRY] do
         if !options[:success].nil?
             result = 1
         elsif !options[:failure].nil?
             result = 0
         elsif !options[:delete].nil?
             result = 2
+        elsif !options[:retry].nil?
+            result = 3
         else
             error_message = <<-EOT.unindent
             Need to specify the result of the pending action.

data/lib/one_helper/onehost_helper.rb

@@ -14,6 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+require 'HostSyncManager'
 require 'one_helper'
 require 'one_helper/onevm_helper'
 require 'rubygems'
@@ -268,12 +269,11 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
         cluster_id = options[:cluster]
 
-        # Get remote_dir (implies oneadmin group)
         rc = OpenNebula::System.new(@client).get_configuration
         return -1, rc.message if OpenNebula.is_error?(rc)
 
         conf = rc
-        remote_dir = conf['SCRIPTS_REMOTE_DIR']
+        sync_manager = HostSyncManager.new(conf)
 
         # Verify the existence of REMOTES_LOCATION
         if !File.directory? REMOTES_LOCATION
@@ -363,21 +363,13 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
                     print_update_info(total - size, total, host['NAME'])
 
-                    if options[:ssh]
-                        sync_cmd = "ssh #{host['NAME']}" \
-                                   " rm -rf '#{remote_dir}' 2>/dev/null;" \
-                                   " mkdir -p '#{remote_dir}' 2>/dev/null &&" \
-                                   " scp -rp #{REMOTES_LOCATION}/*" \
-                                   " #{host['NAME']}:#{remote_dir} 2> /dev/null"
-                    else
-                        sync_cmd = "rsync -Laz --delete #{REMOTES_LOCATION}/" \
-                                   " #{host['NAME']}:#{remote_dir}/"
-                    end
-
                     retries = 3
 
                     begin
-                        `#{sync_cmd} 2>/dev/null`
+                        copy_method = options[:ssh] ? :ssh : :rsync
+                        rc = sync_manager.update_remotes(host['NAME'],
+                                                         nil,
+                                                         copy_method)
                     rescue IOError
                         # Workaround for broken Ruby 2.5
                         # https://github.com/OpenNebula/one/issues/3229
@@ -387,7 +379,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                         end
                     end
 
-                    if $CHILD_STATUS.nil? || !$CHILD_STATUS.success?
+                    if rc != 0
                         error_lock.synchronize do
                             host_errors << host['NAME']
                         end

data/lib/one_helper/oneimage_helper.rb

@@ -348,18 +348,36 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         CLIHelper.print_header(str_h1 % 'IMAGE TEMPLATE', false)
         puts image.template_str
 
-        puts
-        CLIHelper.print_header('VIRTUAL MACHINES', false)
-        puts
-
         vms=image.retrieve_elements('VMS/ID')
 
         return unless vms
 
-        vms.map! {|e| e.to_i }
-        onevm_helper=OneVMHelper.new
-        onevm_helper.client=@client
-        onevm_helper.list_pool({ :ids=>vms, :no_pager => true }, false)
+        if image.type_str.casecmp('backup').zero?
+            CLIHelper.print_header(str_h1 % 'BACKUP INFORMATION', false)
+            puts format(str, 'VM', vms[0])
+
+            if image.has_elements?('/IMAGE/BACKUP_INCREMENTS/INCREMENT')
+                puts format(str, 'TYPE', 'INCREMENTAL')
+
+                puts
+
+                CLIHelper.print_header('BACKUP INCREMENTS', false)
+                format_backup_increments(image)
+            else
+                puts format(str, 'TYPE', 'FULL')
+            end
+        else
+            puts
+            CLIHelper.print_header('VIRTUAL MACHINES', false)
+            puts
+
+            vms.map! {|e| e.to_i }
+            onevm_helper=OneVMHelper.new
+            onevm_helper.client=@client
+            onevm_helper.list_pool({ :ids=>vms, :no_pager => true },
+                                   false)
+
+        end
     end
 
     def format_snapshots(image)
@@ -412,6 +430,49 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         table.show(image_snapshots)
     end
 
+    def format_backup_increments(image)
+        table=CLIHelper::ShowTable.new(nil, self) do
+            column :ID, 'Increment ID', :size=>3 do |d|
+                d['ID']
+            end
+
+            column :PID, 'Parent increment ID', :size=>3 do |d|
+                d['PARENT_ID']
+            end
+
+            column :TYPE, 'T', :size=>1 do |d|
+                d['TYPE'][0]
+            end
+
+            column :SIZE, '', :left, :size=>8 do |d|
+                if d['SIZE']
+                    OpenNebulaHelper.unit_to_str(
+                        d['SIZE'].to_i,
+                        {},
+                        'M'
+                    )
+                else
+                    '-'
+                end
+            end
+
+            column :DATE, 'Creation date', :size=>15 do |d|
+                OpenNebulaHelper.time_to_str(d['DATE'])
+            end
+
+            column :SOURCE, 'Backup source', :left, :size=>37 do |d|
+                d['SOURCE']
+            end
+
+            default :ID, :PID, :TYPE, :SIZE, :DATE, :SOURCE
+        end
+
+        ihash      = image.to_hash
+        increments = [ihash['IMAGE']['BACKUP_INCREMENTS']['INCREMENT']].flatten
+
+        table.show(increments)
+    end
+
     class << self
 
         def create_image_variables(options, name)

data/lib/one_helper/onevm_helper.rb

@@ -117,7 +117,21 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :large => '--schedule TIME',
         :description => 'Schedules this action to be executed after' \
         'the given time. For example: onevm resume 0 --schedule "09/23 14:15"',
-        :format => Time
+        :format => String,
+        :proc => lambda {|o, options|
+            if o[0] == '+'
+                options[:schedule] = o
+            elsif o == 'now'
+                options[:schedule] = Time.now.to_i
+            else
+                begin
+                    options[:schedule] = Time.parse(o).to_i
+                rescue StandardError
+                    STDERR.puts "Error parsing time spec: #{o}"
+                    exit(-1)
+                end
+            end
+        }
     }
 
     WEEKLY = {
@@ -408,10 +422,13 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         # Verbose by default
         options[:verbose] = true
 
-        perform_actions(
-            ids, options,
-            "#{action} scheduled at #{options[:schedule]}"
-        ) do |vm|
+        message = if options[:schedule].class == Integer
+                      "#{action} scheduled at #{Time.at(options[:schedule])}"
+                  else
+                      "#{action} scheduled after #{options[:schedule]}s from start"
+                  end
+
+        perform_actions( ids, options, message) do |vm|
 
             str_periodic = ''
 
@@ -440,20 +457,11 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 str_periodic << ', END_TYPE = 0'
             end
 
-            sched = options[:schedule]
-
-            # If the action is set to be executed from VM start to an specific
-            # amount of time later, we should preserve the + symbol
-            if ((sched.is_a? String) && !sched.include?('+')) ||
-                !(sched.is_a? String)
-                sched = sched.to_i
-            end
-
             tmp_str = "SCHED_ACTION = ["
             tmp_str << "ACTION = #{action}, "
             tmp_str << "WARNING = #{warning}," if warning
             tmp_str << "ARGS = \"#{options[:args]}\"," if options[:args]
-            tmp_str << "TIME = #{sched}"
+            tmp_str << "TIME = #{options[:schedule]}"
             tmp_str << str_periodic << ']'
 
             vm.sched_action_add(tmp_str)
@@ -1342,42 +1350,31 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     end
                     str_end unless d.nil?
                 end
-
-                column :DONE, '', :adjust => true do |d|
-                    OpenNebulaHelper.time_to_str(d['DONE'], false) \
-                        unless d.nil?
-                end
-
-                column :MESSAGE, '', :size => 35 do |d|
-                    d['MESSAGE'] ? d['MESSAGE'] : '-'
-                end
-
-                column :CHARTER, '', :left, :adjust, :size => 15 do |d|
-                    t1 = Time.now
-                    t2 = d['TIME'].to_i
-                    t2 += vm['STIME'].to_i unless d['TIME'] =~ /^[0-9].*/
-
-                    t2 = Time.at(t2)
-
-                    days    = ((t2 - t1) / (24 * 3600)).round(2)
-                    hours   = ((t2 - t1) / 3600).round(2)
-                    minutes = ((t2 - t1) / 60).round(2)
-
-                    if days > 1
-                        show = "In #{days} days"
-                    elsif days <= 1 && hours > 1
-                        show = "In #{hours} hours"
-                    elsif minutes > 0
-                        show = "In #{minutes} minutes"
+                column :STATUS, '', :left, :size => 50  do |d|
+                    if d['DONE'] && !d['REPEAT']
+                        "Done on #{OpenNebulaHelper.time_to_str(d['DONE'], false)}"
+                    elsif d['MESSAGE']
+                        "Error! #{d['MESSAGE']}"
                     else
-                        show = 'Already done'
-                    end
-
-                    wrn = d['WARNING']
-                    if !wrn.nil? && (t1 - vm['STIME'].to_i).to_i > wrn.to_i
-                        "#{show} *"
-                    else
-                        show
+                        t1 = Time.now
+                        t2 = d['TIME'].to_i
+                        t2 += vm['STIME'].to_i unless d['TIME'] =~ /^[0-9].*/
+
+                        t2 = Time.at(t2)
+
+                        days    = ((t2 - t1) / (24 * 3600)).round(2)
+                        hours   = ((t2 - t1) / 3600).round(2)
+                        minutes = ((t2 - t1) / 60).round(2)
+
+                        if days > 1
+                            "Next in #{days} days"
+                        elsif days <= 1 && hours > 1
+                            "Next in #{hours} hours"
+                        elsif minutes > 0
+                            "Next in #{minutes} minutes"
+                        else
+                            "Overdue!"
+                        end
                     end
                 end
             end.show([vm_hash['VM']['TEMPLATE']['SCHED_ACTION']].flatten,
@@ -1388,6 +1385,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             vm.delete_element('/VM/TEMPLATE/SCHED_ACTION')
         end
 
+        print_backups(vm, vm_hash)
+
         if vm.has_elements?('/VM/USER_TEMPLATE')
             puts
 
@@ -1421,6 +1420,23 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         puts vm.template_str
     end
 
+    def print_backups(vm, vm_hash)
+        if vm.has_elements?('/VM/BACKUPS/BACKUP_CONFIG')
+            puts
+            CLIHelper.print_header('%-80s' % 'BACKUP CONFIGURATION', false)
+            puts vm.template_like_str('BACKUPS/BACKUP_CONFIG')
+        end
+
+        if vm.has_elements?('/VM/BACKUPS/BACKUP_IDS')
+            puts
+            CLIHelper.print_header('%-80s' % 'VM BACKUPS', false)
+
+            ids = [vm_hash['VM']['BACKUPS']['BACKUP_IDS']['ID']].flatten
+
+            puts format('IMAGE IDS: %s', ids.join(','))
+        end
+    end
+
     def print_numa_nodes(numa_nodes)
         puts
         CLIHelper.print_header('NUMA NODES', false)

data/lib/one_helper/onevnet_helper.rb

@@ -186,8 +186,32 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                 d['USED_LEASES']
             end
 
+            column :UPDATED, 'Number of VMs with updated VN attributes', :size=>4 do |d|
+                if d['UPDATED_VMS']['ID'].nil?
+                    '0'
+                else
+                    [d['UPDATED_VMS']['ID']].flatten.size
+                end
+            end
+
+            column :OUTDATED, 'Number of VMs with outdated VN attributes', :size=>4 do |d|
+                if d['OUTDATED_VMS']['ID'].nil?
+                    '0'
+                else
+                    [d['OUTDATED_VMS']['ID']].flatten.size
+                end
+            end
+
+            column :ERROR, 'Number of VMs that failed to update VN attributes', :size=>4 do |d|
+                if d['ERROR_VMS']['ID'].nil?
+                    '0'
+                else
+                    [d['ERROR_VMS']['ID']].flatten.size
+                end
+            end
+
             default :ID, :USER, :GROUP, :NAME, :CLUSTERS, :BRIDGE, :STATE,
-                    :LEASES
+                    :LEASES, :OUTDATED, :ERROR
         end
     end
 
@@ -474,6 +498,16 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
             puts format('%-15s', id)
         end
 
+        puts
+
+        CLIHelper.print_header(str_h1 % 'VIRTUAL MACHINES', false)
+
+        updated, outdated, error = vn.vm_ids
+
+        puts format(str, 'UPDATED', updated.join(','))
+        puts format(str, 'OUTDATED', outdated.join(','))
+        puts format(str, 'ERROR', error.join(','))
+
         return unless options[:show_ar]
 
         ar_list.each do |ar_id|

data/lib/one_helper.rb

@@ -424,7 +424,7 @@ EOT
     FORCE={
         :name  => 'force',
         :large  => '--force',
-        :description => 'Overwrite the file'
+        :description => 'Ignore errors (if possible)'
     }
 
     EXTENDED={

data/share/schemas/xsd/acct.xsd

@@ -170,6 +170,34 @@
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
+              <xs:element name="BACKUPS">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="BACKUP_CONFIG" minOccurs="1" maxOccurs="1">
+                      <xs:complexType>
+                        <xs:sequence>
+                        <xs:element name="BACKUP_VOLATILE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="FS_FREEZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="INCREMENTAL_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="KEEP_LAST" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="LAST_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="LAST_BACKUP_SIZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="LAST_DATASTORE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="LAST_INCREMENT_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        <xs:element name="MODE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="BACKUP_IDS" minOccurs="1" maxOccurs="1">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="ID" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>

data/share/schemas/xsd/hook_message_state.xsd

@@ -10,15 +10,19 @@
             <xs:restriction base="xs:string">
             <xs:enumeration value="VM"/>
             <xs:enumeration value="HOST"/>
+            <xs:enumeration value="IMAGE"/>
+            <xs:enumeration value="VNET"/>
             </xs:restriction>
           </xs:simpleType>
         </xs:element>
         <xs:element name="STATE" type="xs:string"/>
         <xs:element name="LCM_STATE" type="xs:string" maxOccurs="1" minOccurs="0"/>
         <xs:element name="REMOTE_HOST" type="xs:string" maxOccurs="1" minOccurs="0"/>
-         <!-- The template of the resource (VM or Host) is included here -->
+         <!-- The template of the resource (VM, Host, Image or VNet) is included here -->
          <xs:element ref="HOST" maxOccurs="1" minOccurs="0"/>
          <xs:element ref="VM" maxOccurs="1" minOccurs="0"/>
+         <xs:element ref="IMAGE" maxOccurs="1" minOccurs="0"/>
+         <xs:element ref="VNET" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>

data/share/schemas/xsd/image.xsd

@@ -117,6 +117,24 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="BACKUP_INCREMENTS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="INCREMENT" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="DATE" type="xs:string"/>
+                    <xs:element name="ID" type="xs:string"/>
+                    <xs:element name="PARENT_ID" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="SIZE" type="xs:string"/>
+                    <xs:element name="SOURCE" type="xs:string"/>
+                    <xs:element name="TYPE" type="xs:string"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>

data/share/schemas/xsd/opennebula_configuration.xsd

@@ -28,6 +28,8 @@
         </xs:element>
 
         <xs:element name="CLUSTER_ENCRYPTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element name="CONTEXT_RESTRICTED_DIRS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="CONTEXT_SAFE_DIRS" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="DATASTORE_CAPACITY_CHECK" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element name="DATASTORE_ENCRYPTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element name="DATASTORE_LOCATION" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>

data/share/schemas/xsd/vm.xsd

@@ -121,6 +121,8 @@
               <xs:element name="MEMORY" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="MEMORY_COST" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="MEMORY_MAX" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="MEMORY_SLOTS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="MEMORY_RESIZE_MODE" type="xs:string" minOccurs="0" maxOccurs="1"/>
               <xs:element name="NIC" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                   <xs:sequence>
@@ -311,6 +313,34 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="BACKUPS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="BACKUP_CONFIG" minOccurs="1" maxOccurs="1">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="BACKUP_VOLATILE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="FS_FREEZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="INCREMENTAL_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="KEEP_LAST" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="LAST_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="LAST_BACKUP_SIZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="LAST_DATASTORE_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="LAST_INCREMENT_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                    <xs:element name="MODE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="BACKUP_IDS" minOccurs="1" maxOccurs="1">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ID" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>

data/share/schemas/xsd/vnet.xsd

@@ -61,6 +61,34 @@
             </xs:sequence>
           </xs:complexType>
         </xs:element>
+        <xs:element name="UPDATED_VMS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="OUTDATED_VMS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="UPDATING_VMS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ERROR_VMS">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
         <xs:element name="TEMPLATE">
           <xs:complexType>
             <xs:sequence>

data/share/schemas/xsd/vnet_pool.xsd

@@ -55,6 +55,34 @@
                   </xs:sequence>
                 </xs:complexType>
               </xs:element>
+              <xs:element name="UPDATED_VMS">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="OUTDATED_VMS">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="UPDATING_VMS">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="ERROR_VMS">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
               <xs:element name="TEMPLATE" type="xs:anyType"/>
               <xs:element name="AR_POOL">
                 <xs:complexType>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.4.2
+  version: 6.5.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: 6.5.80.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: 6.5.80.pre
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -189,9 +189,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: