opennebula-cli 5.12.0 → 5.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3699c3c2d650493465035066057a79c20a59f40
-  data.tar.gz: 1577fe3f9e9ca3af5db399a0d9bc3587ad81cea4
+  metadata.gz: bf6e5e798b363cb760c687cb5fd21a53f172e79f
+  data.tar.gz: 6c49c0c55816e6f9cdc9560b0339d87fdf5f03c9
 SHA512:
-  metadata.gz: 7c85e13cf698bcb599380d24b4eff94fc8c5ea157947ba42ec4bf2cd56bbf83043a4bc660fe78da567e35b3c4f0b9780fcbc1105886d79bc05d21e6495fdb295
-  data.tar.gz: 334c79870dd8a1dde30dfd971f0007d8f925cb1bccc870d863a0e86509f9840671754a4a4b17ec51d21f29cd458997e4a99140c3aa325c210018120e6e8012a9
+  metadata.gz: 1555cc93d12c2358037c19491fd81f12a94554038a9fe8b720222a0a687ce4cd97149bef414f00784d70df774182cde5c10f0431a796af418b700d5cca7b04e2
+  data.tar.gz: 09174b70d83b62c5cedab69f75c6d1b29adee105153ae80970e2fda19a0a77d5152ba1d56d17b2bd1bfa49a0d3216c7e8a9fc528e012af9d9c327202c93fa0e2

data/bin/oneacct

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneacl

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onecluster

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onedatastore

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneflow

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneflow-template

@@ -29,8 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onegroup

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onehook

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onehost

@@ -29,8 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneimage

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onemarket

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onemarketapp

@@ -29,8 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onesecgroup

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneshowback

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onetemplate

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/oneuser

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevcenter

@@ -29,8 +29,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevdc

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevm

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -1297,6 +1298,86 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    ########################### Charters Management ############################
+
+    create_chart_desc = <<-EOT.unindent
+        Adds a charter to the VM, these are some consecutive scheduled actions
+
+        You can configure the actions in /etc/one/cli/onevm.yaml
+    EOT
+
+    command :'create-chart', create_chart_desc, [:range, :vmid_list] do
+        charters = helper.get_charters
+
+        if charters.nil?
+            STDERR.puts 'No charters found on configuration file'
+            exit(-1)
+        end
+
+        acc_t = 0
+        acc_w = 0
+
+        charters.each do |action, time|
+            sched = "+#{time[:time].to_i + acc_t}"
+
+            helper.schedule_actions(args[0],
+                                    { :schedule => sched },
+                                    action.to_s,
+                                    time[:warning][:time] + acc_w)
+
+            acc_t += time[:time].to_i
+            acc_w += time[:warning][:time].to_i
+        end
+
+        0
+    end
+
+    delete_chart_desc = <<-EOT.unindent
+        Deletes a charter from the VM
+    EOT
+
+    command :'delete-chart', delete_chart_desc, :vmid, :sched_id do
+        helper.perform_action(args[0], {}, 'Charter deleted') do |vm|
+            rc = vm.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error #{rc.message}"
+                exit(-1)
+            end
+
+            xpath = "USER_TEMPLATE/SCHED_ACTION[ID=#{args[1]}]"
+
+            unless vm.retrieve_elements(xpath)
+                STDERR.puts "Sched action #{args[1]} not found"
+                exit(-1)
+            end
+
+            vm.delete_element(xpath)
+            rc = vm.update(vm.user_template_str)
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error deleting: #{rc.message}"
+                exit(-1)
+            end
+        end
+
+        0
+    end
+
+    update_chart_desc = <<-EOT.unindent
+        Updates a charter from a VM
+    EOT
+
+    command :'update-chart',
+            update_chart_desc,
+            :vmid,
+            :sched_id,
+            [:file, nil] do
+        helper.update_schedule_action(args[0], args[1], args[2])
+
+        0
+    end
+
     # Deprecated commands
 
     deprecated_command(:shutdown, 'terminate')

data/bin/onevmgroup

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevnet

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -350,43 +351,9 @@ CommandParser::CmdParser.new(ARGV) do
         Update Address Range variables. SIZE, IP, MAC and TYPE cannot be updated
     EOT
 
