opennebula-cli 5.11.90.pre → 5.12.0.4

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/cli_helper.rb

@@ -325,9 +325,10 @@ module CLIHelper
             column[:size] = 5
 
             conf.each do |c|
-                if c.is_a? Symbol
+                case c
+                when Symbol
                     column[c] = true
-                elsif c.is_a? Hash
+                when Hash
                     c.each do |key, value|
                         column[key] = value
                     end
@@ -356,6 +357,12 @@ module CLIHelper
         # @param options [Hash] Object with CLI user options
         # @param top     [Boolean]     True to not update columns again
         def show(data, options = {}, top = false)
+            if options[:list]
+                @cli_columns = options[:list].collect {|o| o.upcase.to_sym }
+            else
+                @cli_columns = @default_columns
+            end
+
             update_columns(options) unless top
 
             if data.is_a? Hash
@@ -477,7 +484,7 @@ module CLIHelper
 
         # Get header in string format
         def header_str
-            @default_columns.collect do |c|
+            @cli_columns.collect do |c|
                 if @columns[c]
                     format_str(c, c.to_s)
                 else
@@ -495,12 +502,12 @@ module CLIHelper
 
             update_columns_size(options)
 
+            options[:csv_del] ? del = options[:csv_del] : del = ','
+
             if !options[:csv] && (!options.key? :no_header)
                 CLIHelper.print_header(header_str)
-            end
-
-            if options[:csv] && (!options.key? :no_header)
-                print_csv_data([@default_columns], options[:csv_del])
+            elsif options[:csv] && (!options.key? :no_header)
+                puts CSV.generate_line(@cli_columns, :col_sep => del)
             end
 
             @res_data ? print_data(@res_data, options) : puts
@@ -525,10 +532,16 @@ module CLIHelper
         # @param data [Array] Array with data to show
         # @param del  [Char]  CSV delimiter
         def print_csv_data(data, del)
-            del ? del = del : del = ','
+            del ||= ','
 
             data.each do |l|
-                puts CSV.generate_line(l, :col_sep => del)
+                result = []
+
+                @cli_columns.each do |col|
+                    result << l[@default_columns.index(col)]
+                end
+
+                puts CSV.generate_line(result, :col_sep => del)
             end
         end
 
@@ -537,25 +550,26 @@ module CLIHelper
         # @param data        [Array]  Array with data to show
         # @param stat_column [String] Name of the state column
         def print_normal_data(data, stat_column)
-            ncolumns = @default_columns.length
-
             if stat_column
-                stat        = stat_column.upcase.to_sym
-                stat_column = @default_columns.index(stat)
+                stat = stat_column.upcase.to_sym
             else
-                stat_column = @default_columns.index(:STAT)
+                stat = :STAT
             end
 
             data.each do |l|
                 result = []
 
-                ncolumns.times do |i|
+                @cli_columns.each do |col|
+                    i = @default_columns.index(col)
+
+                    # Column might not exist
+                    next unless i
+
                     dat = l[i]
-                    col = @default_columns[i]
 
                     str = format_str(col, dat)
 
-                    str = CLIHelper.color_state(str) if i == stat_column
+                    str = CLIHelper.color_state(str) if col == stat
 
                     result << str
                 end
@@ -570,8 +584,17 @@ module CLIHelper
         #
         # @return        [Array] Array with selected columns information
         def data_array(data, options)
+            # Take default table columns and desired ones by the user
+            cols = @default_columns
+
+            @cli_columns.each do |col|
+                next if @default_columns.include?(col)
+
+                @default_columns.insert(@cli_columns.index(col) + 1, col)
+            end
+
             res_data = data.collect do |d|
-                @default_columns.collect do |c|
+                cols.collect do |c|
                     @columns[c][:proc].call(d).to_s if @columns[c]
                 end
             end
@@ -580,10 +603,6 @@ module CLIHelper
                 filter_data!(res_data, options) if options[:filter]
             end
 
-            return res_data unless options[:list]
-
-            @default_columns = options[:list].collect {|o| o.upcase.to_sym }
-
             res_data
         end
 
@@ -612,7 +631,7 @@ module CLIHelper
         def config_expand_data
             ret = []
 
-            @default_columns.each do |column|
+            @cli_columns.each do |column|
                 expand_c = @columns[column][:expand]
 
                 next unless expand_c
@@ -633,7 +652,7 @@ module CLIHelper
         def config_adjust_data
             ret = []
 
-            @default_columns.each do |column|
+            @cli_columns.each do |column|
                 next unless @columns[column][:adjust]
 
                 ret << column.to_s.downcase
