From 4002c9ff89192bca48d6618f9862e691f7110ae4 Mon Sep 17 00:00:00 2001 From: geemus Date: Wed, 24 Aug 2011 20:31:12 -0500 Subject: [PATCH] [compute|brightbox] move brightbox compute to its own shared area (namespacing should probably be corrected) --- lib/fog/brightbox.rb | 3 ++- lib/fog/{compute/brightbox.rb => brightbox/compute.rb} | 4 ++-- .../models/brightbox => brightbox/models/compute}/account.rb | 0 .../models/brightbox => brightbox/models/compute}/cloud_ip.rb | 0 .../brightbox => brightbox/models/compute}/cloud_ips.rb | 2 +- .../models/brightbox => brightbox/models/compute}/flavor.rb | 0 .../models/brightbox => brightbox/models/compute}/flavors.rb | 2 +- .../models/brightbox => brightbox/models/compute}/image.rb | 0 .../models/brightbox => brightbox/models/compute}/images.rb | 2 +- .../brightbox => brightbox/models/compute}/load_balancer.rb | 0 .../brightbox => brightbox/models/compute}/load_balancers.rb | 2 +- .../models/brightbox => brightbox/models/compute}/server.rb | 0 .../models/brightbox => brightbox/models/compute}/servers.rb | 2 +- .../models/brightbox => brightbox/models/compute}/user.rb | 0 .../models/brightbox => brightbox/models/compute}/users.rb | 2 +- .../models/brightbox => brightbox/models/compute}/zone.rb | 0 .../models/brightbox => brightbox/models/compute}/zones.rb | 2 +- .../requests/compute}/activate_console_server.rb | 0 .../requests/compute}/add_listeners_load_balancer.rb | 0 .../requests/compute}/add_nodes_load_balancer.rb | 0 .../requests/compute}/add_servers_server_group.rb | 0 .../requests/compute}/create_api_client.rb | 0 .../requests/compute}/create_cloud_ip.rb | 0 .../brightbox => brightbox/requests/compute}/create_image.rb | 0 .../requests/compute}/create_load_balancer.rb | 0 .../brightbox => brightbox/requests/compute}/create_server.rb | 0 .../requests/compute}/create_server_group.rb | 0 .../requests/compute}/destroy_api_client.rb | 0 .../requests/compute}/destroy_cloud_ip.rb | 0 .../brightbox => brightbox/requests/compute}/destroy_image.rb | 0 .../requests/compute}/destroy_load_balancer.rb | 0 .../requests/compute}/destroy_server.rb | 0 .../requests/compute}/destroy_server_group.rb | 0 .../brightbox => brightbox/requests/compute}/get_account.rb | 0 .../requests/compute}/get_api_client.rb | 0 .../brightbox => brightbox/requests/compute}/get_cloud_ip.rb | 0 .../brightbox => brightbox/requests/compute}/get_image.rb | 0 .../brightbox => brightbox/requests/compute}/get_interface.rb | 0 .../requests/compute}/get_load_balancer.rb | 0 .../brightbox => brightbox/requests/compute}/get_server.rb | 0 .../requests/compute}/get_server_group.rb | 0 .../requests/compute}/get_server_type.rb | 0 .../brightbox => brightbox/requests/compute}/get_user.rb | 0 .../brightbox => brightbox/requests/compute}/get_zone.rb | 0 .../requests/compute}/list_api_clients.rb | 0 .../requests/compute}/list_cloud_ips.rb | 0 .../brightbox => brightbox/requests/compute}/list_images.rb | 0 .../requests/compute}/list_load_balancers.rb | 0 .../requests/compute}/list_server_groups.rb | 0 .../requests/compute}/list_server_types.rb | 0 .../brightbox => brightbox/requests/compute}/list_servers.rb | 0 .../brightbox => brightbox/requests/compute}/list_users.rb | 0 .../brightbox => brightbox/requests/compute}/list_zones.rb | 0 .../brightbox => brightbox/requests/compute}/map_cloud_ip.rb | 0 .../requests/compute}/move_servers_server_group.rb | 0 .../requests/compute}/remove_listeners_load_balancer.rb | 0 .../requests/compute}/remove_nodes_load_balancer.rb | 0 .../requests/compute}/remove_servers_server_group.rb | 0 .../requests/compute}/reset_ftp_password_account.rb | 0 .../brightbox => brightbox/requests/compute}/resize_server.rb | 0 .../requests/compute}/shutdown_server.rb | 0 .../requests/compute}/snapshot_server.rb | 0 .../brightbox => brightbox/requests/compute}/start_server.rb | 0 .../brightbox => brightbox/requests/compute}/stop_server.rb | 0 .../requests/compute}/unmap_cloud_ip.rb | 0 .../requests/compute}/update_account.rb | 0 .../requests/compute}/update_api_client.rb | 0 .../brightbox => brightbox/requests/compute}/update_image.rb | 0 .../requests/compute}/update_load_balancer.rb | 0 .../brightbox => brightbox/requests/compute}/update_server.rb | 0 .../requests/compute}/update_server_group.rb | 0 .../brightbox => brightbox/requests/compute}/update_user.rb | 0 lib/fog/compute.rb | 2 +- 73 files changed, 12 insertions(+), 11 deletions(-) rename lib/fog/{compute/brightbox.rb => brightbox/compute.rb} (98%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/account.rb (100%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/cloud_ip.rb (100%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/cloud_ips.rb (92%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/flavor.rb (100%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/flavors.rb (90%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/image.rb (100%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/images.rb (90%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/load_balancer.rb (100%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/load_balancers.rb (90%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/server.rb (100%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/servers.rb (91%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/user.rb (100%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/users.rb (91%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/zone.rb (100%) rename lib/fog/{compute/models/brightbox => brightbox/models/compute}/zones.rb (91%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/activate_console_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/add_listeners_load_balancer.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/add_nodes_load_balancer.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/add_servers_server_group.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/create_api_client.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/create_cloud_ip.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/create_image.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/create_load_balancer.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/create_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/create_server_group.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/destroy_api_client.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/destroy_cloud_ip.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/destroy_image.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/destroy_load_balancer.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/destroy_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/destroy_server_group.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_account.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_api_client.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_cloud_ip.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_image.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_interface.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_load_balancer.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_server_group.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_server_type.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_user.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/get_zone.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/list_api_clients.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/list_cloud_ips.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/list_images.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/list_load_balancers.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/list_server_groups.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/list_server_types.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/list_servers.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/list_users.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/list_zones.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/map_cloud_ip.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/move_servers_server_group.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/remove_listeners_load_balancer.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/remove_nodes_load_balancer.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/remove_servers_server_group.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/reset_ftp_password_account.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/resize_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/shutdown_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/snapshot_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/start_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/stop_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/unmap_cloud_ip.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/update_account.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/update_api_client.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/update_image.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/update_load_balancer.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/update_server.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/update_server_group.rb (100%) rename lib/fog/{compute/requests/brightbox => brightbox/requests/compute}/update_user.rb (100%) diff --git a/lib/fog/brightbox.rb b/lib/fog/brightbox.rb index 7279c6c01..c093f35cb 100644 --- a/lib/fog/brightbox.rb +++ b/lib/fog/brightbox.rb @@ -4,6 +4,7 @@ module Fog module Brightbox extend Fog::Provider - service(:compute, 'compute/brightbox') + service(:compute, 'brightbox/compute') + end end diff --git a/lib/fog/compute/brightbox.rb b/lib/fog/brightbox/compute.rb similarity index 98% rename from lib/fog/compute/brightbox.rb rename to lib/fog/brightbox/compute.rb index 2afd1d54e..74c1cd5a6 100644 --- a/lib/fog/compute/brightbox.rb +++ b/lib/fog/brightbox/compute.rb @@ -7,7 +7,7 @@ module Fog requires :brightbox_client_id, :brightbox_secret recognizes :brightbox_auth_url, :brightbox_api_url - model_path 'fog/compute/models/brightbox' + model_path 'fog/brightbox/models/compute' model :account # Singular resource, no collection collection :servers model :server @@ -24,7 +24,7 @@ module Fog collection :users model :user - request_path 'fog/compute/requests/brightbox' + request_path 'fog/brightbox/requests/compute' request :activate_console_server request :add_listeners_load_balancer request :add_nodes_load_balancer diff --git a/lib/fog/compute/models/brightbox/account.rb b/lib/fog/brightbox/models/compute/account.rb similarity index 100% rename from lib/fog/compute/models/brightbox/account.rb rename to lib/fog/brightbox/models/compute/account.rb diff --git a/lib/fog/compute/models/brightbox/cloud_ip.rb b/lib/fog/brightbox/models/compute/cloud_ip.rb similarity index 100% rename from lib/fog/compute/models/brightbox/cloud_ip.rb rename to lib/fog/brightbox/models/compute/cloud_ip.rb diff --git a/lib/fog/compute/models/brightbox/cloud_ips.rb b/lib/fog/brightbox/models/compute/cloud_ips.rb similarity index 92% rename from lib/fog/compute/models/brightbox/cloud_ips.rb rename to lib/fog/brightbox/models/compute/cloud_ips.rb index 3b81f4964..63526a08d 100644 --- a/lib/fog/compute/models/brightbox/cloud_ips.rb +++ b/lib/fog/brightbox/models/compute/cloud_ips.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/brightbox/cloud_ip' +require 'fog/brightbox/models/compute/cloud_ip' module Fog module Compute diff --git a/lib/fog/compute/models/brightbox/flavor.rb b/lib/fog/brightbox/models/compute/flavor.rb similarity index 100% rename from lib/fog/compute/models/brightbox/flavor.rb rename to lib/fog/brightbox/models/compute/flavor.rb diff --git a/lib/fog/compute/models/brightbox/flavors.rb b/lib/fog/brightbox/models/compute/flavors.rb similarity index 90% rename from lib/fog/compute/models/brightbox/flavors.rb rename to lib/fog/brightbox/models/compute/flavors.rb index eb4ac0aae..a67df22f3 100644 --- a/lib/fog/compute/models/brightbox/flavors.rb +++ b/lib/fog/brightbox/models/compute/flavors.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/brightbox/flavor' +require 'fog/brightbox/models/compute/flavor' module Fog module Compute diff --git a/lib/fog/compute/models/brightbox/image.rb b/lib/fog/brightbox/models/compute/image.rb similarity index 100% rename from lib/fog/compute/models/brightbox/image.rb rename to lib/fog/brightbox/models/compute/image.rb diff --git a/lib/fog/compute/models/brightbox/images.rb b/lib/fog/brightbox/models/compute/images.rb similarity index 90% rename from lib/fog/compute/models/brightbox/images.rb rename to lib/fog/brightbox/models/compute/images.rb index 78f7d8691..2f3e7726c 100644 --- a/lib/fog/compute/models/brightbox/images.rb +++ b/lib/fog/brightbox/models/compute/images.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/brightbox/image' +require 'fog/brightbox/models/compute/image' module Fog module Compute diff --git a/lib/fog/compute/models/brightbox/load_balancer.rb b/lib/fog/brightbox/models/compute/load_balancer.rb similarity index 100% rename from lib/fog/compute/models/brightbox/load_balancer.rb rename to lib/fog/brightbox/models/compute/load_balancer.rb diff --git a/lib/fog/compute/models/brightbox/load_balancers.rb b/lib/fog/brightbox/models/compute/load_balancers.rb similarity index 90% rename from lib/fog/compute/models/brightbox/load_balancers.rb rename to lib/fog/brightbox/models/compute/load_balancers.rb index 29019b56a..ba170c3c3 100644 --- a/lib/fog/compute/models/brightbox/load_balancers.rb +++ b/lib/fog/brightbox/models/compute/load_balancers.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/brightbox/load_balancer' +require 'fog/brightbox/models/compute/load_balancer' module Fog module Compute diff --git a/lib/fog/compute/models/brightbox/server.rb b/lib/fog/brightbox/models/compute/server.rb similarity index 100% rename from lib/fog/compute/models/brightbox/server.rb rename to lib/fog/brightbox/models/compute/server.rb diff --git a/lib/fog/compute/models/brightbox/servers.rb b/lib/fog/brightbox/models/compute/servers.rb similarity index 91% rename from lib/fog/compute/models/brightbox/servers.rb rename to lib/fog/brightbox/models/compute/servers.rb index b747f09ef..19f09d9db 100644 --- a/lib/fog/compute/models/brightbox/servers.rb +++ b/lib/fog/brightbox/models/compute/servers.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/brightbox/server' +require 'fog/brightbox/models/compute/server' module Fog module Compute diff --git a/lib/fog/compute/models/brightbox/user.rb b/lib/fog/brightbox/models/compute/user.rb similarity index 100% rename from lib/fog/compute/models/brightbox/user.rb rename to lib/fog/brightbox/models/compute/user.rb diff --git a/lib/fog/compute/models/brightbox/users.rb b/lib/fog/brightbox/models/compute/users.rb similarity index 91% rename from lib/fog/compute/models/brightbox/users.rb rename to lib/fog/brightbox/models/compute/users.rb index 144c1598e..f9a937082 100644 --- a/lib/fog/compute/models/brightbox/users.rb +++ b/lib/fog/brightbox/models/compute/users.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/brightbox/user' +require 'fog/brightbox/models/compute/user' module Fog module Compute diff --git a/lib/fog/compute/models/brightbox/zone.rb b/lib/fog/brightbox/models/compute/zone.rb similarity index 100% rename from lib/fog/compute/models/brightbox/zone.rb rename to lib/fog/brightbox/models/compute/zone.rb diff --git a/lib/fog/compute/models/brightbox/zones.rb b/lib/fog/brightbox/models/compute/zones.rb similarity index 91% rename from lib/fog/compute/models/brightbox/zones.rb rename to lib/fog/brightbox/models/compute/zones.rb index f8d29a61c..c46b4408a 100644 --- a/lib/fog/compute/models/brightbox/zones.rb +++ b/lib/fog/brightbox/models/compute/zones.rb @@ -1,5 +1,5 @@ require 'fog/core/collection' -require 'fog/compute/models/brightbox/zone' +require 'fog/brightbox/models/compute/zone' module Fog module Compute diff --git a/lib/fog/compute/requests/brightbox/activate_console_server.rb b/lib/fog/brightbox/requests/compute/activate_console_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/activate_console_server.rb rename to lib/fog/brightbox/requests/compute/activate_console_server.rb diff --git a/lib/fog/compute/requests/brightbox/add_listeners_load_balancer.rb b/lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/add_listeners_load_balancer.rb rename to lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb diff --git a/lib/fog/compute/requests/brightbox/add_nodes_load_balancer.rb b/lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/add_nodes_load_balancer.rb rename to lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb diff --git a/lib/fog/compute/requests/brightbox/add_servers_server_group.rb b/lib/fog/brightbox/requests/compute/add_servers_server_group.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/add_servers_server_group.rb rename to lib/fog/brightbox/requests/compute/add_servers_server_group.rb diff --git a/lib/fog/compute/requests/brightbox/create_api_client.rb b/lib/fog/brightbox/requests/compute/create_api_client.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/create_api_client.rb rename to lib/fog/brightbox/requests/compute/create_api_client.rb diff --git a/lib/fog/compute/requests/brightbox/create_cloud_ip.rb b/lib/fog/brightbox/requests/compute/create_cloud_ip.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/create_cloud_ip.rb rename to lib/fog/brightbox/requests/compute/create_cloud_ip.rb diff --git a/lib/fog/compute/requests/brightbox/create_image.rb b/lib/fog/brightbox/requests/compute/create_image.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/create_image.rb rename to lib/fog/brightbox/requests/compute/create_image.rb diff --git a/lib/fog/compute/requests/brightbox/create_load_balancer.rb b/lib/fog/brightbox/requests/compute/create_load_balancer.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/create_load_balancer.rb rename to lib/fog/brightbox/requests/compute/create_load_balancer.rb diff --git a/lib/fog/compute/requests/brightbox/create_server.rb b/lib/fog/brightbox/requests/compute/create_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/create_server.rb rename to lib/fog/brightbox/requests/compute/create_server.rb diff --git a/lib/fog/compute/requests/brightbox/create_server_group.rb b/lib/fog/brightbox/requests/compute/create_server_group.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/create_server_group.rb rename to lib/fog/brightbox/requests/compute/create_server_group.rb diff --git a/lib/fog/compute/requests/brightbox/destroy_api_client.rb b/lib/fog/brightbox/requests/compute/destroy_api_client.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/destroy_api_client.rb rename to lib/fog/brightbox/requests/compute/destroy_api_client.rb diff --git a/lib/fog/compute/requests/brightbox/destroy_cloud_ip.rb b/lib/fog/brightbox/requests/compute/destroy_cloud_ip.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/destroy_cloud_ip.rb rename to lib/fog/brightbox/requests/compute/destroy_cloud_ip.rb diff --git a/lib/fog/compute/requests/brightbox/destroy_image.rb b/lib/fog/brightbox/requests/compute/destroy_image.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/destroy_image.rb rename to lib/fog/brightbox/requests/compute/destroy_image.rb diff --git a/lib/fog/compute/requests/brightbox/destroy_load_balancer.rb b/lib/fog/brightbox/requests/compute/destroy_load_balancer.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/destroy_load_balancer.rb rename to lib/fog/brightbox/requests/compute/destroy_load_balancer.rb diff --git a/lib/fog/compute/requests/brightbox/destroy_server.rb b/lib/fog/brightbox/requests/compute/destroy_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/destroy_server.rb rename to lib/fog/brightbox/requests/compute/destroy_server.rb diff --git a/lib/fog/compute/requests/brightbox/destroy_server_group.rb b/lib/fog/brightbox/requests/compute/destroy_server_group.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/destroy_server_group.rb rename to lib/fog/brightbox/requests/compute/destroy_server_group.rb diff --git a/lib/fog/compute/requests/brightbox/get_account.rb b/lib/fog/brightbox/requests/compute/get_account.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_account.rb rename to lib/fog/brightbox/requests/compute/get_account.rb diff --git a/lib/fog/compute/requests/brightbox/get_api_client.rb b/lib/fog/brightbox/requests/compute/get_api_client.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_api_client.rb rename to lib/fog/brightbox/requests/compute/get_api_client.rb diff --git a/lib/fog/compute/requests/brightbox/get_cloud_ip.rb b/lib/fog/brightbox/requests/compute/get_cloud_ip.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_cloud_ip.rb rename to lib/fog/brightbox/requests/compute/get_cloud_ip.rb diff --git a/lib/fog/compute/requests/brightbox/get_image.rb b/lib/fog/brightbox/requests/compute/get_image.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_image.rb rename to lib/fog/brightbox/requests/compute/get_image.rb diff --git a/lib/fog/compute/requests/brightbox/get_interface.rb b/lib/fog/brightbox/requests/compute/get_interface.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_interface.rb rename to lib/fog/brightbox/requests/compute/get_interface.rb diff --git a/lib/fog/compute/requests/brightbox/get_load_balancer.rb b/lib/fog/brightbox/requests/compute/get_load_balancer.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_load_balancer.rb rename to lib/fog/brightbox/requests/compute/get_load_balancer.rb diff --git a/lib/fog/compute/requests/brightbox/get_server.rb b/lib/fog/brightbox/requests/compute/get_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_server.rb rename to lib/fog/brightbox/requests/compute/get_server.rb diff --git a/lib/fog/compute/requests/brightbox/get_server_group.rb b/lib/fog/brightbox/requests/compute/get_server_group.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_server_group.rb rename to lib/fog/brightbox/requests/compute/get_server_group.rb diff --git a/lib/fog/compute/requests/brightbox/get_server_type.rb b/lib/fog/brightbox/requests/compute/get_server_type.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_server_type.rb rename to lib/fog/brightbox/requests/compute/get_server_type.rb diff --git a/lib/fog/compute/requests/brightbox/get_user.rb b/lib/fog/brightbox/requests/compute/get_user.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_user.rb rename to lib/fog/brightbox/requests/compute/get_user.rb diff --git a/lib/fog/compute/requests/brightbox/get_zone.rb b/lib/fog/brightbox/requests/compute/get_zone.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/get_zone.rb rename to lib/fog/brightbox/requests/compute/get_zone.rb diff --git a/lib/fog/compute/requests/brightbox/list_api_clients.rb b/lib/fog/brightbox/requests/compute/list_api_clients.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/list_api_clients.rb rename to lib/fog/brightbox/requests/compute/list_api_clients.rb diff --git a/lib/fog/compute/requests/brightbox/list_cloud_ips.rb b/lib/fog/brightbox/requests/compute/list_cloud_ips.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/list_cloud_ips.rb rename to lib/fog/brightbox/requests/compute/list_cloud_ips.rb diff --git a/lib/fog/compute/requests/brightbox/list_images.rb b/lib/fog/brightbox/requests/compute/list_images.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/list_images.rb rename to lib/fog/brightbox/requests/compute/list_images.rb diff --git a/lib/fog/compute/requests/brightbox/list_load_balancers.rb b/lib/fog/brightbox/requests/compute/list_load_balancers.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/list_load_balancers.rb rename to lib/fog/brightbox/requests/compute/list_load_balancers.rb diff --git a/lib/fog/compute/requests/brightbox/list_server_groups.rb b/lib/fog/brightbox/requests/compute/list_server_groups.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/list_server_groups.rb rename to lib/fog/brightbox/requests/compute/list_server_groups.rb diff --git a/lib/fog/compute/requests/brightbox/list_server_types.rb b/lib/fog/brightbox/requests/compute/list_server_types.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/list_server_types.rb rename to lib/fog/brightbox/requests/compute/list_server_types.rb diff --git a/lib/fog/compute/requests/brightbox/list_servers.rb b/lib/fog/brightbox/requests/compute/list_servers.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/list_servers.rb rename to lib/fog/brightbox/requests/compute/list_servers.rb diff --git a/lib/fog/compute/requests/brightbox/list_users.rb b/lib/fog/brightbox/requests/compute/list_users.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/list_users.rb rename to lib/fog/brightbox/requests/compute/list_users.rb diff --git a/lib/fog/compute/requests/brightbox/list_zones.rb b/lib/fog/brightbox/requests/compute/list_zones.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/list_zones.rb rename to lib/fog/brightbox/requests/compute/list_zones.rb diff --git a/lib/fog/compute/requests/brightbox/map_cloud_ip.rb b/lib/fog/brightbox/requests/compute/map_cloud_ip.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/map_cloud_ip.rb rename to lib/fog/brightbox/requests/compute/map_cloud_ip.rb diff --git a/lib/fog/compute/requests/brightbox/move_servers_server_group.rb b/lib/fog/brightbox/requests/compute/move_servers_server_group.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/move_servers_server_group.rb rename to lib/fog/brightbox/requests/compute/move_servers_server_group.rb diff --git a/lib/fog/compute/requests/brightbox/remove_listeners_load_balancer.rb b/lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/remove_listeners_load_balancer.rb rename to lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb diff --git a/lib/fog/compute/requests/brightbox/remove_nodes_load_balancer.rb b/lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/remove_nodes_load_balancer.rb rename to lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb diff --git a/lib/fog/compute/requests/brightbox/remove_servers_server_group.rb b/lib/fog/brightbox/requests/compute/remove_servers_server_group.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/remove_servers_server_group.rb rename to lib/fog/brightbox/requests/compute/remove_servers_server_group.rb diff --git a/lib/fog/compute/requests/brightbox/reset_ftp_password_account.rb b/lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/reset_ftp_password_account.rb rename to lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb diff --git a/lib/fog/compute/requests/brightbox/resize_server.rb b/lib/fog/brightbox/requests/compute/resize_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/resize_server.rb rename to lib/fog/brightbox/requests/compute/resize_server.rb diff --git a/lib/fog/compute/requests/brightbox/shutdown_server.rb b/lib/fog/brightbox/requests/compute/shutdown_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/shutdown_server.rb rename to lib/fog/brightbox/requests/compute/shutdown_server.rb diff --git a/lib/fog/compute/requests/brightbox/snapshot_server.rb b/lib/fog/brightbox/requests/compute/snapshot_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/snapshot_server.rb rename to lib/fog/brightbox/requests/compute/snapshot_server.rb diff --git a/lib/fog/compute/requests/brightbox/start_server.rb b/lib/fog/brightbox/requests/compute/start_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/start_server.rb rename to lib/fog/brightbox/requests/compute/start_server.rb diff --git a/lib/fog/compute/requests/brightbox/stop_server.rb b/lib/fog/brightbox/requests/compute/stop_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/stop_server.rb rename to lib/fog/brightbox/requests/compute/stop_server.rb diff --git a/lib/fog/compute/requests/brightbox/unmap_cloud_ip.rb b/lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/unmap_cloud_ip.rb rename to lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb diff --git a/lib/fog/compute/requests/brightbox/update_account.rb b/lib/fog/brightbox/requests/compute/update_account.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/update_account.rb rename to lib/fog/brightbox/requests/compute/update_account.rb diff --git a/lib/fog/compute/requests/brightbox/update_api_client.rb b/lib/fog/brightbox/requests/compute/update_api_client.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/update_api_client.rb rename to lib/fog/brightbox/requests/compute/update_api_client.rb diff --git a/lib/fog/compute/requests/brightbox/update_image.rb b/lib/fog/brightbox/requests/compute/update_image.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/update_image.rb rename to lib/fog/brightbox/requests/compute/update_image.rb diff --git a/lib/fog/compute/requests/brightbox/update_load_balancer.rb b/lib/fog/brightbox/requests/compute/update_load_balancer.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/update_load_balancer.rb rename to lib/fog/brightbox/requests/compute/update_load_balancer.rb diff --git a/lib/fog/compute/requests/brightbox/update_server.rb b/lib/fog/brightbox/requests/compute/update_server.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/update_server.rb rename to lib/fog/brightbox/requests/compute/update_server.rb diff --git a/lib/fog/compute/requests/brightbox/update_server_group.rb b/lib/fog/brightbox/requests/compute/update_server_group.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/update_server_group.rb rename to lib/fog/brightbox/requests/compute/update_server_group.rb diff --git a/lib/fog/compute/requests/brightbox/update_user.rb b/lib/fog/brightbox/requests/compute/update_user.rb similarity index 100% rename from lib/fog/compute/requests/brightbox/update_user.rb rename to lib/fog/brightbox/requests/compute/update_user.rb diff --git a/lib/fog/compute.rb b/lib/fog/compute.rb index ce9f3a2db..9e26821d5 100644 --- a/lib/fog/compute.rb +++ b/lib/fog/compute.rb @@ -15,7 +15,7 @@ module Fog require 'fog/compute/bluebox' Fog::Compute::Bluebox.new(attributes) when :brightbox - require 'fog/compute/brightbox' + require 'fog/brightbox/brightbox' Fog::Compute::Brightbox.new(attributes) when :ecloud require 'fog/ecloud/compute'