opennebula-cli 5.12.2 → 5.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7a23900bc02ed48fab2caeaf9e8c0d75d073e04
-  data.tar.gz: 93e91f3106fcb935c476dff7d573b83f4bb3a077
+  metadata.gz: 6e29fa3ced9904d772fa21dce326f36ba53f5b5b
+  data.tar.gz: 4423b75aac339b713828c7eaf63b85b7af6a911f
 SHA512:
-  metadata.gz: 62f8ed683a3f5e3e0aa2cc3603405a28f252bd3ac3c7b5b493421fc3fe871a8c1ce9a26225b1f113101d23074776069416553c880b0ea76e8660ca9cc15eaa9c
-  data.tar.gz: 5f5a6eb0bfa5e17aca77d65237cff28455e696d9398e2bfc9d599888a9de37e35dc3a623697205e5bf3998cd1f99a4a830516f75a93730ff2d3c663845f60908
+  metadata.gz: 1a878d4aa7ab7c2cabc77f933fdc95d861ee54aa97678358efafb02aff4b3a17872ce2650d8b9087d40bae38b4e2d7e63afe17ffb7f59c29b1d2ba40ed3a9ab4
+  data.tar.gz: a32059c260cbea98f8ea3a22b887bc9032edd1091cd65e76944cef6adf22c4acc7b99a28aba8798e7f86d3a1791bf6e412edfc858841d82c51fcc75380a79adf

data/bin/oneshowback

@@ -172,8 +172,13 @@ CommandParser::CmdParser.new(ARGV) do
                                                                end_year)
 
         if OpenNebula.is_error?(rc)
-            warn rc.message
-            exit(-1)
+            if rc.message.include? "ReadTimeout"
+                warn "Showback calculation takes too long, continuing in background"
+                exit_code 0
+            else
+                warn rc.message
+                exit(-1)
+            end
         else
             puts rc
             exit_code 0

data/bin/onetemplate

@@ -261,8 +261,11 @@ CommandParser::CmdParser.new(ARGV) do
                 if !user_inputs
                     user_inputs = OneTemplateHelper.get_user_inputs(t.to_hash)
                 else
-                    optionals = OneTemplateHelper.get_user_inputs(t.to_hash,
-                                                                  true)
+                    optionals = OneTemplateHelper.get_user_inputs(
+                        t.to_hash,
+                        options[:user_inputs_keys],
+                    )
+
                     user_inputs = user_inputs + "\n" + optionals
                 end
 

data/bin/onevcenter

@@ -155,6 +155,7 @@ CommandParser::CmdParser.new(ARGV) do
         begin
             args = helper.parse_opts(options)
             args[:filter] = true
+            args[:short] = true
             vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
             importer = VCenterDriver::VcImporter
                        .new_child(helper.client, vi_client, options[:object])
@@ -185,6 +186,7 @@ CommandParser::CmdParser.new(ARGV) do
         begin
             args = helper.parse_opts(options)
             args[:filter] = false
+            args[:short] = true
             vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
             importer = VCenterDriver::VcImporter
                        .new_child(helper.client, vi_client, options[:object])

data/lib/cli_helper.rb

@@ -532,7 +532,7 @@ 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|
                 result = []

data/lib/one_helper.rb

@@ -383,9 +383,15 @@ EOT
             :format => Array,
             :description => 'Specify the user inputs values when instantiating',
             :proc => lambda do |o, options|
+                # Store user inputs that has been already processed
+                options[:user_inputs_keys] = []
+
                 # escape values
                 options[:user_inputs].map! do |user_input|
                     user_input_split = user_input.split('=')
+
+                    options[:user_inputs_keys] << user_input_split[0]
+
                     "#{user_input_split[0]}=\"#{user_input_split[1]}\""
                 end
 
@@ -519,8 +525,12 @@ EOT
             @translation_hash = nil
         end
 
-        def set_client(options)
-            @client=OpenNebulaHelper::OneHelper.get_client(options, true)
+        def set_client(options, client=nil)
+            if client.nil?
+                @client=OpenNebulaHelper::OneHelper.get_client(options, true)
+            else
+                @client = client
+            end
         end
 
         def create_resource(options, &block)
@@ -1705,8 +1715,8 @@ EOT
         end
     end
 
-    def OpenNebulaHelper.parse_user_inputs(inputs, get_defaults = false)
-        unless get_defaults
+    def OpenNebulaHelper.parse_user_inputs(inputs, keys = [])
+        unless inputs.keys == keys
             puts 'There are some parameters that require user input. ' \
                  'Use the string <<EDITOR>> to launch an editor ' \
                  '(e.g. for multi-line inputs)'
@@ -1715,6 +1725,8 @@ EOT
         answers = {}
 
         inputs.each do |key, val|
+            next if keys.include? key
+
             input_cfg = val.split('|', -1)
 
             if input_cfg.length < 3
@@ -1741,11 +1753,6 @@ EOT
                 initial.strip!
             end
 
