shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

B 5912: Fix oneflow-template auth params (#2240)

Browse Source
This commit is contained in:
Pavel Czerný 2022-07-22 09:33:06 +02:00 committed by GitHub
parent 543e11b744
commit 94fc17c36a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cli/oneflow-template
View File

@ -239,21 +239,21 @@ CommandParser::CmdParser.new(ARGV) do
number = options[:multiple] || 1
params = {}
rc = 0
client = helper.client(options)
number.times do
params['merge_template'] = nil
params['merge_template'] = JSON.parse(File.read(args[1])) if args[1]
unless params['merge_template']
secret = "#{options[:username]}:#{options[:password]}"
one_client = OpenNebula::Client.new(secret)
response = client.get("#{RESOURCE_PATH}/#{args[0]}")
service_template = OpenNebula::ServiceTemplate.new_with_id(
args[0], one_client
)
service_template.info
if CloudClient.is_error?(response)
rc = [response.code.to_i, response.to_s]
break
end
body = JSON.parse(service_template['/DOCUMENT/TEMPLATE/BODY'])
body = JSON.parse(response.body)['DOCUMENT']['TEMPLATE']['BODY']
params['merge_template'] = helper.custom_attrs(
body['custom_attrs']
@ -266,7 +266,6 @@ CommandParser::CmdParser.new(ARGV) do
end
json = Service.build_json_action('instantiate', params)
client = helper.client(options)
response = client.post("#{RESOURCE_PATH}/#{args[0]}/action", json)
if CloudClient.is_error?(response)