From 4d462de8da89f255c6d91f3a38d5be9d161b6c0c Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Wed, 13 Jul 2022 12:13:32 -0500 Subject: [PATCH] B OpenNebula/one#5912: Fix CLI auth params (#2232) being bypassed on oneflow-template (cherry picked from commit acc1647bd226a963867482f35b2385b676de908b) (cherry picked from commit 46fcb89634aa9ac88d24545c6777bc663611647b) --- src/cli/oneflow-template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cli/oneflow-template b/src/cli/oneflow-template index 8cb342c8a1..c2832e45e1 100755 --- a/src/cli/oneflow-template +++ b/src/cli/oneflow-template @@ -202,10 +202,7 @@ CommandParser::CmdParser.new(ARGV) do Instantiate a Service Template EOT - command :instantiate, - instantiate_desc, - :templateid, - [:file, nil], + command :instantiate, instantiate_desc, :templateid, [:file, nil], :options => [MULTIPLE, Service::JSON_FORMAT, Service::TOP] do number = options[:multiple] || 1 params = {} @@ -216,9 +213,12 @@ CommandParser::CmdParser.new(ARGV) do params['merge_template'] = JSON.parse(File.read(args[1])) if args[1] unless params['merge_template'] - service_template = OpenNebula::ServiceTemplate - .new_with_id(args[0], - OpenNebula::Client.new) + secret = "#{options[:username]}:#{options[:password]}" + one_client = OpenNebula::Client.new(secret) + + service_template = OpenNebula::ServiceTemplate.new_with_id( + args[0], one_client + ) service_template.info body = JSON.parse(service_template['/DOCUMENT/TEMPLATE/BODY'])