From 314a2cb659a6fc59e5bcf892b1814084e7d27ad1 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Thu, 6 Feb 2014 09:24:51 -0800 Subject: [PATCH] Removing unnecessary 'folder' and 'pool' params --- vmware-host-pooler-api | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/vmware-host-pooler-api b/vmware-host-pooler-api index 24cd89c..f185cab 100755 --- a/vmware-host-pooler-api +++ b/vmware-host-pooler-api @@ -142,24 +142,20 @@ post '/vm/:template' do result = {} result[params[:template]] = {} - if ( ( ! params[:folder] ) or ( ! params[:pool] )) - result[params[:template]]['error'] = 'You must specify a destination \'folder\' and \'pool\'' - else - if ( $redis.scard('vmware_host_pool__ready__'+params[:template]) > 0 ) - vm = $redis.spop('vmware_host_pool__ready__'+params[:template]) + if ( $redis.scard('vmware_host_pool__ready__'+params[:template]) > 0 ) + vm = $redis.spop('vmware_host_pool__ready__'+params[:template]) - unless (vm.nil?) - $redis.sadd('vmware_host_pool__running__'+params[:template], vm) - $redis.hset('vmware_host_pool__active__'+params[:template], vm, Time.now) + unless (vm.nil?) + $redis.sadd('vmware_host_pool__running__'+params[:template], vm) + $redis.hset('vmware_host_pool__active__'+params[:template], vm, Time.now) - result[params[:template]]['ok'] = true - result[params[:template]]['hostname'] = vm - else - result[params[:template]]['ok'] = false - end + result[params[:template]]['ok'] = true + result[params[:template]]['hostname'] = vm else result[params[:template]]['ok'] = false end + else + result[params[:template]]['ok'] = false end JSON.pretty_generate(result)