From 3a17ba22490c495cf5c8ddebf9d69b783e05e48f Mon Sep 17 00:00:00 2001 From: geemus Date: Thu, 8 Sep 2011 16:07:04 -0500 Subject: [PATCH] [compute|glesys] rearrange to match current naming conventions --- lib/fog/compute.rb | 2 +- lib/fog/{providers => }/glesys.rb | 2 +- lib/fog/{compute/glesys.rb => glesys/compute.rb} | 6 +++--- .../{compute/models/glesys => glesys/models/compute}/ip.rb | 0 .../{compute/models/glesys => glesys/models/compute}/ips.rb | 2 +- .../models/glesys => glesys/models/compute}/server.rb | 0 .../models/glesys => glesys/models/compute}/servers.rb | 2 +- .../models/glesys => glesys/models/compute}/template.rb | 0 .../models/glesys => glesys/models/compute}/templates.rb | 2 +- .../requests/glesys => glesys/requests/compute}/create.rb | 0 .../requests/glesys => glesys/requests/compute}/destroy.rb | 0 .../requests/glesys => glesys/requests/compute}/ip_add.rb | 0 .../glesys => glesys/requests/compute}/ip_details.rb | 0 .../glesys => glesys/requests/compute}/ip_list_free.rb | 0 .../glesys => glesys/requests/compute}/ip_list_own.rb | 0 .../glesys => glesys/requests/compute}/ip_release.rb | 0 .../glesys => glesys/requests/compute}/ip_remove.rb | 0 .../requests/glesys => glesys/requests/compute}/ip_take.rb | 0 .../glesys => glesys/requests/compute}/list_servers.rb | 0 .../glesys => glesys/requests/compute}/server_details.rb | 0 .../glesys => glesys/requests/compute}/server_status.rb | 0 .../requests/glesys => glesys/requests/compute}/start.rb | 0 .../requests/glesys => glesys/requests/compute}/stop.rb | 0 .../glesys => glesys/requests/compute}/template_list.rb | 0 lib/fog/providers.rb | 2 +- 25 files changed, 9 insertions(+), 9 deletions(-) rename lib/fog/{providers => }/glesys.rb (68%) rename lib/fog/{compute/glesys.rb => glesys/compute.rb} (96%) rename lib/fog/{compute/models/glesys => glesys/models/compute}/ip.rb (100%) rename lib/fog/{compute/models/glesys => glesys/models/compute}/ips.rb (95%) rename lib/fog/{compute/models/glesys => glesys/models/compute}/server.rb (100%) rename lib/fog/{compute/models/glesys => glesys/models/compute}/servers.rb (94%) rename lib/fog/{compute/models/glesys => glesys/models/compute}/template.rb (100%) rename lib/fog/{compute/models/glesys => glesys/models/compute}/templates.rb (92%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/create.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/destroy.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/ip_add.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/ip_details.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/ip_list_free.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/ip_list_own.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/ip_release.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/ip_remove.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/ip_take.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/list_servers.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/server_details.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/server_status.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/start.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/stop.rb (100%) rename lib/fog/{compute/requests/glesys => glesys/requests/compute}/template_list.rb (100%) diff --git a/lib/fog/compute.rb b/lib/fog/compute.rb index 1010d7d00..342b3af5e 100644 --- a/lib/fog/compute.rb +++ b/lib/fog/compute.rb @@ -21,7 +21,7 @@ module Fog require 'fog/ecloud/compute' Fog::Compute::Ecloud.new(attributes) when :glesys - require 'fog/compute/glesys' + require 'fog/glesys/compute' Fog::Compute::Glesys.new(attributes) when :gogrid require 'fog/go_grid/compute' diff --git a/lib/fog/providers/glesys.rb b/lib/fog/glesys.rb similarity index 68% rename from lib/fog/providers/glesys.rb rename to lib/fog/glesys.rb index 3ba015716..e99229fdc 100644 --- a/lib/fog/providers/glesys.rb +++ b/lib/fog/glesys.rb @@ -5,7 +5,7 @@ module Fog extend Fog::Provider - service(:compute, 'compute/glesys') + service(:compute, 'glesys/compute') end end diff --git a/lib/fog/compute/glesys.rb b/lib/fog/glesys/compute.rb similarity index 96% rename from lib/fog/compute/glesys.rb rename to lib/fog/glesys/compute.rb index 8f0556451..f6fa3abc4 100644 --- a/lib/fog/compute/glesys.rb +++ b/lib/fog/glesys/compute.rb @@ -6,7 +6,7 @@ module Fog API_URL = "https://api.glesys.com" - model_path 'fog/compute/models/glesys' + model_path 'fog/glesys/models/compute' collection :servers model :server collection :templates @@ -14,7 +14,7 @@ module Fog collection :ips model :ip - request_path 'fog/compute/requests/glesys' + request_path 'fog/glesys/requests/compute' request :create request :destroy request :list_servers @@ -22,7 +22,7 @@ module Fog request :server_status request :start request :stop - # Templates + # Templates request :template_list # IP operations request :ip_list_free diff --git a/lib/fog/compute/models/glesys/ip.rb b/lib/fog/glesys/models/compute/ip.rb similarity index 100% rename from lib/fog/compute/models/glesys/ip.rb rename to lib/fog/glesys/models/compute/ip.rb diff --git a/lib/fog/compute/models/glesys/ips.rb b/lib/fog/glesys/models/compute/ips.rb similarity index 95% rename from lib/fog/compute/models/glesys/ips.rb rename to lib/fog/glesys/models/compute/ips.rb index f25eaa7dc..82d088cd0 100644 --- a/lib/fog/compute/models/glesys/ips.rb +++ b/lib/fog/glesys/models/compute/ips.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/glesys/ip' +require 'fog/glesys/models/compute/ip' module Fog module Compute diff --git a/lib/fog/compute/models/glesys/server.rb b/lib/fog/glesys/models/compute/server.rb similarity index 100% rename from lib/fog/compute/models/glesys/server.rb rename to lib/fog/glesys/models/compute/server.rb diff --git a/lib/fog/compute/models/glesys/servers.rb b/lib/fog/glesys/models/compute/servers.rb similarity index 94% rename from lib/fog/compute/models/glesys/servers.rb rename to lib/fog/glesys/models/compute/servers.rb index eb185b821..1c431954c 100644 --- a/lib/fog/compute/models/glesys/servers.rb +++ b/lib/fog/glesys/models/compute/servers.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/glesys/server' +require 'fog/glesys/models/compute/server' module Fog module Compute diff --git a/lib/fog/compute/models/glesys/template.rb b/lib/fog/glesys/models/compute/template.rb similarity index 100% rename from lib/fog/compute/models/glesys/template.rb rename to lib/fog/glesys/models/compute/template.rb diff --git a/lib/fog/compute/models/glesys/templates.rb b/lib/fog/glesys/models/compute/templates.rb similarity index 92% rename from lib/fog/compute/models/glesys/templates.rb rename to lib/fog/glesys/models/compute/templates.rb index 0caa8f1cc..f846ae50a 100644 --- a/lib/fog/compute/models/glesys/templates.rb +++ b/lib/fog/glesys/models/compute/templates.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/glesys/template' +require 'fog/glesys/models/compute/template' module Fog module Compute diff --git a/lib/fog/compute/requests/glesys/create.rb b/lib/fog/glesys/requests/compute/create.rb similarity index 100% rename from lib/fog/compute/requests/glesys/create.rb rename to lib/fog/glesys/requests/compute/create.rb diff --git a/lib/fog/compute/requests/glesys/destroy.rb b/lib/fog/glesys/requests/compute/destroy.rb similarity index 100% rename from lib/fog/compute/requests/glesys/destroy.rb rename to lib/fog/glesys/requests/compute/destroy.rb diff --git a/lib/fog/compute/requests/glesys/ip_add.rb b/lib/fog/glesys/requests/compute/ip_add.rb similarity index 100% rename from lib/fog/compute/requests/glesys/ip_add.rb rename to lib/fog/glesys/requests/compute/ip_add.rb diff --git a/lib/fog/compute/requests/glesys/ip_details.rb b/lib/fog/glesys/requests/compute/ip_details.rb similarity index 100% rename from lib/fog/compute/requests/glesys/ip_details.rb rename to lib/fog/glesys/requests/compute/ip_details.rb diff --git a/lib/fog/compute/requests/glesys/ip_list_free.rb b/lib/fog/glesys/requests/compute/ip_list_free.rb similarity index 100% rename from lib/fog/compute/requests/glesys/ip_list_free.rb rename to lib/fog/glesys/requests/compute/ip_list_free.rb diff --git a/lib/fog/compute/requests/glesys/ip_list_own.rb b/lib/fog/glesys/requests/compute/ip_list_own.rb similarity index 100% rename from lib/fog/compute/requests/glesys/ip_list_own.rb rename to lib/fog/glesys/requests/compute/ip_list_own.rb diff --git a/lib/fog/compute/requests/glesys/ip_release.rb b/lib/fog/glesys/requests/compute/ip_release.rb similarity index 100% rename from lib/fog/compute/requests/glesys/ip_release.rb rename to lib/fog/glesys/requests/compute/ip_release.rb diff --git a/lib/fog/compute/requests/glesys/ip_remove.rb b/lib/fog/glesys/requests/compute/ip_remove.rb similarity index 100% rename from lib/fog/compute/requests/glesys/ip_remove.rb rename to lib/fog/glesys/requests/compute/ip_remove.rb diff --git a/lib/fog/compute/requests/glesys/ip_take.rb b/lib/fog/glesys/requests/compute/ip_take.rb similarity index 100% rename from lib/fog/compute/requests/glesys/ip_take.rb rename to lib/fog/glesys/requests/compute/ip_take.rb diff --git a/lib/fog/compute/requests/glesys/list_servers.rb b/lib/fog/glesys/requests/compute/list_servers.rb similarity index 100% rename from lib/fog/compute/requests/glesys/list_servers.rb rename to lib/fog/glesys/requests/compute/list_servers.rb diff --git a/lib/fog/compute/requests/glesys/server_details.rb b/lib/fog/glesys/requests/compute/server_details.rb similarity index 100% rename from lib/fog/compute/requests/glesys/server_details.rb rename to lib/fog/glesys/requests/compute/server_details.rb diff --git a/lib/fog/compute/requests/glesys/server_status.rb b/lib/fog/glesys/requests/compute/server_status.rb similarity index 100% rename from lib/fog/compute/requests/glesys/server_status.rb rename to lib/fog/glesys/requests/compute/server_status.rb diff --git a/lib/fog/compute/requests/glesys/start.rb b/lib/fog/glesys/requests/compute/start.rb similarity index 100% rename from lib/fog/compute/requests/glesys/start.rb rename to lib/fog/glesys/requests/compute/start.rb diff --git a/lib/fog/compute/requests/glesys/stop.rb b/lib/fog/glesys/requests/compute/stop.rb similarity index 100% rename from lib/fog/compute/requests/glesys/stop.rb rename to lib/fog/glesys/requests/compute/stop.rb diff --git a/lib/fog/compute/requests/glesys/template_list.rb b/lib/fog/glesys/requests/compute/template_list.rb similarity index 100% rename from lib/fog/compute/requests/glesys/template_list.rb rename to lib/fog/glesys/requests/compute/template_list.rb diff --git a/lib/fog/providers.rb b/lib/fog/providers.rb index be6fb2bdf..cdf5b6ad6 100644 --- a/lib/fog/providers.rb +++ b/lib/fog/providers.rb @@ -5,7 +5,7 @@ require 'fog/dnsimple' require 'fog/dnsmadeeasy' require 'fog/dynect' require 'fog/ecloud' -require 'fog/providers/glesys' +require 'fog/glesys' require 'fog/go_grid' require 'fog/google' require 'fog/libvirt'