From dce2a96b68a0141e482b6aa11046667a3dd26da3 Mon Sep 17 00:00:00 2001
From: Samuel Beaulieu <samuel@puppetlabs.com>
Date: Thu, 11 Jun 2020 10:24:37 -0500
Subject: [PATCH] (POOLER-174) Reduce duplicate of on demand code introduced in
 POOLER-158 refactored every parsing of request of type
 'pool_alias:pool:count' into a utility class, that is used by pool_manager
 and the api v1 class

---
 lib/vmpooler/api/v1.rb       | 25 +++++++++++--------------
 lib/vmpooler/pool_manager.rb |  9 +++------
 lib/vmpooler/util/parsing.rb | 13 +++++++++++++
 3 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 lib/vmpooler/util/parsing.rb

diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb
index 6168414..f1d05cc 100644
--- a/lib/vmpooler/api/v1.rb
+++ b/lib/vmpooler/api/v1.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'vmpooler/util/parsing'
+
 module Vmpooler
   class API
   class V1 < Sinatra::Base
@@ -974,11 +976,9 @@ module Vmpooler
 
       if request_hash['status'] == 'ready'
         result['ready'] = true
-        platform_parts = request_hash['requested'].split(',')
-        platform_parts.each do |platform|
-          pool_alias, pool, _count = platform.split(':')
-          instances = backend.smembers("vmpooler__#{request_id}__#{pool_alias}__#{pool}")
-          result[pool_alias] = { 'hostname': instances }
+        get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,_count|
+          instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
+          result[platform_alias] = { 'hostname': instances }
         end
         result['domain'] = config['domain'] if config['domain']
         status 200
@@ -989,11 +989,9 @@ module Vmpooler
         result['message'] = 'The request has been deleted'
         status 200
       else
-        platform_parts = request_hash['requested'].split(',')
-        platform_parts.each do |platform|
-          pool_alias, pool, count = platform.split(':')
-          instance_count = backend.scard("vmpooler__#{request_id}__#{pool_alias}__#{pool}")
-          result[pool_alias] = {
+        get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,count|
+          instance_count = backend.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
+          result[platform_alias] = {
             'ready': instance_count.to_s,
             'pending': (count.to_i - instance_count.to_i).to_s
           }
@@ -1017,12 +1015,11 @@ module Vmpooler
       else
         backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted')
 
-        platforms.split(',').each do |platform|
-          pool_alias, pool, _count = platform.split(':')
-          backend.smembers("vmpooler__#{request_id}__#{pool_alias}__#{pool}")&.each do |vm|
+        get_platform_pool_count(platforms) do |platform_alias,pool,_count|
+          backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")&.each do |vm|
             backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm)
           end
-          backend.del("vmpooler__#{request_id}__#{pool_alias}__#{pool}")
+          backend.del("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
         end
         backend.expire("vmpooler__odrequest__#{request_id}", 129_600_0)
       end
diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb
index b694e5b..8457c96 100644
--- a/lib/vmpooler/pool_manager.rb
+++ b/lib/vmpooler/pool_manager.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'vmpooler/providers'
+require 'vmpooler/util/parsing'
 require 'spicy-proton'
 require 'resolv' # ruby standard lib
 
@@ -1500,9 +1501,7 @@ module Vmpooler
     def vms_ready?(request_id, redis)
       catch :request_not_ready do
         request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}")
-        requested_platforms = request_hash['requested'].split(',')
-        requested_platforms.each do |platform|
-          platform_alias, pool, count = platform.split(':')
+        get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,count|
           pools_filled = redis.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
           throw :request_not_ready unless pools_filled.to_i == count.to_i
         end
@@ -1554,9 +1553,7 @@ module Vmpooler
 
     def remove_vms_for_failed_request(request_id, expiration_ttl, redis)
       request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}")
-      requested_platforms = request_hash['requested'].split(',')
-      requested_platforms.each do |platform|
-        platform_alias, pool, _count = platform.split(':')
+      get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,_count|
         pools_filled = redis.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
         redis.pipelined do
           pools_filled&.each do |vm|
diff --git a/lib/vmpooler/util/parsing.rb b/lib/vmpooler/util/parsing.rb
new file mode 100644
index 0000000..89ed9ca
--- /dev/null
+++ b/lib/vmpooler/util/parsing.rb
@@ -0,0 +1,13 @@
+# utility class shared between apps
+module Vmpooler
+  class Parsing
+    def get_platform_pool_count(requested, &block)
+      requested_platforms = requested.split(',')
+      requested_platforms.each do |platform|
+        platform_alias, pool, count = platform.split(':')
+        #raise ArgumentError if platform_alias.nil? || pool.nil? || count.nil?
+        yield platform_alias, pool, count
+      end
+    end
+  end
+end