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

when missing, adds the api/v2 to the url endpoint

Browse source
This commit is contained in:
Samuel Beaulieu 2020-10-16 13:14:57 -05:00
parent 6d1130bc8b
commit 846cc7050c
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/vmfloaty/abs.rb
View file

@ -64,7 +64,7 @@ class ABS
end end
def self.get_active_requests(verbose, url, user) def self.get_active_requests(verbose, url, user)
conn = Http.get_conn(verbose, url) conn = Http.get_conn(verbose, supported_abs_url(url))
res = conn.get 'status/queue' res = conn.get 'status/queue'
if valid_json?(res.body) if valid_json?(res.body)
requests = JSON.parse(res.body) requests = JSON.parse(res.body)
@ -105,7 +105,7 @@ class ABS
def self.delete(verbose, url, hosts, token, user) def self.delete(verbose, url, hosts, token, user)
# In ABS terms, this is a "returned" host. # In ABS terms, this is a "returned" host.
conn = Http.get_conn(verbose, url) conn = Http.get_conn(verbose, supported_abs_url(url))
conn.headers['X-AUTH-TOKEN'] = token if token conn.headers['X-AUTH-TOKEN'] = token if token
FloatyLogger.info "Trying to delete hosts #{hosts}" if verbose FloatyLogger.info "Trying to delete hosts #{hosts}" if verbose
@ -163,7 +163,7 @@ class ABS
# List available VMs in ABS # List available VMs in ABS
def self.list(verbose, url, os_filter = nil) def self.list(verbose, url, os_filter = nil)
conn = Http.get_conn(verbose, url) conn = Http.get_conn(verbose, supported_abs_url(url))
os_list = [] os_list = []
@ -245,7 +245,7 @@ class ABS
# } # }
# } # }
conn = Http.get_conn(verbose, url) conn = Http.get_conn(verbose, supported_abs_url(url))
conn.headers['X-AUTH-TOKEN'] = token if token conn.headers['X-AUTH-TOKEN'] = token if token
saved_job_id = user + "-" + DateTime.now.strftime('%Q') saved_job_id = user + "-" + DateTime.now.strftime('%Q')
@ -348,7 +348,7 @@ class ABS
end end
def self.status(verbose, url) def self.status(verbose, url)
conn = Http.get_conn(verbose, url) conn = Http.get_conn(verbose, supported_abs_url(url))
res = conn.get 'status' res = conn.get 'status'
@ -366,7 +366,7 @@ class ABS
return @active_hostnames if @active_hostnames && !@active_hostnames.empty? return @active_hostnames if @active_hostnames && !@active_hostnames.empty?
# If using the cli query job_id # If using the cli query job_id
conn = Http.get_conn(verbose, url) conn = Http.get_conn(verbose, supported_abs_url(url))
queue_info_res = conn.get "status/queue/info/#{job_id}" queue_info_res = conn.get "status/queue/info/#{job_id}"
if valid_json?(queue_info_res.body) if valid_json?(queue_info_res.body)
queue_info = JSON.parse(queue_info_res.body) queue_info = JSON.parse(queue_info_res.body)
@ -411,4 +411,15 @@ class ABS
rescue TypeError, JSON::ParserError => e rescue TypeError, JSON::ParserError => e
return false return false
end end
# when missing, adds the required api/v2 in the url
def self.supported_abs_url(url)
expected_ending = "api/v2"
if !url.include?(expected_ending)
# add a slash if missing
expected_ending = "/#{expected_ending}" if url[-1] != "/"
url = "#{url}#{expected_ending}"
end
url
end
end end