opennebula-cli 6.4.6 → 6.5.80.pre

data/lib/one_helper/oneflow_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -297,7 +297,7 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
 
         CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
 
-        ['OWNER', 'GROUP', 'OTHER'].each do |e|
+        %w[OWNER GROUP OTHER].each do |e|
             mask = '---'
             permissions_hash = document['PERMISSIONS']
             mask[0] = 'u' if permissions_hash["#{e}_U"] == '1'

data/lib/one_helper/oneflowtemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -157,7 +157,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
 
                 CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
 
-                ['OWNER', 'GROUP', 'OTHER'].each do |e|
+                %w[OWNER GROUP OTHER].each do |e|
                     mask = '---'
                     permissions_hash = document['PERMISSIONS']
                     mask[0] = 'u' if permissions_hash["#{e}_U"] == '1'

data/lib/one_helper/onegroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onehook_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onehost_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -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
@@ -468,10 +460,10 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         n_elems = options[:n_elems] || 8
 
         # Different available size units
-        units = ['K', 'M', 'G', 'T']
+        units = %w[K M G T]
 
         # Attrs that need units conversion
-        attrs = ['FREE_MEMORY', 'USED_MEMORY']
+        attrs = %w[FREE_MEMORY USED_MEMORY]
 
         if unit && !units.include?(unit)
             STDERR.puts "Invalid unit `#{unit}`"
@@ -692,14 +684,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         end
 
         if numa_nodes && !numa_nodes.empty?
-            begin
-                monitoring_numa =
-                    host.to_hash['HOST']['MONITORING']['NUMA_NODE']
-            rescue StandardError
-                monitoring_numa = nil
-            end
-
-            print_numa_nodes(numa_nodes, monitoring_numa)
+            print_numa_nodes(numa_nodes)
         end
 
         puts
@@ -784,36 +769,14 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         table.show(pcis)
     end
 
-    def print_numa_nodes(numa_nodes, monitoring)
+    def print_numa_nodes(numa_nodes)
         numa_nodes = get_numa_data(numa_nodes)
 
-        merge_numa_monitoring(numa_nodes, monitoring)
-
         print_numa_cores(numa_nodes)
         print_numa_memory(numa_nodes)
         print_numa_hugepages(numa_nodes)
     end
 
-    def merge_numa_monitoring(numa_nodes, monitoring)
-        return if monitoring.nil?
-
-        monitoring = [monitoring] if monitoring.class == Hash
-
-        numa_nodes.each do |node|
-            mon_node = monitoring.find {|x| x['NODE_ID'] == node['NODE_ID'] }
-
-            next if mon_node.nil?
-
-            node['MEMORY']['FREE'] = mon_node['MEMORY']['FREE']
-            node['MEMORY']['USED'] = mon_node['MEMORY']['USED']
-
-            node['HUGEPAGE'].each do |hp|
-                mon_hp = mon_node['HUGEPAGE'].find {|x| x['SIZE'] == hp['SIZE'] }
-                hp['FREE'] = mon_hp['FREE']
-            end
-        end
-    end
-
     def get_numa_data(numa_nodes)
         numa_nodes = [numa_nodes] if numa_nodes.class == Hash
 
@@ -923,11 +886,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             end
 
             column :USED_REAL, 'Used memory', :size => 20, :left => true do |d|
-                if d['MEMORY']['USED'].nil?
-                    '-'
-                else
-                    OpenNebulaHelper.unit_to_str(d['MEMORY']['USED'].to_i, {})
-                end
+                OpenNebulaHelper.unit_to_str(d['MEMORY']['USED'].to_i, {})
             end
 
             column :USED_ALLOCATED, 'U memory',
@@ -936,11 +895,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             end
 
             column :FREE, 'Free memory', :size => 8, :left => true do |d|
-                if d['MEMORY']['FREE'].nil?
-                    '-'
-                else
-                    OpenNebulaHelper.unit_to_str(d['MEMORY']['FREE'].to_i, {})
-                end
+                OpenNebulaHelper.unit_to_str(d['MEMORY']['FREE'].to_i, {})
             end
 
             default :NODE_ID, :TOTAL, :USED_REAL, :USED_ALLOCATED, :FREE
@@ -978,7 +933,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             end
 
             column :FREE, 'Free pages', :size => 8, :left => true do |d|
-                d['HUGEPAGE']['FREE'] || '-'
+                d['HUGEPAGE']['FREE']
             end
 
             column :USED, 'allocated pages', :size => 8, :left => true do |d|

data/lib/one_helper/oneimage_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -22,7 +22,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
 
     # This list contains prefixes that should skip adding user home to the path
     # This must have the same content as the case $FROM in downloader.sh
