From daed8de253377cbf1a4ebd5b044de279e54be74c Mon Sep 17 00:00:00 2001 From: geemus Date: Tue, 10 May 2011 13:58:22 -0700 Subject: [PATCH] [stormondemand|compute] cleanup --- lib/fog/compute.rb | 2 +- .../balancer.rb | 0 .../balancers.rb | 2 +- .../config.rb | 0 .../configs.rb | 2 +- .../image.rb | 0 .../images.rb | 2 +- .../private_ip.rb | 0 .../private_ips.rb | 2 +- .../server.rb | 0 .../servers.rb | 2 +- .../stat.rb | 0 .../stats.rb | 2 +- .../template.rb | 0 .../templates.rb | 2 +- .../models/stormondemand/create_server.rb | 19 ------------------ .../add_balancer_node.rb | 0 .../clone_server.rb | 0 .../create_server.rb | 0 .../delete_server.rb | 0 .../get_server.rb | 0 .../get_stats.rb | 0 .../list_balancers.rb | 0 .../list_configs.rb | 0 .../list_images.rb | 0 .../list_private_ips.rb | 0 .../list_servers.rb | 0 .../list_templates.rb | 0 .../reboot_server.rb | 0 .../remove_balancer_node.rb | 0 .../resize_server.rb | 0 .../{stormondemand.rb => storm_on_demand.rb} | 20 +++++++++---------- lib/fog/providers.rb | 2 +- .../{stormondemand.rb => storm_on_demand.rb} | 2 +- 34 files changed, 20 insertions(+), 39 deletions(-) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/balancer.rb (100%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/balancers.rb (85%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/config.rb (100%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/configs.rb (85%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/image.rb (100%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/images.rb (85%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/private_ip.rb (100%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/private_ips.rb (91%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/server.rb (100%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/servers.rb (89%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/stat.rb (100%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/stats.rb (87%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/template.rb (100%) rename lib/fog/compute/models/{stormondemand => storm_on_demand}/templates.rb (85%) delete mode 100644 lib/fog/compute/models/stormondemand/create_server.rb rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/add_balancer_node.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/clone_server.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/create_server.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/delete_server.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/get_server.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/get_stats.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/list_balancers.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/list_configs.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/list_images.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/list_private_ips.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/list_servers.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/list_templates.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/reboot_server.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/remove_balancer_node.rb (100%) rename lib/fog/compute/requests/{stormondemand => storm_on_demand}/resize_server.rb (100%) rename lib/fog/compute/{stormondemand.rb => storm_on_demand.rb} (80%) rename lib/fog/providers/{stormondemand.rb => storm_on_demand.rb} (65%) diff --git a/lib/fog/compute.rb b/lib/fog/compute.rb index 7b6c1f050..3863aadec 100644 --- a/lib/fog/compute.rb +++ b/lib/fog/compute.rb @@ -32,7 +32,7 @@ module Fog require 'fog/compute/slicehost' Fog::Slicehost::Compute.new(attributes) when 'StormOnDemand' - require 'fog/compute/stormondemand' + require 'fog/compute/storm_on_demand' Fog::StormOnDemand::Compute.new(attributes) when 'VirtualBox' require 'fog/compute/virtual_box' diff --git a/lib/fog/compute/models/stormondemand/balancer.rb b/lib/fog/compute/models/storm_on_demand/balancer.rb similarity index 100% rename from lib/fog/compute/models/stormondemand/balancer.rb rename to lib/fog/compute/models/storm_on_demand/balancer.rb diff --git a/lib/fog/compute/models/stormondemand/balancers.rb b/lib/fog/compute/models/storm_on_demand/balancers.rb similarity index 85% rename from lib/fog/compute/models/stormondemand/balancers.rb rename to lib/fog/compute/models/storm_on_demand/balancers.rb index 8215df38b..0e81dfd7b 100644 --- a/lib/fog/compute/models/stormondemand/balancers.rb +++ b/lib/fog/compute/models/storm_on_demand/balancers.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/stormondemand/balancer' +require 'fog/compute/models/storm_on_demand/balancer' module Fog module StormOnDemand diff --git a/lib/fog/compute/models/stormondemand/config.rb b/lib/fog/compute/models/storm_on_demand/config.rb similarity index 100% rename from lib/fog/compute/models/stormondemand/config.rb rename to lib/fog/compute/models/storm_on_demand/config.rb diff --git a/lib/fog/compute/models/stormondemand/configs.rb b/lib/fog/compute/models/storm_on_demand/configs.rb similarity index 85% rename from lib/fog/compute/models/stormondemand/configs.rb rename to lib/fog/compute/models/storm_on_demand/configs.rb index 7db82d5a3..e97ed20ce 100644 --- a/lib/fog/compute/models/stormondemand/configs.rb +++ b/lib/fog/compute/models/storm_on_demand/configs.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/stormondemand/config' +require 'fog/compute/models/storm_on_demand/config' module Fog module StormOnDemand diff --git a/lib/fog/compute/models/stormondemand/image.rb b/lib/fog/compute/models/storm_on_demand/image.rb similarity index 100% rename from lib/fog/compute/models/stormondemand/image.rb rename to lib/fog/compute/models/storm_on_demand/image.rb diff --git a/lib/fog/compute/models/stormondemand/images.rb b/lib/fog/compute/models/storm_on_demand/images.rb similarity index 85% rename from lib/fog/compute/models/stormondemand/images.rb rename to lib/fog/compute/models/storm_on_demand/images.rb index 8863b4ad1..6e86d6ff4 100644 --- a/lib/fog/compute/models/stormondemand/images.rb +++ b/lib/fog/compute/models/storm_on_demand/images.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/stormondemand/image' +require 'fog/compute/models/storm_on_demand/image' module Fog module StormOnDemand diff --git a/lib/fog/compute/models/stormondemand/private_ip.rb b/lib/fog/compute/models/storm_on_demand/private_ip.rb similarity index 100% rename from lib/fog/compute/models/stormondemand/private_ip.rb rename to lib/fog/compute/models/storm_on_demand/private_ip.rb diff --git a/lib/fog/compute/models/stormondemand/private_ips.rb b/lib/fog/compute/models/storm_on_demand/private_ips.rb similarity index 91% rename from lib/fog/compute/models/stormondemand/private_ips.rb rename to lib/fog/compute/models/storm_on_demand/private_ips.rb index 1443b2360..eac78f5b4 100644 --- a/lib/fog/compute/models/stormondemand/private_ips.rb +++ b/lib/fog/compute/models/storm_on_demand/private_ips.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/stormondemand/private_ip' +require 'fog/compute/models/storm_on_demand/private_ip' module Fog module StormOnDemand diff --git a/lib/fog/compute/models/stormondemand/server.rb b/lib/fog/compute/models/storm_on_demand/server.rb similarity index 100% rename from lib/fog/compute/models/stormondemand/server.rb rename to lib/fog/compute/models/storm_on_demand/server.rb diff --git a/lib/fog/compute/models/stormondemand/servers.rb b/lib/fog/compute/models/storm_on_demand/servers.rb similarity index 89% rename from lib/fog/compute/models/stormondemand/servers.rb rename to lib/fog/compute/models/storm_on_demand/servers.rb index befd8531a..3d7560e13 100644 --- a/lib/fog/compute/models/stormondemand/servers.rb +++ b/lib/fog/compute/models/storm_on_demand/servers.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/stormondemand/server' +require 'fog/compute/models/storm_on_demand/server' module Fog module StormOnDemand diff --git a/lib/fog/compute/models/stormondemand/stat.rb b/lib/fog/compute/models/storm_on_demand/stat.rb similarity index 100% rename from lib/fog/compute/models/stormondemand/stat.rb rename to lib/fog/compute/models/storm_on_demand/stat.rb diff --git a/lib/fog/compute/models/stormondemand/stats.rb b/lib/fog/compute/models/storm_on_demand/stats.rb similarity index 87% rename from lib/fog/compute/models/stormondemand/stats.rb rename to lib/fog/compute/models/storm_on_demand/stats.rb index d5761bc5e..a8e9fdbb2 100644 --- a/lib/fog/compute/models/stormondemand/stats.rb +++ b/lib/fog/compute/models/storm_on_demand/stats.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/stormondemand/stat' +require 'fog/compute/models/storm_on_demand/stat' module Fog module StormOnDemand diff --git a/lib/fog/compute/models/stormondemand/template.rb b/lib/fog/compute/models/storm_on_demand/template.rb similarity index 100% rename from lib/fog/compute/models/stormondemand/template.rb rename to lib/fog/compute/models/storm_on_demand/template.rb diff --git a/lib/fog/compute/models/stormondemand/templates.rb b/lib/fog/compute/models/storm_on_demand/templates.rb similarity index 85% rename from lib/fog/compute/models/stormondemand/templates.rb rename to lib/fog/compute/models/storm_on_demand/templates.rb index 5f62af94e..eea9a0c78 100644 --- a/lib/fog/compute/models/stormondemand/templates.rb +++ b/lib/fog/compute/models/storm_on_demand/templates.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/stormondemand/template' +require 'fog/compute/models/storm_on_demand/template' module Fog module StormOnDemand diff --git a/lib/fog/compute/models/stormondemand/create_server.rb b/lib/fog/compute/models/stormondemand/create_server.rb deleted file mode 100644 index 50c0a8fa2..000000000 --- a/lib/fog/compute/models/stormondemand/create_server.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module StormOnDemand - class Compute - class Real - - def create_server(options = {}) - request( - :expects => [200], - :method => 'GET', - :path => "/storm/server/create", - :headers => {"Content-Type" => "application/json"}, - :body => {:params => options}.to_json - ) - end - - end - end - end -end \ No newline at end of file diff --git a/lib/fog/compute/requests/stormondemand/add_balancer_node.rb b/lib/fog/compute/requests/storm_on_demand/add_balancer_node.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/add_balancer_node.rb rename to lib/fog/compute/requests/storm_on_demand/add_balancer_node.rb diff --git a/lib/fog/compute/requests/stormondemand/clone_server.rb b/lib/fog/compute/requests/storm_on_demand/clone_server.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/clone_server.rb rename to lib/fog/compute/requests/storm_on_demand/clone_server.rb diff --git a/lib/fog/compute/requests/stormondemand/create_server.rb b/lib/fog/compute/requests/storm_on_demand/create_server.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/create_server.rb rename to lib/fog/compute/requests/storm_on_demand/create_server.rb diff --git a/lib/fog/compute/requests/stormondemand/delete_server.rb b/lib/fog/compute/requests/storm_on_demand/delete_server.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/delete_server.rb rename to lib/fog/compute/requests/storm_on_demand/delete_server.rb diff --git a/lib/fog/compute/requests/stormondemand/get_server.rb b/lib/fog/compute/requests/storm_on_demand/get_server.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/get_server.rb rename to lib/fog/compute/requests/storm_on_demand/get_server.rb diff --git a/lib/fog/compute/requests/stormondemand/get_stats.rb b/lib/fog/compute/requests/storm_on_demand/get_stats.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/get_stats.rb rename to lib/fog/compute/requests/storm_on_demand/get_stats.rb diff --git a/lib/fog/compute/requests/stormondemand/list_balancers.rb b/lib/fog/compute/requests/storm_on_demand/list_balancers.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/list_balancers.rb rename to lib/fog/compute/requests/storm_on_demand/list_balancers.rb diff --git a/lib/fog/compute/requests/stormondemand/list_configs.rb b/lib/fog/compute/requests/storm_on_demand/list_configs.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/list_configs.rb rename to lib/fog/compute/requests/storm_on_demand/list_configs.rb diff --git a/lib/fog/compute/requests/stormondemand/list_images.rb b/lib/fog/compute/requests/storm_on_demand/list_images.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/list_images.rb rename to lib/fog/compute/requests/storm_on_demand/list_images.rb diff --git a/lib/fog/compute/requests/stormondemand/list_private_ips.rb b/lib/fog/compute/requests/storm_on_demand/list_private_ips.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/list_private_ips.rb rename to lib/fog/compute/requests/storm_on_demand/list_private_ips.rb diff --git a/lib/fog/compute/requests/stormondemand/list_servers.rb b/lib/fog/compute/requests/storm_on_demand/list_servers.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/list_servers.rb rename to lib/fog/compute/requests/storm_on_demand/list_servers.rb diff --git a/lib/fog/compute/requests/stormondemand/list_templates.rb b/lib/fog/compute/requests/storm_on_demand/list_templates.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/list_templates.rb rename to lib/fog/compute/requests/storm_on_demand/list_templates.rb diff --git a/lib/fog/compute/requests/stormondemand/reboot_server.rb b/lib/fog/compute/requests/storm_on_demand/reboot_server.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/reboot_server.rb rename to lib/fog/compute/requests/storm_on_demand/reboot_server.rb diff --git a/lib/fog/compute/requests/stormondemand/remove_balancer_node.rb b/lib/fog/compute/requests/storm_on_demand/remove_balancer_node.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/remove_balancer_node.rb rename to lib/fog/compute/requests/storm_on_demand/remove_balancer_node.rb diff --git a/lib/fog/compute/requests/stormondemand/resize_server.rb b/lib/fog/compute/requests/storm_on_demand/resize_server.rb similarity index 100% rename from lib/fog/compute/requests/stormondemand/resize_server.rb rename to lib/fog/compute/requests/storm_on_demand/resize_server.rb diff --git a/lib/fog/compute/stormondemand.rb b/lib/fog/compute/storm_on_demand.rb similarity index 80% rename from lib/fog/compute/stormondemand.rb rename to lib/fog/compute/storm_on_demand.rb index a107985b9..aba80cdad 100644 --- a/lib/fog/compute/stormondemand.rb +++ b/lib/fog/compute/storm_on_demand.rb @@ -4,11 +4,11 @@ module Fog API_URL = 'https://api.stormondemand.com' - requires :stormondemand_username, :stormondemand_password - recognizes :stormondemand_auth_url + requires :storm_on_demand_username, :storm_on_demand_password + recognizes :storm_on_demand_auth_url recognizes :provider # remove post deprecation - model_path 'fog/compute/models/stormondemand' + model_path 'fog/compute/models/storm_on_demand' model :config collection :configs model :image @@ -24,7 +24,7 @@ module Fog model :template collection :templates - request_path 'fog/compute/requests/stormondemand' + request_path 'fog/compute/requests/storm_on_demand' request :clone_server request :delete_server request :reboot_server @@ -63,8 +63,8 @@ module Fog end def initialize(options={}) - @stormondemand_username = options[:stormondemand_username] - @data = self.class.data[@stormondemand_username] + @storm_on_demand_username = options[:storm_on_demand_username] + @data = self.class.data[@storm_on_demand_username] end end @@ -73,13 +73,13 @@ module Fog def initialize(options={}) require 'json' - uri = URI.parse(options[:stormondemand_auth_url] ||= API_URL) + uri = URI.parse(options[:storm_on_demand_auth_url] ||= API_URL) @host = uri.host @path = uri.path @port = uri.port @scheme = uri.scheme - @stormondemand_username = options[:stormondemand_username] - @stormondemand_password = options[:stormondemand_password] + @storm_on_demand_username = options[:storm_on_demand_username] + @storm_on_demand_password = options[:storm_on_demand_password] @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}") end @@ -92,7 +92,7 @@ module Fog response = @connection.request(params.merge!({ :headers => { 'Content-Type' => 'application/json', - 'Authorization' => "Basic " + Base64.encode64("#{@stormondemand_username}:#{@stormondemand_password}").chomp + 'Authorization' => 'Basic ' << Base64.encode64("#{@storm_on_demand_username}:#{@storm_on_demand_password}").chomp }.merge!(params[:headers] || {}), :host => @host, :path => "#{@path}/#{params[:path]}", diff --git a/lib/fog/providers.rb b/lib/fog/providers.rb index 6c98ea369..cfb564a44 100644 --- a/lib/fog/providers.rb +++ b/lib/fog/providers.rb @@ -18,7 +18,7 @@ require 'fog/providers/local' require 'fog/providers/new_servers' require 'fog/providers/rackspace' require 'fog/providers/slicehost' -require 'fog/providers/stormondemand' +require 'fog/providers/storm_on_demand' require 'fog/providers/virtual_box' require 'fog/providers/voxel' require 'fog/providers/zerigo' diff --git a/lib/fog/providers/stormondemand.rb b/lib/fog/providers/storm_on_demand.rb similarity index 65% rename from lib/fog/providers/stormondemand.rb rename to lib/fog/providers/storm_on_demand.rb index 54867ca8f..e6d9706f8 100644 --- a/lib/fog/providers/stormondemand.rb +++ b/lib/fog/providers/storm_on_demand.rb @@ -5,7 +5,7 @@ module Fog extend Fog::Provider - service(:compute, 'compute/stormondemand') + service(:compute, 'compute/storm_on_demand') end end