Use new queues in API

This commit is contained in:
Scott Schneider 2013-10-01 16:57:39 -07:00
parent 882fc36521
commit bd8a778f8f

View file

@ -6,21 +6,27 @@ require 'redis'
require 'sinatra' require 'sinatra'
require 'yaml' require 'yaml'
require File.expand_path( File.dirname( __FILE__ ), 'lib/vsphere_helper.rb' ) $:.unshift(File.dirname(__FILE__))
require 'lib/logger'
require 'lib/require_relative'
require 'lib/vsphere_helper'
logger = Logger.new
vsphere_helper = VsphereHelper.new vsphere_helper = VsphereHelper.new
# Load the pool configuration Dir.chdir(File.dirname(__FILE__))
pools = YAML.load_file('vmware-host-pooler.yaml')[:pools]
# Load fog credentials # Load the configuration file
fog_file = File.expand_path("~/.fog") config_file = File.expand_path('vmware-host-pooler.yaml')
fog_data = YAML.load_file(fog_file)[:default]
pools = YAML.load_file(config_file)[:pools]
vsphere = YAML.load_file(config_file)[:vsphere]
# Connect to vSphere # Connect to vSphere
$vim = RbVmomi::VIM.connect( $vim = RbVmomi::VIM.connect(
:host => fog_data[:vsphere_server], :host => vsphere['server'],
:user => fog_data[:vsphere_username], :user => vsphere['username'],
:password => fog_data[:vsphere_password], :password => vsphere['password'],
:ssl => true, :ssl => true,
:insecure => true, :insecure => true,
:rev => '5.1' :rev => '5.1'
@ -35,7 +41,7 @@ get '/vm/:template' do
result = {} result = {}
result[params[:template]] = {} result[params[:template]] = {}
result[params[:template]]['hosts'] = $redis.smembers('vmware_host_pool-'+params[:template]) result[params[:template]]['hosts'] = $redis.smembers('vmware_host_pool__ready__'+params[:template])
result.to_json result.to_json
end end
@ -49,8 +55,11 @@ post '/vm/:template' do
if ( ( ! params[:folder] ) or ( ! params[:pool] )) if ( ( ! params[:folder] ) or ( ! params[:pool] ))
result[params[:template]]['error'] = 'You must specify a destination \'folder\' and \'pool\'' result[params[:template]]['error'] = 'You must specify a destination \'folder\' and \'pool\''
else else
vm = $redis.srandmember('vmware_host_pool-'+params[:template]) vm = $redis.srandmember('vmware_host_pool__ready__'+params[:template])
$redis.srem('vmware_host_pool-'+params[:template], vm) $redis.srem('vmware_host_pool__ready__'+params[:template], vm)
$redis.sadd('vmware_host_pool__running__'+params[:template], vm)
logger.log('s', "[<] '#{vm}' moved to 'running' queue")
datacenter = $vim.serviceInstance.find_datacenter datacenter = $vim.serviceInstance.find_datacenter
base = datacenter.hostFolder base = datacenter.hostFolder