-            if get_defaults
-                answers[key]= initial unless mandatory == 'M'
-                next
-            end
-
             puts "  * (#{key}) #{description}"
 
             header = '    '

data/lib/one_helper/onehook_helper.rb

@@ -161,7 +161,11 @@ class OneHookHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
-            default :HOOK, :ID, :TIMESTAMP, :RC, :EXECUTION
+            if !header
+                default :HOOK, :ID, :TIMESTAMP, :RC, :EXECUTION
+            else
+                default :ID, :TIMESTAMP, :RC, :EXECUTION
+            end
         end
 
         table.show(execs, :stat_column => :EXECUTION)

data/lib/one_helper/oneimage_helper.rb

@@ -20,6 +20,10 @@ require 'one_helper/onevm_helper'
 # CLI helper for oneimage command
 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 = %w[http https ssh s3 rbd vcenter lxd docker]
+
     TEMPLATE_OPTIONS=[
         {
             :name => 'name',
@@ -82,7 +86,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             :description => 'Path of the image file',
             :format => String,
             :proc => lambda do |o, _options|
-                next [0, o] if o.match(%r{^(https?|docker)://})
+                next [0, o] if o.match(%r{^(#{PREFIXES.join('|')})://})
 
                 if o[0, 1]=='/'
                     path=o

data/lib/one_helper/onetemplate_helper.rb

@@ -128,15 +128,16 @@ EOT
     INT_EXP = /^-?\d+$/
     FLOAT_EXP = /^-?\d+(\.\d+)?$/
 
-    def self.get_user_inputs(template, get_defaults = false)
+    def self.get_user_inputs(template, keys = [])
         user_inputs = template['VMTEMPLATE']['TEMPLATE']['USER_INPUTS']
 
         return '' unless user_inputs
 
-        answers = OpenNebulaHelper.parse_user_inputs(user_inputs, get_defaults)
-
+        answers = OpenNebulaHelper.parse_user_inputs(user_inputs, keys)
         answers_s = ''
         answers.each do |key, val|
+            next unless val
+
             # Do not replace values that are equal to the ones already in the
             # template. Useful for cpu, mem, vcpu
             if key != template['VMTEMPLATE']['TEMPLATE'][key]

data/lib/one_helper/oneuser_helper.rb

@@ -201,6 +201,10 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
             login_client = self.get_login_client(username, options)
         end
 
+        if (login_client.is_a? Array) && login_client[0] == -1
+            return login_client
+        end
+
         user = OpenNebula::User.new(User.build_xml, login_client)
 
         egid = options[:group] || -1

data/lib/one_helper/onevm_helper.rb

@@ -100,7 +100,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             if File.file?(o)
                 options[:file] = o
             else
-                exit - 1
+                STDERR.puts "File `#{options[:file]}` doesn't exist"
+                exit(-1)
             end
         }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.12.2
+  version: 5.12.7
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-12-16 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.2
+        version: 5.12.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.2
+        version: 5.12.7
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables:
@@ -78,34 +78,34 @@ files:
 - bin/onevntemplate
 - bin/onevrouter
 - bin/onezone
-- lib/cli_helper.rb
 - lib/command_parser.rb
+- lib/cli_helper.rb
 - lib/one_helper.rb
 - lib/one_helper/oneacl_helper.rb
 - lib/one_helper/onecluster_helper.rb
-- lib/one_helper/onedatastore_helper.rb
 - lib/one_helper/onegroup_helper.rb
 - lib/one_helper/onehook_helper.rb
-- lib/one_helper/onehost_helper.rb
-- lib/one_helper/oneimage_helper.rb
 - lib/one_helper/onemarket_helper.rb
-- lib/one_helper/onemarketapp_helper.rb
 - lib/one_helper/onequota_helper.rb
 - lib/one_helper/onesecgroup_helper.rb
-- lib/one_helper/onetemplate_helper.rb
-- lib/one_helper/oneuser_helper.rb
 - lib/one_helper/onevcenter_helper.rb
 - lib/one_helper/onevdc_helper.rb
 - lib/one_helper/onevm_helper.rb
 - lib/one_helper/onevmgroup_helper.rb
 - lib/one_helper/onevnet_helper.rb
 - lib/one_helper/onevntemplate_helper.rb
-- lib/one_helper/onevrouter_helper.rb
-- lib/one_helper/onezone_helper.rb
 - lib/one_helper/oneacct_helper.rb
+- lib/one_helper/onedatastore_helper.rb
 - lib/one_helper/oneflow_helper.rb
 - lib/one_helper/oneflowtemplate_helper.rb
+- lib/one_helper/onehost_helper.rb
+- lib/one_helper/oneimage_helper.rb
+- lib/one_helper/onemarketapp_helper.rb
 - lib/one_helper/oneprovision_helper.rb
+- lib/one_helper/onetemplate_helper.rb
+- lib/one_helper/oneuser_helper.rb
+- lib/one_helper/onevrouter_helper.rb
+- lib/one_helper/onezone_helper.rb
 - NOTICE
 - LICENSE
 homepage: http://opennebula.io