From 1397ff93c17bd3bedfe2fbb7a62040d90319aef1 Mon Sep 17 00:00:00 2001
From: Scott Schneider <sschneider@puppetlabs.com>
Date: Wed, 4 Mar 2015 09:49:16 -0800
Subject: [PATCH] Move capacity metric-gathering to 'get_capacity_metrics'
 helper

---
 lib/vmpooler/api/v1.rb | 45 +++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb
index 5ccc446..989a1e1 100644
--- a/lib/vmpooler/api/v1.rb
+++ b/lib/vmpooler/api/v1.rb
@@ -5,6 +5,27 @@ module Vmpooler
     api_prefix  = "/api/v#{api_version}"
 
     helpers do
+      def get_capacity_metrics()
+        capacity = {
+          current: 0,
+          total: 0,
+          percent: 0
+        }
+
+        $config[:pools].each do |pool|
+          pool['capacity'] = $redis.scard('vmpooler__ready__' + pool['name']).to_i
+
+          capacity[:current] += pool['capacity']
+          capacity[:total] += pool['size'].to_i
+        end
+
+        if capacity[:total] > 0
+          capacity[:percent] = ((capacity[:current].to_f / capacity[:total].to_f) * 100.0).round(1)
+        end
+
+        capacity
+      end
+
       def get_clone_times(date)
         $redis.hvals('vmpooler__clone__' + date.to_s).map(&:to_f)
       end
@@ -61,11 +82,6 @@ module Vmpooler
           ok: true,
           message: 'Battle station fully armed and operational.'
         },
-        capacity: {
-          current: 0,
-          total: 0,
-          percent: 0
-        },
         clone: {
           duration: {
             average: 0,
@@ -78,27 +94,20 @@ module Vmpooler
         }
       }
 
+      result[:capacity] = get_capacity_metrics()
       result[:queue] = get_queue_metrics()
 
+      # Check for empty pools
       $config[:pools].each do |pool|
-        pool['capacity'] = $redis.scard('vmpooler__ready__' + pool['name']).to_i
-
-        result[:capacity][:current] += pool['capacity']
-        result[:capacity][:total] += pool['size'].to_i
-
-        if (pool['capacity'] == 0)
+        if $redis.scard('vmpooler__ready__' + pool['name']).to_i == 0
           result[:status][:empty] ||= []
           result[:status][:empty].push(pool['name'])
+
+          result[:status][:ok] = false
+          result[:status][:message] = "Found #{result[:status][:empty].length} empty pools."
         end
       end
 
-      if result[:status][:empty]
-        result[:status][:ok] = false
-        result[:status][:message] = "Found #{result[:status][:empty].length} empty pools."
-      end
-
-      result[:capacity][:percent] = ((result[:capacity][:current].to_f / result[:capacity][:total].to_f) * 100.0).round(1) if result[:capacity][:total] > 0
-
       result[:clone][:count][:total] = $redis.hlen('vmpooler__clone__' + Date.today.to_s).to_i
       if result[:clone][:count][:total] > 0
         clone_times = get_clone_times(Date.today)