@@ -649,7 +668,9 @@ module CLIHelper
         def expand_columns(expand_columns, all = false)
             return if expand_columns.empty?
 
-            if $stdout.tty? || (IO.console && IO.console.tty?)
+            if $stdout.isatty
+                terminal_size = $stdout.winsize[1]
+            elsif IO.console && IO.console.tty?
                 terminal_size = IO.console.winsize[1]
             else
                 terminal_size = nil
@@ -657,13 +678,13 @@ module CLIHelper
 
             return if terminal_size.nil?
 
-            default_columns = columns_info(@default_columns)
+            default_columns = columns_info(@cli_columns)
             expand_columns  = columns_info(expand_columns)
 
             total_size     = total_columns_size(default_columns)
             columns_size   = total_columns_size(expand_columns)
 
-            terminal_size -= (@default_columns.size - 1)
+            terminal_size -= (@cli_columns.size - 1)
             left_size      = terminal_size - total_size
             remaining_size = left_size
 
@@ -735,7 +756,7 @@ module CLIHelper
             expand_data = []
 
             if expand_all
-                expand_data = @default_columns
+                expand_data = @cli_columns
             elsif expand
                 expand_data += options[:expand]
             end
@@ -749,7 +770,7 @@ module CLIHelper
             unless expand_all
                 adjust.each do |column|
                     column = column.upcase.to_sym
-                    size   = max_size(@default_columns.index(column))
+                    size   = max_size(@cli_columns.index(column))
 
                     if size && size > @columns[column][:size]
                         @columns[column][:adjust] = true
@@ -821,7 +842,7 @@ module CLIHelper
                 m = s.match(/^(.*?)#{operators}(.*?)$/)
 
                 if m
-                    index = @columns.keys.index(m[1].to_sym)
+                    index = @default_columns.index(m[1].upcase.to_sym)
 
                     if index
                         {

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
@@ -649,7 +654,7 @@ module CommandParser
             print_formatters
             puts
             if @version
-                puts "## LICENSE"
+                puts "## VERSION"
                 puts @version
             end
         end
@@ -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.rb

@@ -31,10 +31,6 @@ module OpenNebulaHelper
     ONE_VERSION=<<-EOT
 OpenNebula #{OpenNebula::VERSION}
 Copyright 2002-2020, 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
-a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 EOT
 
     if ONE_LOCATION
@@ -1203,6 +1199,18 @@ EOT
         end
     end
 
+    def OpenNebulaHelper.bytes_to_unit(value, unit = 'K')
+        j = 0
+        i = BinarySufix.index(unit).to_i
+
+        while j < i do
+            value /= 1024.0
+            j += 1
+        end
+
+        value
+    end
+
     # If the cluster name is empty, returns a '-' char.
     #
     # @param str [String || Hash] Cluster name, or empty Hash (when <CLUSTER/>)
@@ -1887,4 +1895,57 @@ EOT
         answers
     end
 
+    # Returns plot object to print it on the CLI
+    #
+    # @param x     [Array]  Data to x axis (Time axis)
+    # @param y     [Array]  Data to y axis
+    # @param attr  [String] Parameter to y axis
+    # @param title [String] Plot title
+    #
+    # @return Gnuplot plot object
+    def OpenNebulaHelper.get_plot(x, y, attr, title)
+        # Require gnuplot gem only here
+        begin
+            require 'gnuplot'
+        rescue LoadError, Gem::LoadError
+            STDERR.puts(
+                'Gnuplot gem is not installed, run `gem install gnuplot` '\
+                'to install it'
+            )
+            exit(-1)
+        end
+
+        # Check if gnuplot is installed on the system
+        unless system('gnuplot --version')
+            STDERR.puts(
+                'Gnuplot is not installed, install it depending on your distro'
+            )
+            exit(-1)
+        end
+
+        Gnuplot.open do |gp|
+            Gnuplot::Plot.new(gp) do |p|
+                p.title title
+
+                p.xlabel 'Time'
+                p.ylabel attr
+
+                p.xdata   'time'
+                p.timefmt "'%H:%M'"
+                p.format  "x '%H:%M'"
+
+                p.style    'data lines'
+                p.terminal 'dumb'
+
+                p.data << Gnuplot::DataSet.new([x, y]) do |ds|
+                    ds.with      = 'linespoints'
+                    ds.linewidth = '3'
+                    ds.using     = '1:2'
+
+                    ds.notitle
+                end
+            end
+        end
+    end
+
 end