-    command :updatear, update_ar_desc, :vnetid, :ar_id, [:file, nil] do
-        helper.perform_action(args[0], options, 'modified') do |obj|
-            rc = obj.info
-
-            if OpenNebula.is_error?(rc)
-                puts rc.message
-                exit(-1)
-            end
-
-            obj.delete_element("AR_POOL/AR[AR_ID!=#{args[1]}]")
-            obj.delete_element('AR_POOL/AR/LEASES')
-            obj.delete_element('AR_POOL/AR/USED_LEASES')
-            obj.delete_element('AR_POOL/AR/MAC_END')
-            obj.delete_element('AR_POOL/AR/IP_END')
-            obj.delete_element('AR_POOL/AR/IP6_ULA')
-            obj.delete_element('AR_POOL/AR/IP6_ULA_END')
-            obj.delete_element('AR_POOL/AR/IP6_GLOBAL')
-            obj.delete_element('AR_POOL/AR/IP6_GLOBAL_END')
-
-            if obj.template_like_str('AR_POOL').empty?
-                puts "Address Range #{args[1]} does not exist for " \
-                     "Virtual Network #{args[0]}"
-                exit(-1)
-            end
-
-            str = OpenNebulaHelper.update_template_helper(false,
-                                                          args[0],
-                                                          obj,
-                                                          args[2],
-                                                          'AR_POOL',
-                                                          false)
-
-            helper.set_client(options)
-            obj = helper.retrieve_resource(obj.id)
-
-            obj.update_ar(str)
-        end
+    command :updatear, update_ar_desc, :vnetid, :ar_id, [:file, nil],
+            :options => OpenNebulaHelper::APPEND do
+        helper.update_ar(args[0], args[1], args[2], options)
     end
 
     rename_desc = <<-EOT.unindent

data/bin/onevntemplate

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevrouter

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onezone