-    PREFIXES = ['http', 'https', 'ssh', 's3', 'rbd', 'vcenter', 'lxd', 'docker', 'dockerfile']
+    PREFIXES = %w[http https ssh s3 rbd vcenter lxd docker dockerfile]
 
     TEMPLATE_OPTIONS=[
         {
@@ -67,7 +67,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             :format => String,
             :proc => lambda do |o, _options|
                 prefix=o.strip.downcase
-                if ['hd', 'sd', 'xvd', 'vd'].include? prefix
+                if %w[hd sd xvd vd].include? prefix
                     [0, prefix]
                 else
                     [-1, 'The prefix must be hd, sd, xvd or vd']
@@ -328,7 +328,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
 
         CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
 
-        ['OWNER', 'GROUP', 'OTHER'].each do |e|
+        %w[OWNER GROUP OTHER].each do |e|
             mask = '---'
             mask[0] = 'u' if image["PERMISSIONS/#{e}_U"] == '1'
             mask[1] = 'm' if image["PERMISSIONS/#{e}_M"] == '1'
@@ -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/onemarket_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onemarketapp_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -60,7 +60,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
     }
 
     # Available market place mads to import apps on them
-    MARKETS = ['http', 's3']
+    MARKETS = %w[http s3]
 
     def self.rname
         'MARKETPLACEAPP'
@@ -413,7 +413,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
 
         CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
 
-        ['OWNER', 'GROUP', 'OTHER'].each do |e|
+        %w[OWNER GROUP OTHER].each do |e|
             mask = '---'
             mask[0] = 'u' if app["PERMISSIONS/#{e}_U"] == '1'
             mask[1] = 'm' if app["PERMISSIONS/#{e}_M"] == '1'

data/lib/one_helper/onequota_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onesecgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onetemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -53,7 +53,6 @@ EOT
 
     RECURSIVE={
         :name => "recursive",
-        :short => "-R",
         :large => "--recursive",
         :description => "Applies the action to the template plus any "+
         "image defined in DISK"

data/lib/one_helper/oneuser_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onevcenter_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -58,20 +58,20 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
     #
     TABLE = {
         VOBJECT::DATASTORE => {
-            :struct  => ['DATASTORE_LIST', 'DATASTORE'],
+            :struct  => %w[DATASTORE_LIST DATASTORE],
             :columns =>
                 { :IMID => 5, :REF => 15, :NAME => 50, :CLUSTERS => 10 },
             :cli     => [:host],
             :dialogue => ->(arg) {}
         },
         VOBJECT::TEMPLATE => {
-            :struct  => ['TEMPLATE_LIST', 'TEMPLATE'],
+            :struct  => %w[TEMPLATE_LIST TEMPLATE],
             :columns => { :IMID => 5, :REF => 10, :NAME => 50 },
             :cli     => [:host],
             :dialogue => ->(arg) { OneVcenterHelper.template_dialogue(arg) }
         },
         VOBJECT::NETWORK => {
-            :struct  => ['NETWORK_LIST', 'NETWORK'],
+            :struct  => %w[NETWORK_LIST NETWORK],
             :columns => {
                 :IMID => 5,
                 :REF => 15,
@@ -82,13 +82,13 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
             :dialogue => ->(arg) { OneVcenterHelper.network_dialogue(arg) }
         },
         VOBJECT::IMAGE => {
-            :struct  => ['IMAGE_LIST', 'IMAGE'],
+            :struct  => %w[IMAGE_LIST IMAGE],
             :columns => { :IMID => 5, :REF => 35, :PATH => 60 },
             :cli     => [:host, :datastore],
             :dialogue => ->(arg) {}
         },
         VOBJECT::HOST => {
-            :struct  => ['HOST_LIST', 'HOST'],
+            :struct  => %w[HOST_LIST HOST],
             :columns => { :DATACENTER => 10, :NAME => 30, :REF => 35 },
             :cli     => [],
             :dialogue => ->(arg) {}
@@ -471,7 +471,7 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
                    ' do you want to create (IPv[4],IPv[6], [E]thernet)? '
         type_answer = ask.call(question, 'ether')
 
-        supported_types = ['4', '6', 'ether', 'e', 'ip4', 'ip6']
+        supported_types = %w[4 6 ether e ip4 ip6]
         if !supported_types.include?(type_answer)
             type_answer = 'e'
             STDOUT.puts "    Type [#{type_answer}] not supported,"\

data/lib/one_helper/onevdc_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/one_helper/onevm_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -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,28 +457,14 @@ 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 << ']'
 
-            rc = vm.sched_action_add(tmp_str)
-
-            if OpenNebula.is_error?(rc)
-                STDERR.puts rc.message
-                return -1
-            end
+            vm.sched_action_add(tmp_str)
         end
     end
 
@@ -1347,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,
@@ -1393,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
 
@@ -1426,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)