opennebula-cli 5.12.6 → 5.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 970c8210c6b4b094cd3ca4e6eccc3257ba0b0a82
-  data.tar.gz: c0bfee71d70b958b2a8d3b6713219c10e3609b34
+  metadata.gz: 6e29fa3ced9904d772fa21dce326f36ba53f5b5b
+  data.tar.gz: 4423b75aac339b713828c7eaf63b85b7af6a911f
 SHA512:
-  metadata.gz: 68238d2eb49e42709bcc7685767a4a4ccadcb474619fc86307e44813953cc1c16d684a0aec2949dc1473c6a569e7e8ec8a3984f406a5b960234f81f9e1798d6d
-  data.tar.gz: 5d4ea71d6673a794e97ab39f14f5d78dfc4c55792ae55e0452cd6284c776c3f6789066d3281e631ea3bcc1c850c316519573f18173dde926d4f39b1e80ff4fba
+  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/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/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.6
+  version: 5.12.7
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-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.6
+        version: 5.12.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.12.6
+        version: 5.12.7
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables:
@@ -88,7 +88,6 @@ files:
 - lib/one_helper/onemarket_helper.rb
 - lib/one_helper/onequota_helper.rb
 - lib/one_helper/onesecgroup_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
@@ -104,6 +103,7 @@ files:
 - 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