@@ -27,8 +27,9 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    Gem.use_paths(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
+    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+    require 'rubygems'
+    Gem.use_paths(File.realpath(GEMS_LOCATION))
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/lib/command_parser.rb

@@ -295,6 +295,11 @@ module CommandParser
                     cmd[:arity]+=1 unless args.include?(nil)
                     cmd[:args_format] << args
                 elsif args.instance_of?(Hash) && args[:options]
+                    if args[:options].is_a? Array
+                        args[:options].flatten!
+                        args[:options] = args[:options].sort_by {|o| o[:name] }
+                    end
+
                     cmd[:options] << args[:options]
                 else
                     cmd[:arity]+=1
@@ -679,7 +684,9 @@ module CommandParser
         def print_options
             puts "## OPTIONS"
 
-            shown_opts = Array.new
+            shown_opts = []
+            options    = []
+
             @command_list.each do |key|
                 value = @commands[key]
 
@@ -688,14 +695,17 @@ module CommandParser
                         next
                     else
                         shown_opts << o[:name]
-
-                        print_option(o)
+                        options << o
                     end
                 end
             end
 
-            @available_options.each do |o|
-                print_option o
+            options << @available_options
+            options.flatten!
+            options = options.sort_by {|o| o[:name] }
+
+            options.each do |o|
+                print_option(o)
             end
         end
 
@@ -724,6 +734,8 @@ module CommandParser
             else
                 puts "## COMMANDS"
 
+                @command_list.sort! if @command_list
+
                 @command_list.each do |key|
                     value = @commands[key]
                     printf cmd_format5, "* #{key} "
@@ -766,6 +778,9 @@ module CommandParser
 
             cmd_format5 =  "#{' '*3}%s"
             cmd_format10 =  "#{' '*8}%s"
+
+            @formats = @formats.sort_by {|key, _| key } if @formats
+
             @formats.each{ |key,value|
                 printf cmd_format5, "* #{key}"
                 puts

data/lib/one_helper/oneflow_helper.rb

@@ -406,7 +406,11 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
 
             column :TIME, '', :left, :size => 67 do |d|
                 if d['start_time']
-                    Time.parse(d['start_time']).to_s
+                    if !d['start_time'].match(/^\d+$/)
+                        Time.parse(d['start_time']).to_s
+                    else
+                        d['start_time']
+                    end
                 else
                     d['recurrence']
                 end

data/lib/one_helper/onevcenter_helper.rb

@@ -237,11 +237,11 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
                 d[:import_id]
             end
 
-            column :REF, "ref", :left, :size=>config[:REF] || 15 do |d|
+            column :REF, "ref", :left, :adjust, :size=>config[:REF] || 15 do |d|
                 d[:ref]
             end
 
-            column :NAME, "Name", :left, :size=>config[:NAME] || 20 do |d|
+            column :NAME, "Name", :left, :expand, :size=>config[:NAME] || 20 do |d|
                 d[:name] || d[:simple_name]
             end
 
@@ -250,7 +250,7 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
                 d[:one_ids] || d[:cluster].to_s
             end
 
-            column :PATH, "PATH", :left, :size=>config[:PATH] || 10 do |d|
+            column :PATH, "PATH", :left, :expand, :size=>config[:PATH] || 10 do |d|
                 d[:path]
             end
 

data/lib/one_helper/onevm_helper.rb

@@ -354,7 +354,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
             column :MEM, 'Memory asigned to the VM', :size => 7 do |d|
                 OpenNebulaHelper.unit_to_str(d['TEMPLATE']['MEMORY'].to_i,
-                                             options)
+                                             options, 'M')
             end
 
             column :HOST, 'Host where the VM is running',
@@ -402,7 +402,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         table
     end
 
-    def schedule_actions(ids, options, action)
+    def schedule_actions(ids, options, action, warning = nil)
         # Verbose by default
         options[:verbose] = true
 
@@ -453,18 +453,74 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 id = ids.max + 1
             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 = vm.user_template_str
 
             tmp_str << "\nSCHED_ACTION = "
             tmp_str << "[ID = #{id}, ACTION = #{action}, "
+            tmp_str << "WARNING = #{warning}," if warning
             tmp_str << "ARGS = \"#{options[:args]}\"," if options[:args]
-            tmp_str << "TIME = #{options[:schedule].to_i}"
+            tmp_str << "TIME = #{sched}"
             tmp_str << str_periodic << ']'
 
             vm.update(tmp_str)
         end
     end
 
+    # Update schedule action
+    #
+    # @param vm_id     [Integer] Virtual Machine ID
+    # @param action_id [Integer] Sched action ID
+    # @param file      [String]  File path with update content
+    def update_schedule_action(vm_id, action_id, file)
+        perform_action(vm_id, {}, 'Sched action updated') do |vm|
+            rc = vm.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error #{rc.message}"
+                exit(-1)
+            end
+
+            xpath = "USER_TEMPLATE/SCHED_ACTION[ID=#{action_id}]"
+
+            unless vm.retrieve_elements(xpath)
+                STDERR.puts "Sched action #{action_id} not found"
+                exit(-1)
+            end
+
+            # Get user information
+            if file
+                str = File.read(file)
+            else
+                str = OpenNebulaHelper.update_template(vm_id, vm, nil, xpath)
+            end
+
+            # Delete the current sched action
+            vm.delete_element(xpath)
+
+            # Add the modified sched action
+            tmp_str = vm.user_template_str
+            tmp_str << "\nSCHED_ACTION = ["
+            tmp_str << str.split("\n").join(',')
+            tmp_str << ']'
+
+            rc = vm.update(tmp_str)
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts "Error updating: #{rc.message}"
+                exit(-1)
+            end
+        end
+    end
+
     RECOVER_RETRY_STEPS = {
         :PROLOG_MIGRATE_FAILURE => :migrate,
         :PROLOG_MIGRATE_POWEROFF_FAILURE => :migrate,
@@ -602,6 +658,16 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
     end
 
+    # Get charters configuration
+    #
+    #   @return [Array]
+    #       - action
+    #           - time
+    #           - warning
+    def get_charters
+        YAML.load_file(self.class.table_conf)[:charters]
+    end
+
     private
 
     def factory(id = nil)
@@ -1144,24 +1210,24 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             CLIHelper.print_header(str_h1 % 'SCHEDULED ACTIONS', false)
 
             CLIHelper::ShowTable.new(nil, self) do
-                column :ID, '', :size => 2 do |d|
+                column :ID, '', :adjust => true do |d|
                     d['ID'] unless d.nil?
                 end
 
-                column :ACTION, '', :left, :size => 15 do |d|
+                column :ACTION, '', :adjust => true do |d|
                     d['ACTION'] unless d.nil?
                 end
 
-                column :ARGS, '', :left, :size => 15 do |d|
+                column :ARGS, '', :adjust => true do |d|
                     d['ARGS'] ? d['ARGS'] : '-'
                 end
 
-                column :SCHEDULED, '', :size => 12 do |d|
+                column :SCHEDULED, '', :adjust => true do |d|
                     OpenNebulaHelper.time_to_str(d['TIME'], false) \
                         unless d.nil?
                 end
 
-                column :REPEAT, '', :size => 20 do |d|
+                column :REPEAT, '', :adjust => true do |d|
                     str_rep = ''
                     if !d.nil? && d.key?('REPEAT')
                         if d['REPEAT'] == '0'
@@ -1180,7 +1246,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     str_rep unless d.nil?
                 end
 
-                column :END, '', :size => 20 do |d|
+                column :END, '', :adjust => true do |d|
                     str_end = ''
                     if !d.nil? && d.key?('END_TYPE')
                         if d['END_TYPE'] == '0'
@@ -1197,25 +1263,50 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                     str_end unless d.nil?
                 end
 
-                column :DONE, '', :size => 12 do |d|
+                column :DONE, '', :adjust => true do |d|
                     OpenNebulaHelper.time_to_str(d['DONE'], false) \
                         unless d.nil?
                 end
 
-                column :MESSAGE, '', :left, :adjust, :size => 35 do |d|
-                    d['MESSAGE'] unless d.nil?
+                column :MESSAGE, '', :size => 35 do |d|
+                    d['MESSAGE'] ? d['MESSAGE'] : '-'
+                end
+
+                column :CHARTER, '', :left, :adjust, :size => 15 do |d|
+                    t1 = Time.now
+                    t2 = Time.at(vm['STIME'].to_i + d['TIME'].to_i)
+
+                    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"
+                    else
+                        show = 'Already done'
+                    end
+
+                    if (t1 - vm['STIME'].to_i).to_i > d['WARNING'].to_i
+                        "#{show} *"
+                    else
+                        show
+                    end
                 end
             end.show([vm_hash['VM']['USER_TEMPLATE']['SCHED_ACTION']].flatten,
                      {})
         end
 
+        if !options[:all]
+            vm.delete_element('/VM/USER_TEMPLATE/SCHED_ACTION')
+        end
+
         if vm.has_elements?('/VM/USER_TEMPLATE')
             puts
 
-            if !options[:all]
-                vm.delete_element('/VM/USER_TEMPLATE/SCHED_ACTION')
-            end
-
             CLIHelper.print_header(str_h1 % 'USER TEMPLATE', false)
             puts vm.template_like_str('USER_TEMPLATE')
         end

data/lib/one_helper/onevnet_helper.rb

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and        #
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
-
 require 'one_helper'
 require 'one_helper/onevm_helper'
 
@@ -215,6 +214,71 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         orphans
     end
 
+    # Update VNet address range
+    #
+    # @param vnet_id [Intenger] Virtual Network ID
+    # @param ar_id   [Intenger] Address Range ID
+    # @param file    [String]   Path to file to read
+    # @param options [Hash]     User CLI options
+    def update_ar(vnet_id, ar_id, file, options)
+        perform_action(vnet_id, options, 'AR updated') do |obj|
+            rc = obj.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts rc.message
+                exit(-1)
+            end
+
+            obj.delete_element("AR_POOL/AR[AR_ID!=#{ar_id}]")
+            obj.delete_element('AR_POOL/AR/LEASES')
+            obj.delete_element('AR_POOL/AR/USED_LEASES')
+            obj.delete_element('AR_POOL/AR/MAC_END')
+            obj.delete_element('AR_POOL/AR/IP_END')
+            obj.delete_element('AR_POOL/AR/IP6_ULA')
+            obj.delete_element('AR_POOL/AR/IP6_ULA_END')
+            obj.delete_element('AR_POOL/AR/IP6_GLOBAL')
+            obj.delete_element('AR_POOL/AR/IP6_GLOBAL_END')
+
+            if obj.template_like_str('AR_POOL').empty?
+                STDERR.puts "Address Range #{ar_id} does not exist for " \
+                            "Virtual Network #{vnet_id}"
+                exit(-1)
+            end
+
+            xpath = "AR_POOL/AR[AR_ID=#{ar_id}]"
+
+            if options[:append]
+                str = OpenNebulaHelper.append_template(vnet_id,
+                                                       obj,
+                                                       file,
+                                                       xpath)
+            else
+                str = OpenNebulaHelper.update_template(vnet_id,
+                                                       obj,
+                                                       file,
+                                                       xpath)
+            end
+
+            if options[:append]
+                # Insert element in current template
+                parts = obj.template_like_str('AR_POOL').split("\n")
+
+                # Insert it in second position, OpenNebula will sort it
+                parts.insert(1, "#{str.strip},")
+
+                parts = parts.join("\n")
+                str   = parts
+            else
+                # Use the information from user
+                unless str.gsub(' ', '').match(/AR=\[/)
+                    str = "AR=[\n#{str.split("\n").join(",\n")}]"
+                end
+            end
+
+            obj.update_ar(str)
+        end
+    end
+
     private
 
     def factory(id=nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.12.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.0
+        version: 5.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.0
+        version: 5.12.1
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables: