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

fix rubocop offenses

Browse source
This commit is contained in:
Samuel Beaulieu 2020-06-11 11:57:12 -05:00
parent f59b87a7ff
commit d07960a463
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/vmpooler/api/v1.rb
View file

@ -5,7 +5,6 @@ require 'vmpooler/util/parsing'
module Vmpooler module Vmpooler
class API class API
class V1 < Sinatra::Base class V1 < Sinatra::Base
api_version = '1' api_version = '1'
api_prefix = "/api/v#{api_version}" api_prefix = "/api/v#{api_version}"
@ -339,6 +338,7 @@ module Vmpooler
def too_many_requested?(payload) def too_many_requested?(payload)
payload&.each do |poolname, count| payload&.each do |poolname, count|
next unless count.to_i > config['max_ondemand_instances_per_request'] next unless count.to_i > config['max_ondemand_instances_per_request']
metrics.increment('ondemandrequest.toomanyrequests.' + poolname) metrics.increment('ondemandrequest.toomanyrequests.' + poolname)
return true return true
end end
@ -979,7 +979,7 @@ module Vmpooler
if request_hash['status'] == 'ready' if request_hash['status'] == 'ready'
result['ready'] = true result['ready'] = true
Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,_count| Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count|
instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}") instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
result[platform_alias] = { 'hostname': instances } result[platform_alias] = { 'hostname': instances }
end end
@ -992,7 +992,7 @@ module Vmpooler
result['message'] = 'The request has been deleted' result['message'] = 'The request has been deleted'
status 200 status 200
else else
Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,count| Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, count|
instance_count = backend.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}") instance_count = backend.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
result[platform_alias] = { result[platform_alias] = {
'ready': instance_count.to_s, 'ready': instance_count.to_s,
@ -1018,7 +1018,7 @@ module Vmpooler
else else
backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted') backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted')
Parsing.get_platform_pool_count(platforms) do |platform_alias,pool,_count| Parsing.get_platform_pool_count(platforms) do |platform_alias, pool, _count|
backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")&.each do |vm| backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")&.each do |vm|
backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm) backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm)
end end

4
lib/vmpooler/pool_manager.rb
View file

@ -1501,7 +1501,7 @@ module Vmpooler
def vms_ready?(request_id, redis) def vms_ready?(request_id, redis)
catch :request_not_ready do catch :request_not_ready do
request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}") request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}")
Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,count| Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, count|
pools_filled = redis.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}") pools_filled = redis.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
throw :request_not_ready unless pools_filled.to_i == count.to_i throw :request_not_ready unless pools_filled.to_i == count.to_i
end end
@ -1553,7 +1553,7 @@ module Vmpooler
def remove_vms_for_failed_request(request_id, expiration_ttl, redis) def remove_vms_for_failed_request(request_id, expiration_ttl, redis)
request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}") request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}")
Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,_count| Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count|
pools_filled = redis.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}") pools_filled = redis.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
redis.pipelined do redis.pipelined do
pools_filled&.each do |vm| pools_filled&.each do |vm|

4
lib/vmpooler/util/parsing.rb
View file

@ -1,11 +1,13 @@
# frozen_string_literal: true
# utility class shared between apps # utility class shared between apps
module Vmpooler module Vmpooler
class Parsing class Parsing
def self.get_platform_pool_count(requested, &block) def self.get_platform_pool_count(requested, &_block)
requested_platforms = requested.split(',') requested_platforms = requested.split(',')
requested_platforms.each do |platform| requested_platforms.each do |platform|
platform_alias, pool, count = platform.split(':') platform_alias, pool, count = platform.split(':')
raise ArgumentError if platform_alias.nil? || pool.nil? || count.nil? raise ArgumentError if platform_alias.nil? || pool.nil? || count.nil?
yield platform_alias, pool, count yield platform_alias, pool, count
end end
end end