vmpooler 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74df51cf1d525f0bc7afe2da930e68d0b2e1e014e10d184213556e4a13bd170b
-  data.tar.gz: 7cfe6d26ebb99e421f2b9daeabe1dfcb610cc8457cae1f79c5632df33eb6d426
+  metadata.gz: 3a97df538d5070e9eb9854084473c50efdd3b18427dc6909e6bfadaeea0f329e
+  data.tar.gz: 930c7c450fcee1429d18a8b72a48cd9c199d659bdb430a5ef5933eb6911cc1ca
 SHA512:
-  metadata.gz: d4e00e1cf43c08652b6186a741f048a487c1300744a2a40912759bdf06a2ad306fd59ae9adb10364be191047edc4cc84d8ea99fbf211806d59228b0993e61d0f
-  data.tar.gz: 4948f3405e5969bcd55b350604d1a2b8bfa9270960b635c4448a9478764f79bef1b2af101e11a3389587cdc2bd0fb22f28c1b7d1582227414aa42764d8451a74
+  metadata.gz: a9706740f3aca1a51fecc17550a1d75275849148c658622ca05f9f177dd1bfd8e84ba681701c9074215057e65854026395e765d5b346305772f572a4f6bf6a9e
+  data.tar.gz: e1e8f8687342676d40d75c5771b62a28b8f865208882d8ae0d7f0548f218cc6134cce5e53190c46197d56892eda687e1798a5e7c91f35b27510fa84bd9eb1f68

data/lib/vmpooler/api/v1.rb

@@ -986,7 +986,12 @@ module Vmpooler
         result['ready'] = true
         Parsing.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 }
+
+          if result.key?(platform_alias)
+            result[platform_alias][:hostname] = result[platform_alias][:hostname] + instances
+          else
+            result[platform_alias] = { 'hostname': instances }
+          end
         end
         result['domain'] = config['domain'] if config['domain']
         status 200
@@ -999,10 +1004,17 @@ module Vmpooler
       else
         Parsing.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
-          }
+          instances_pending = count.to_i - instance_count.to_i
+
+          if result.key?(platform_alias) && result[platform_alias].key?(:ready)
+            result[platform_alias][:ready] = (result[platform_alias][:ready].to_i + instance_count).to_s
+            result[platform_alias][:pending] = (result[platform_alias][:pending].to_i + instances_pending).to_s
+          else
+            result[platform_alias] = {
+              'ready': instance_count.to_s,
+              'pending': instances_pending.to_s
+            }
+          end
         end
       end
 

data/lib/vmpooler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vmpooler
-  VERSION = '0.14.0'
+  VERSION = '0.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup