opennebula-cli 5.12.4 → 5.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 806947ac1f01c5fa987378a3391772955b54e2d2
-  data.tar.gz: 2c2f5d50a2dcca17e29699e2161a3ee2785ef9e9
+  metadata.gz: 6ffe5519361d8bfe5ec8049e21fcc525f31df1af
+  data.tar.gz: c6c8c856980868f1940e2006f9e606e7e2541a20
 SHA512:
-  metadata.gz: d349474f920bd5d31403068e415cef40b53907f298f3c7512bfab0d09f754c25c9c84077978ba5b03d000f63b879b0ff140a878c664f7310a6bacde5c0d7b618
-  data.tar.gz: 118f7024189d248b6dfe16d8b6c41e1d3e8a02d720aeadc98eac4447f7efcf27822238473387a7c648071f9111268bc7cc44c69ac2e8ccbf2800cf82d9bd3870
+  metadata.gz: 547bae16979befeb2d672f25718e6b46e34a7fb3dd86f18dbce903dc86a44d6289b7fbed81e5e944b0e3605e6e617f4c12d8e91e0a69b320d91e367420353b2f
+  data.tar.gz: 714d0229222f5f7b6fbe512b6b830f9393ddb4409622013d0a0a6bf6e3ac21a1d45be6596d97f30918457dc454a72435f6426562b8cb8b05371b5270a440d9a6

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])
@@ -255,10 +257,21 @@ CommandParser::CmdParser.new(ARGV) do
             importer = VCenterDriver::VcImporter.new_child(helper.client,
                                                            vi_client,
                                                            options[:object])
-            importer.retrieve_resources(helper.parse_opts(options))
-            indexes = importer.get_indexes(args.first)
 
-            importer.process_import(indexes)
+            if options[:object] == "networks" && !args.first.nil?
+                indexes = args.first
+            else
+                importer.retrieve_resources(helper.parse_opts(options))
+                indexes = importer.get_indexes(args.first)
+            end
+
+            if indexes.nil?
+                raise "Could not get any unimported #{options[:object]}"\
+                    " resources info in host: #{options[:host]} with"\
+                    " this input: #{args.first}"
+            end
+
+            importer.process_import(indexes, options)
 
             importer.stdout
         rescue StandardError => e

data/bin/onevm

@@ -1271,7 +1271,7 @@ CommandParser::CmdParser.new(ARGV) do
     lock_desc = <<-EOT.unindent
         Locks a VM with differents levels for lock any actions with this VM, show and
         monitoring never will be locked.
-        Aalid states are: All.
+        Valid states are: All.
     EOT
 
     command :lock, lock_desc, :vmid,

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/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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.12.4
+  version: 5.12.9
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,19 +16,18 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.4
+        version: 5.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.4
+        version: 5.12.9
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables:
 - oneacct
-- onevcenter
 - oneacl
 - onecluster
 - onedatastore
@@ -44,6 +43,7 @@ executables:
 - oneshowback
 - onetemplate
 - oneuser
+- onevcenter
 - onevdc
 - onevm
 - onevmgroup
@@ -55,7 +55,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/oneacct
-- bin/onevcenter
 - bin/oneacl
 - bin/onecluster
 - bin/onedatastore
@@ -71,6 +70,7 @@ files:
 - bin/oneshowback
 - bin/onetemplate
 - bin/oneuser
+- bin/onevcenter
 - bin/onevdc
 - bin/onevm
 - bin/onevmgroup
@@ -78,17 +78,22 @@ files:
 - bin/onevntemplate
 - bin/onevrouter
 - bin/onezone
-- lib/command_parser.rb
 - lib/cli_helper.rb
+- lib/command_parser.rb
 - lib/one_helper.rb
+- lib/one_helper/oneacct_helper.rb
 - lib/one_helper/oneacl_helper.rb
 - lib/one_helper/onecluster_helper.rb
 - lib/one_helper/onedatastore_helper.rb
+- lib/one_helper/oneflow_helper.rb
+- lib/one_helper/oneflowtemplate_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/oneprovision_helper.rb
 - lib/one_helper/onequota_helper.rb
 - lib/one_helper/onesecgroup_helper.rb
 - lib/one_helper/onetemplate_helper.rb
@@ -101,11 +106,6 @@ files:
 - 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/oneflow_helper.rb
-- lib/one_helper/oneflowtemplate_helper.rb
-- lib/one_helper/onehost_helper.rb
-- lib/one_helper/oneprovision_helper.rb
 - NOTICE
 - LICENSE
 homepage: http://opennebula.io