opennebula-cli 5.10.3 → 5.11.90.pre

data/bin/onevntemplate

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# 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    #
@@ -28,6 +28,7 @@ end
 
 if File.directory?(GEMS_LOCATION)
     Gem.use_paths(GEMS_LOCATION)
+    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onevrouter

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# 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    #
@@ -28,6 +28,7 @@ end
 
 if File.directory?(GEMS_LOCATION)
     Gem.use_paths(GEMS_LOCATION)
+    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION

data/bin/onezone

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# 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    #
@@ -28,6 +28,7 @@ end
 
 if File.directory?(GEMS_LOCATION)
     Gem.use_paths(GEMS_LOCATION)
+    $LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -230,6 +231,9 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :serversync, sync_desc, :server, :options => [DATABASE] do
         begin
+            # Suppress augeas require warning message
+            $VERBOSE = nil
+
             gem 'augeas', '~> 0.6'
             require 'augeas'
         rescue Gem::LoadError

data/lib/cli_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# 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    #
@@ -19,6 +19,9 @@ require 'csv'
 # CLI Helper
 module CLIHelper
 
+    # Available operators for filtering operations
+    FILTER_OPS = %w[= != < <= > >= ~]
+
     # CLI general options
     LIST = {
         :name => 'list',
@@ -55,7 +58,10 @@ module CLIHelper
         :large => '--filter x,y,z',
         :format => Array,
         :description => "Filter data. An array is specified with\n" <<
-                        ' ' * 31 << 'column=value pairs.'
+                        ' ' * 31 << 'column=value pairs.' <<
+                        ' ' * 31 << "Valid operators #{FILTER_OPS.join(',')}" <<
+                        ' ' * 31 << 'e.g. NAME=test (match name with test)' <<
+                        ' ' * 31 << 'NAME~test (match test, te, tes..)'
     }
 
     OPERATOR = {
@@ -175,9 +181,15 @@ module CLIHelper
     ANSI_YELLOW = "\33[33m"
 
     # CLI states
-    OK_STATES      = %w[runn rdy on configured SUCCESS]
-    BAD_STATES     = %w[fail err error ERROR]
-    REGULAR_STATES = %w[pending]
+    OK_STATES      = %w[runn rdy on configured SUCCESS RUNNING]
+    BAD_STATES     = %w[fail
+                        err
+                        error
+                        ERROR
+                        FAILED_DEPLOYING
+                        FAILED_UNDEPLOYING
+                        FAILED_SCALING]
+    REGULAR_STATES = %w[pending WARNING]
 
     # Set state color
     #
@@ -568,6 +580,10 @@ 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
 
@@ -785,10 +801,6 @@ module CLIHelper
             rescue StandardError => e
                 CLIHelper.fail(e.message)
             end
-
-            return unless options[:list]
-
-            @default_columns = options[:list].collect {|o| o.upcase.to_sym }
         end
 
         # Filter data
@@ -796,7 +808,7 @@ module CLIHelper
         # @param data    [Array] Array with data to filter
         # @param options [Hash]  Object with CLI user options
         def filter_data!(data, options)
-            operators = /(=|!=|<|<=|>|>=)/
+            operators = /(#{FILTER_OPS.join('|')})/
             filter    = options[:filter]
 
             if options.key?(:operator)
@@ -809,7 +821,7 @@ module CLIHelper
                 m = s.match(/^(.*?)#{operators}(.*?)$/)
 
                 if m
-                    index = @default_columns.index(m[1].to_sym)
+                    index = @columns.keys.index(m[1].to_sym)
 
                     if index
                         {
@@ -819,7 +831,7 @@ module CLIHelper
                             :index      => index
                         }
                     else
-                        CLIHelper.fail("Column '#{left}' not found")
+                        CLIHelper.fail("Column '#{m[1]}' not found")
                     end
                 else
                     CLIHelper.fail("Expression '#{s}' incorrect")
@@ -830,7 +842,14 @@ module CLIHelper
                 pass = true
 
                 stems.each do |s|
-                    s[:operator] == '=' ? op = '==' : op = s[:operator]
+                    case s[:operator]
+                    when '='
+                        op = '=='
+                    when '~'
+                        op = 'include?'
+                    else
+                        op = s[:operator]
+                    end
 
                     if d[s[:index]].public_send(op, s[:right])
                         if log_operator == 'OR'

data/lib/command_parser.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# 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    #
@@ -140,6 +140,7 @@ module CommandParser
         # @option options [String] :name
         # @option options [String] :short
         # @option options [String] :large
+        # @option options [Boolean] :multiple
         # @option options [String] :description
         # @option options [Class] :format
         # @option options [Block] :proc The block receives the value of the
@@ -452,7 +453,7 @@ module CommandParser
 
             if comm.nil?
                 print_help
-                exit -1
+                exit 0
             end
 
             if comm[:deprecated]
@@ -463,16 +464,27 @@ module CommandParser
             parse(extra_options)
 
             if comm
-                @before_proc.call if @before_proc
+                begin
+                    @before_proc.call if @before_proc
+                rescue StandardError => e
+                    STDERR.puts e.message
+                    exit(-1)
+                end
 
                 check_args!(comm_name, comm[:arity], comm[:args_format])
 
-                rc = comm[:proc].call
-                if rc.instance_of?(Array)
-                    puts rc[1]
-                    exit rc.first
-                else
-                    exit(@exit_code || rc)
+                begin
+                    rc = comm[:proc].call
+
+                    if rc.instance_of?(Array)
+                        puts rc[1]
+                        exit rc.first
+                    else
+                        exit(@exit_code || rc)
+                    end
+                rescue StandardError => e
+                    STDERR.puts e.message
+                    exit(-1)
                 end
             end
         end
@@ -490,21 +502,28 @@ module CommandParser
                     args = []
                     args << e[:short] if e[:short]
                     args << e[:large]
+                    args << e[:multiple] if e[:multiple]
                     args << e[:format]
                     args << e[:description]
 
                     opts.on(*args) do |o|
-                        if e[:proc]
+                        if e[:proc] && !e[:multiple]
                             @options[e[:name].to_sym]=o
                             with_proc<<e
                         elsif e[:name]=="help"
                             print_help
-                            exit
+                            exit 0
                         elsif e[:name]=="version"
                             puts @version
-                            exit
-                        else
+                            exit 0
+                        elsif !e[:multiple]
                             @options[e[:name].to_sym]=o
+                        else
+                            if @options[e[:name].to_sym].nil?
+                                @options[e[:name].to_sym] = []
+                            end
+
+                            @options[e[:name].to_sym] << o
                         end
                     end
                 end

data/lib/one_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# 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    #
@@ -30,7 +30,7 @@ include OpenNebula
 module OpenNebulaHelper
     ONE_VERSION=<<-EOT
 OpenNebula #{OpenNebula::VERSION}
-Copyright 2002-2019, OpenNebula Project, OpenNebula Systems
+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
@@ -1696,4 +1696,195 @@ EOT
             "-"
         end
     end
+
+    def OpenNebulaHelper.parse_user_inputs(inputs, get_defaults = false)
+        unless get_defaults
+            puts 'There are some parameters that require user input. ' \
+                 'Use the string <<EDITOR>> to launch an editor ' \
+                 '(e.g. for multi-line inputs)'
+        end
+
+        answers = {}
+
+        inputs.each do |key, val|
+            input_cfg = val.split('|', -1)
+
+            if input_cfg.length < 3
+                STDERR.puts 'Malformed user input. It should have at least 3 '\
+                            "parts separated by '|':"
+                STDERR.puts "  #{key}: #{val}"
+                exit(-1)
+            end
+
+            mandatory, type, description, params, initial = input_cfg
+            optional = mandatory.strip == 'O'
+            type.strip!
+            description.strip!
+
+            if input_cfg.length > 3
+                if input_cfg.length != 5
+                    STDERR.puts 'Malformed user input. It should have 5 parts'\
+                                " separated by '|':"
+                    STDERR.puts "  #{key}: #{val}"
+                    exit(-1)
+                end
+
+                params.strip!
+                initial.strip!
+            end
+
+            if get_defaults
+                answers[key]= initial unless mandatory == 'M'
+                next
+            end
+
+            puts "  * (#{key}) #{description}"
+
+            header = '    '
+            if !initial.nil? && initial != ''
+                header += "Press enter for default (#{initial}). "
+            end
+
+            case type
+            when 'text', 'text64'
+                print header
+
+                answer = STDIN.readline.chop
+
+                if answer == '<<EDITOR>>'
+                    answer = OpenNebulaHelper.editor_input
+                end
+
+                # use default in case it's empty
+                answer = initial if answer.empty?
+
+                if type == 'text64'
+                    answer = Base64.encode64(answer).strip.delete("\n")
+                end
+
+            when 'boolean'
+                print header
+
+                answer = STDIN.readline.chop
+
+                # use default in case it's empty
+                answer = initial if answer.empty?
+
+                unless %w[YES NO].include?(answer)
+                    STDERR.puts "Invalid boolean '#{answer}'"
+                    STDERR.puts 'Boolean has to be YES or NO'
+                    exit(-1)
+                end
+
+            when 'password'
+                print header
+
+                answer = OpenNebulaHelper::OneHelper.get_password
+
+                # use default in case it's empty
+                answer = initial if answer.empty?
+
+            when 'number', 'number-float'
+                if type == 'number'
+                    header += 'Integer: '
+                    exp = INT_EXP
+                else
+                    header += 'Float: '
+                    exp = FLOAT_EXP
+                end
+
+                begin
+                    print header
+                    answer = STDIN.readline.chop
+
+                    answer = initial if answer == ''
+                        noanswer = ((answer == '') && optional)
+                end while !noanswer && (answer =~ exp) == nil
+
+                if noanswer
+                    next
+                end
+
+            when 'range', 'range-float'
+                min, max = params.split('..')
+
+                if min.nil? || max.nil?
+                    STDERR.puts 'Malformed user input. '\
+                                "Parameters should be 'min..max':"
+                    STDERR.puts "  #{key}: #{val}"
+                    exit(-1)
+                end
+
+                if type == 'range'
+                    exp = INT_EXP
+                    min = min.to_i
+                    max = max.to_i
+
+                    header += "Integer in the range [#{min}..#{max}]: "
+                else
+                    exp = FLOAT_EXP
+                    min = min.to_f
+                    max = max.to_f
+
+                    header += "Float in the range [#{min}..#{max}]: "
+                end
+
+                begin
+                    print header
+                    answer = STDIN.readline.chop
+
+                    answer = initial if answer == ''
+
+                    noanswer = (answer == '') && optional
+                end while !noanswer && ((answer =~ exp) == nil ||
+                          answer.to_f < min || answer.to_f > max)
+
+                if noanswer
+                    next
+                end
+
+            when 'list'
+                options = params.split(',')
+
+                options.each_with_index do |opt, i|
+                    puts "    #{i}  #{opt}"
+                end
+
+                puts
+
+                header += 'Please type the selection number: '
+
+                begin
+                    print header
+                    answer = STDIN.readline.chop
+
+                    if answer == ''
+                        answer = initial
+                    else
+                        answer = options[answer.to_i]
+                    end
+
+                    noanswer = ((answer == '') && optional)
+                end while !noanswer && !options.include?(answer)
+
+                if noanswer
+                    next
+                end
+
+            when 'fixed'
+                puts "    Fixed value of (#{initial}). Cannot be changed"
+                answer = initial
+
+            else
+                STDERR.puts 'Wrong type for user input:'
+                STDERR.puts "  #{key}: #{val}"
+                exit(-1)
+            end
+
+            answers[key] = answer
+        end
+
+        answers
+    end
+
 end