puppetlabs/vmfloaty
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmfloaty.git synced 2026-01-25 21:28:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP (DIO-911) Include job_id in ABS --json output

Browse source 
Prior to this commit, when using --service=abs and --json the job_id
value is not included in the JSON blob, which makes it difficult for
calling code to grab both the job_id and the hosts without text
processing the log messages printed to standard error.
This commit is contained in:
Nate Wolfe 2020-08-24 14:20:28 -07:00
parent 9a44cc480e
commit cb1ea8247b
No known key found for this signature in database
GPG key ID: B2DE44E5E14C0F96
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/vmfloaty/abs.rb
View file

@ -233,7 +233,7 @@ class ABS
(1..retries).each do |i| (1..retries).each do |i|
queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose) queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose)
return translated(res_body) if res_body return translated(res_body, saved_job_id) if res_body
sleep_seconds = 10 if i >= 10 sleep_seconds = 10 if i >= 10
sleep_seconds = i if i < 10 sleep_seconds = i if i < 10
@ -247,8 +247,8 @@ class ABS
# #
# We should fix the ABS API to be more like the vmpooler or nspooler api, but for now # We should fix the ABS API to be more like the vmpooler or nspooler api, but for now
# #
def self.translated(res_body) def self.translated(res_body, job_id)
vmpooler_formatted_body = {} vmpooler_formatted_body = {'job_id' => job_id}
res_body.each do |host| res_body.each do |host|
if vmpooler_formatted_body[host['type']] && vmpooler_formatted_body[host['type']]['hostname'].class == Array if vmpooler_formatted_body[host['type']] && vmpooler_formatted_body[host['type']]['hostname'].class == Array

7
lib/vmfloaty/utils.rb
View file

@ -45,6 +45,10 @@ class Utils
result = {} result = {}
# ABS has a job_id associated with hosts so pass that along
abs_job_id = response_body.delete('job_id')
result['job_id'] = abs_job_id unless abs_job_id.nil?
filtered_response_body = response_body.reject { |key, _| key == 'request_id' || key == 'ready' } filtered_response_body = response_body.reject { |key, _| key == 'request_id' || key == 'ready' }
filtered_response_body.each do |os, value| filtered_response_body.each do |os, value|
hostnames = Array(value['hostname']) hostnames = Array(value['hostname'])
@ -57,7 +61,8 @@ class Utils
def self.format_host_output(hosts) def self.format_host_output(hosts)
hosts.flat_map do |os, names| hosts.flat_map do |os, names|
names.map { |name| "- #{name} (#{os})" } # Assume hosts are stored in Arrays and ignore everything else
names.map { |name| "- #{name} (#{os})" } if names.is_a? Array
end.join("\n") end.join("\n")
end end