From 29ef4eaaefa0e64b8c40834df0459b4d032de886 Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Fri, 13 Nov 2020 12:12:37 +0100 Subject: [PATCH] B #5170: fix user inputs in CLI instantiate (#415) --- src/cli/one_helper.rb | 17 ++++++++++------- src/cli/one_helper/onetemplate_helper.rb | 7 ++++--- src/cli/onetemplate | 7 +++++-- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index e5b4db3c4e..b73ffe7105 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -402,9 +402,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 @@ -2066,8 +2072,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 <> to launch an editor ' \ '(e.g. for multi-line inputs)' @@ -2076,6 +2082,8 @@ EOT answers = {} inputs.each do |key, val| + next if keys.include? key + input_cfg = val.split('|', -1) if input_cfg.length < 3 @@ -2102,11 +2110,6 @@ EOT initial.strip! end - if get_defaults - answers[key]= initial unless mandatory == 'M' - next - end - puts " * (#{key}) #{description}" header = ' ' diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index 670e0bad51..2437eb0355 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -139,15 +139,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] diff --git a/src/cli/onetemplate b/src/cli/onetemplate index 687cbee54b..33a8e33f06 100755 --- a/src/cli/onetemplate +++ b/src/cli/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