From fd755e042b325190fce3488cba42107f14d5056e Mon Sep 17 00:00:00 2001 From: geemus Date: Fri, 3 Sep 2010 01:11:45 -0700 Subject: [PATCH] clean up by changing service abstraction into a class --- bin/fog | 2 +- lib/fog.rb | 22 +-- lib/fog/aws/ec2.rb | 3 +- lib/fog/aws/elb.rb | 3 +- lib/fog/aws/models/ec2/address.rb | 2 +- lib/fog/aws/models/ec2/addresses.rb | 10 +- lib/fog/aws/models/ec2/flavor.rb | 4 +- lib/fog/aws/models/ec2/flavors.rb | 8 +- lib/fog/aws/models/ec2/image.rb | 2 +- lib/fog/aws/models/ec2/images.rb | 8 +- lib/fog/aws/models/ec2/key_pair.rb | 2 +- lib/fog/aws/models/ec2/key_pairs.rb | 8 +- lib/fog/aws/models/ec2/security_group.rb | 2 +- lib/fog/aws/models/ec2/security_groups.rb | 8 +- lib/fog/aws/models/ec2/server.rb | 2 +- lib/fog/aws/models/ec2/servers.rb | 8 +- lib/fog/aws/models/ec2/snapshot.rb | 2 +- lib/fog/aws/models/ec2/snapshots.rb | 10 +- lib/fog/aws/models/ec2/volume.rb | 2 +- lib/fog/aws/models/ec2/volumes.rb | 10 +- lib/fog/aws/models/s3/directories.rb | 8 +- lib/fog/aws/models/s3/directory.rb | 2 +- lib/fog/aws/models/s3/file.rb | 2 +- lib/fog/aws/models/s3/files.rb | 8 +- lib/fog/aws/requests/ec2/allocate_address.rb | 2 +- lib/fog/aws/requests/ec2/associate_address.rb | 2 +- lib/fog/aws/requests/ec2/attach_volume.rb | 2 +- .../ec2/authorize_security_group_ingress.rb | 2 +- lib/fog/aws/requests/ec2/create_image.rb | 2 +- lib/fog/aws/requests/ec2/create_key_pair.rb | 2 +- .../aws/requests/ec2/create_security_group.rb | 2 +- lib/fog/aws/requests/ec2/create_snapshot.rb | 2 +- lib/fog/aws/requests/ec2/create_volume.rb | 2 +- lib/fog/aws/requests/ec2/delete_key_pair.rb | 2 +- .../aws/requests/ec2/delete_security_group.rb | 2 +- lib/fog/aws/requests/ec2/delete_snapshot.rb | 2 +- lib/fog/aws/requests/ec2/delete_volume.rb | 2 +- lib/fog/aws/requests/ec2/deregister_image.rb | 2 +- .../aws/requests/ec2/describe_addresses.rb | 2 +- .../ec2/describe_availability_zones.rb | 2 +- lib/fog/aws/requests/ec2/describe_images.rb | 2 +- .../aws/requests/ec2/describe_instances.rb | 2 +- .../aws/requests/ec2/describe_key_pairs.rb | 2 +- lib/fog/aws/requests/ec2/describe_regions.rb | 2 +- .../ec2/describe_reserved_instances.rb | 2 +- .../requests/ec2/describe_security_groups.rb | 2 +- .../aws/requests/ec2/describe_snapshots.rb | 2 +- lib/fog/aws/requests/ec2/describe_volumes.rb | 2 +- lib/fog/aws/requests/ec2/detach_volume.rb | 2 +- .../aws/requests/ec2/disassociate_address.rb | 2 +- .../aws/requests/ec2/get_console_output.rb | 2 +- .../requests/ec2/modify_image_attributes.rb | 2 +- .../requests/ec2/modify_snapshot_attribute.rb | 2 +- lib/fog/aws/requests/ec2/reboot_instances.rb | 2 +- lib/fog/aws/requests/ec2/register_image.rb | 2 +- lib/fog/aws/requests/ec2/release_address.rb | 2 +- .../ec2/revoke_security_group_ingress.rb | 2 +- lib/fog/aws/requests/ec2/run_instances.rb | 2 +- lib/fog/aws/requests/ec2/start_instances.rb | 2 +- lib/fog/aws/requests/ec2/stop_instances.rb | 2 +- .../aws/requests/ec2/terminate_instances.rb | 2 +- .../aws/requests/elb/create_load_balancer.rb | 2 +- .../aws/requests/elb/delete_load_balancer.rb | 2 +- ...deregister_instances_from_load_balancer.rb | 2 +- .../requests/elb/describe_instance_health.rb | 2 +- .../requests/elb/describe_load_balancers.rb | 2 +- ...le_availability_zones_for_load_balancer.rb | 2 +- ...le_availability_zones_for_load_balancer.rb | 2 +- .../register_instances_with_load_balancer.rb | 2 +- lib/fog/aws/requests/s3/copy_object.rb | 2 +- lib/fog/aws/requests/s3/delete_bucket.rb | 2 +- lib/fog/aws/requests/s3/delete_object.rb | 4 +- lib/fog/aws/requests/s3/get_bucket.rb | 2 +- lib/fog/aws/requests/s3/get_bucket_acl.rb | 2 +- .../aws/requests/s3/get_bucket_location.rb | 2 +- lib/fog/aws/requests/s3/get_bucket_logging.rb | 2 +- .../requests/s3/get_bucket_object_versions.rb | 2 +- .../aws/requests/s3/get_bucket_versioning.rb | 2 +- lib/fog/aws/requests/s3/get_object.rb | 2 +- lib/fog/aws/requests/s3/get_object_acl.rb | 2 +- lib/fog/aws/requests/s3/get_object_torrent.rb | 2 +- lib/fog/aws/requests/s3/get_object_url.rb | 2 +- .../aws/requests/s3/get_request_payment.rb | 2 +- lib/fog/aws/requests/s3/get_service.rb | 2 +- lib/fog/aws/requests/s3/head_object.rb | 2 +- lib/fog/aws/requests/s3/put_bucket.rb | 2 +- lib/fog/aws/requests/s3/put_bucket_acl.rb | 2 +- lib/fog/aws/requests/s3/put_bucket_logging.rb | 2 +- .../aws/requests/s3/put_bucket_versioning.rb | 2 +- lib/fog/aws/requests/s3/put_object.rb | 2 +- lib/fog/aws/requests/s3/put_object_url.rb | 2 +- .../aws/requests/s3/put_request_payment.rb | 2 +- .../requests/simpledb/batch_put_attributes.rb | 2 +- .../aws/requests/simpledb/create_domain.rb | 2 +- .../requests/simpledb/delete_attributes.rb | 2 +- .../aws/requests/simpledb/delete_domain.rb | 2 +- .../aws/requests/simpledb/domain_metadata.rb | 2 +- .../aws/requests/simpledb/get_attributes.rb | 2 +- lib/fog/aws/requests/simpledb/list_domains.rb | 2 +- .../aws/requests/simpledb/put_attributes.rb | 2 +- lib/fog/aws/requests/simpledb/select.rb | 2 +- lib/fog/aws/s3.rb | 3 +- lib/fog/aws/simpledb.rb | 3 +- lib/fog/bluebox.rb | 3 +- lib/fog/bluebox/models/flavor.rb | 2 +- lib/fog/bluebox/models/flavors.rb | 8 +- lib/fog/bluebox/models/image.rb | 2 +- lib/fog/bluebox/models/images.rb | 10 +- lib/fog/bluebox/models/server.rb | 2 +- lib/fog/bluebox/models/servers.rb | 8 +- lib/fog/bluebox/requests/create_block.rb | 2 +- lib/fog/bluebox/requests/destroy_block.rb | 2 +- lib/fog/bluebox/requests/get_block.rb | 2 +- lib/fog/bluebox/requests/get_blocks.rb | 2 +- lib/fog/bluebox/requests/get_product.rb | 2 +- lib/fog/bluebox/requests/get_products.rb | 2 +- lib/fog/bluebox/requests/get_template.rb | 2 +- lib/fog/bluebox/requests/get_templates.rb | 2 +- lib/fog/bluebox/requests/reboot_block.rb | 2 +- lib/fog/go_grid.rb | 3 +- .../go_grid/requests/common_lookup_list.rb | 2 +- lib/fog/go_grid/requests/grid_image_list.rb | 2 +- lib/fog/go_grid/requests/grid_ip_list.rb | 2 +- .../requests/grid_loadbalancer_list.rb | 2 +- lib/fog/go_grid/requests/grid_server_add.rb | 2 +- .../go_grid/requests/grid_server_delete.rb | 2 +- lib/fog/go_grid/requests/grid_server_get.rb | 2 +- lib/fog/go_grid/requests/grid_server_list.rb | 2 +- lib/fog/go_grid/requests/grid_server_power.rb | 2 +- lib/fog/linode.rb | 3 +- lib/fog/linode/requests/avail_datacenters.rb | 2 +- .../linode/requests/avail_distributions.rb | 2 +- lib/fog/linode/requests/avail_kernels.rb | 2 +- lib/fog/linode/requests/avail_linodeplans.rb | 2 +- lib/fog/linode/requests/avail_stackscripts.rb | 2 +- lib/fog/linode/requests/linode_create.rb | 2 +- lib/fog/linode/requests/linode_delete.rb | 2 +- lib/fog/linode/requests/linode_list.rb | 2 +- lib/fog/linode/requests/linode_reboot.rb | 2 +- lib/fog/local.rb | 3 +- lib/fog/local/models/directories.rb | 8 +- lib/fog/local/models/directory.rb | 2 +- lib/fog/local/models/file.rb | 2 +- lib/fog/local/models/files.rb | 8 +- lib/fog/new_servers.rb | 3 +- lib/fog/new_servers/requests/add_server.rb | 2 +- lib/fog/new_servers/requests/cancel_server.rb | 2 +- lib/fog/new_servers/requests/get_server.rb | 2 +- lib/fog/new_servers/requests/list_images.rb | 2 +- lib/fog/new_servers/requests/list_plans.rb | 2 +- lib/fog/new_servers/requests/list_servers.rb | 3 +- lib/fog/new_servers/requests/reboot_server.rb | 2 +- lib/fog/rackspace/files.rb | 3 +- lib/fog/rackspace/models/files/directories.rb | 8 +- lib/fog/rackspace/models/files/directory.rb | 2 +- lib/fog/rackspace/models/files/file.rb | 2 +- lib/fog/rackspace/models/files/files.rb | 8 +- lib/fog/rackspace/models/servers/flavor.rb | 2 +- lib/fog/rackspace/models/servers/flavors.rb | 8 +- lib/fog/rackspace/models/servers/image.rb | 2 +- lib/fog/rackspace/models/servers/images.rb | 10 +- lib/fog/rackspace/models/servers/server.rb | 2 +- lib/fog/rackspace/models/servers/servers.rb | 8 +- .../requests/files/delete_container.rb | 2 +- .../rackspace/requests/files/delete_object.rb | 2 +- .../rackspace/requests/files/get_container.rb | 2 +- .../requests/files/get_containers.rb | 2 +- .../rackspace/requests/files/get_object.rb | 2 +- .../requests/files/head_container.rb | 2 +- .../requests/files/head_containers.rb | 2 +- .../rackspace/requests/files/head_object.rb | 2 +- .../rackspace/requests/files/put_container.rb | 2 +- .../rackspace/requests/files/put_object.rb | 2 +- .../requests/servers/create_image.rb | 2 +- .../requests/servers/create_server.rb | 2 +- .../requests/servers/delete_image.rb | 2 +- .../requests/servers/delete_server.rb | 2 +- .../requests/servers/get_flavor_details.rb | 2 +- .../requests/servers/get_image_details.rb | 2 +- .../requests/servers/get_server_details.rb | 2 +- .../requests/servers/list_addresses.rb | 2 +- .../requests/servers/list_flavors.rb | 2 +- .../requests/servers/list_flavors_detail.rb | 2 +- .../rackspace/requests/servers/list_images.rb | 2 +- .../requests/servers/list_images_detail.rb | 2 +- .../servers/list_private_addresses.rb | 2 +- .../requests/servers/list_public_addresses.rb | 2 +- .../requests/servers/list_servers.rb | 2 +- .../requests/servers/list_servers_detail.rb | 2 +- .../requests/servers/reboot_server.rb | 2 +- .../requests/servers/update_server.rb | 2 +- lib/fog/rackspace/servers.rb | 3 +- lib/fog/service.rb | 179 ++++++++++-------- lib/fog/slicehost.rb | 3 +- lib/fog/slicehost/models/flavor.rb | 2 +- lib/fog/slicehost/models/flavors.rb | 8 +- lib/fog/slicehost/models/image.rb | 2 +- lib/fog/slicehost/models/images.rb | 10 +- lib/fog/slicehost/models/server.rb | 2 +- lib/fog/slicehost/models/servers.rb | 8 +- lib/fog/slicehost/requests/create_slice.rb | 2 +- lib/fog/slicehost/requests/delete_slice.rb | 2 +- lib/fog/slicehost/requests/get_backups.rb | 2 +- lib/fog/slicehost/requests/get_flavor.rb | 2 +- lib/fog/slicehost/requests/get_flavors.rb | 2 +- lib/fog/slicehost/requests/get_image.rb | 2 +- lib/fog/slicehost/requests/get_images.rb | 2 +- lib/fog/slicehost/requests/get_slice.rb | 2 +- lib/fog/slicehost/requests/get_slices.rb | 2 +- lib/fog/slicehost/requests/reboot_slice.rb | 2 +- lib/fog/vcloud.rb | 15 +- lib/fog/vcloud/collection.rb | 2 +- lib/fog/vcloud/extension.rb | 37 ---- lib/fog/vcloud/generators.rb | 2 +- lib/fog/vcloud/model.rb | 2 +- lib/fog/vcloud/models/vdc.rb | 2 +- lib/fog/vcloud/models/vdcs.rb | 2 +- lib/fog/vcloud/requests/get_network.rb | 2 +- lib/fog/vcloud/requests/get_organization.rb | 2 +- lib/fog/vcloud/requests/get_vdc.rb | 2 +- lib/fog/vcloud/requests/get_versions.rb | 2 +- lib/fog/vcloud/requests/login.rb | 2 +- lib/fog/vcloud/service.rb | 28 +++ lib/fog/vcloud/terremark/ecloud.rb | 5 +- .../vcloud/terremark/ecloud/models/catalog.rb | 2 +- .../terremark/ecloud/models/catalog_item.rb | 2 +- .../terremark/ecloud/models/firewall_acl.rb | 2 +- .../terremark/ecloud/models/firewall_acls.rb | 2 +- .../ecloud/models/internet_service.rb | 2 +- .../ecloud/models/internet_services.rb | 2 +- lib/fog/vcloud/terremark/ecloud/models/ip.rb | 2 +- lib/fog/vcloud/terremark/ecloud/models/ips.rb | 2 +- .../vcloud/terremark/ecloud/models/network.rb | 2 +- .../terremark/ecloud/models/networks.rb | 2 +- .../vcloud/terremark/ecloud/models/node.rb | 2 +- .../vcloud/terremark/ecloud/models/nodes.rb | 2 +- .../terremark/ecloud/models/public_ip.rb | 2 +- .../terremark/ecloud/models/public_ips.rb | 2 +- .../vcloud/terremark/ecloud/models/server.rb | 2 +- .../vcloud/terremark/ecloud/models/servers.rb | 2 +- .../vcloud/terremark/ecloud/models/task.rb | 2 +- .../vcloud/terremark/ecloud/models/tasks.rb | 2 +- lib/fog/vcloud/terremark/ecloud/models/vdc.rb | 2 +- .../vcloud/terremark/ecloud/models/vdcs.rb | 2 +- .../ecloud/requests/add_internet_service.rb | 2 +- .../terremark/ecloud/requests/add_node.rb | 2 +- .../terremark/ecloud/requests/clone_vapp.rb | 2 +- .../requests/configure_internet_service.rb | 2 +- .../ecloud/requests/configure_network.rb | 2 +- .../ecloud/requests/configure_network_ip.rb | 2 +- .../ecloud/requests/configure_node.rb | 2 +- .../ecloud/requests/configure_vapp.rb | 2 +- .../requests/delete_internet_service.rb | 2 +- .../terremark/ecloud/requests/delete_node.rb | 2 +- .../terremark/ecloud/requests/delete_vapp.rb | 2 +- .../terremark/ecloud/requests/get_catalog.rb | 2 +- .../ecloud/requests/get_catalog_item.rb | 2 +- .../requests/get_customization_options.rb | 2 +- .../ecloud/requests/get_firewall_acl.rb | 2 +- .../ecloud/requests/get_firewall_acls.rb | 2 +- .../ecloud/requests/get_internet_services.rb | 2 +- .../terremark/ecloud/requests/get_network.rb | 2 +- .../ecloud/requests/get_network_extensions.rb | 2 +- .../ecloud/requests/get_network_ip.rb | 2 +- .../ecloud/requests/get_network_ips.rb | 2 +- .../terremark/ecloud/requests/get_node.rb | 2 +- .../terremark/ecloud/requests/get_nodes.rb | 2 +- .../ecloud/requests/get_public_ip.rb | 2 +- .../ecloud/requests/get_public_ips.rb | 2 +- .../terremark/ecloud/requests/get_task.rb | 2 +- .../ecloud/requests/get_task_list.rb | 2 +- .../terremark/ecloud/requests/get_vapp.rb | 2 +- .../ecloud/requests/get_vapp_template.rb | 2 +- .../terremark/ecloud/requests/get_vdc.rb | 2 +- .../requests/instantiate_vapp_template.rb | 2 +- .../terremark/ecloud/requests/power_off.rb | 2 +- .../terremark/ecloud/requests/power_on.rb | 2 +- .../terremark/ecloud/requests/power_reset.rb | 2 +- .../ecloud/requests/power_shutdown.rb | 2 +- lib/fog/vcloud/terremark/vcloud.rb | 5 +- .../terremark/vcloud/requests/get_vdc.rb | 2 +- 281 files changed, 417 insertions(+), 589 deletions(-) delete mode 100644 lib/fog/vcloud/extension.rb create mode 100644 lib/fog/vcloud/service.rb diff --git a/bin/fog b/bin/fog index f3e14279c..57ab0d66b 100755 --- a/bin/fog +++ b/bin/fog @@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'fog') require 'irb' require 'yaml' require File.join('fog', 'credentials') -Fog.credential = ARGV.first +Fog.credential = ARGV.first ? ARGV.first.to_sym : nil Fog.bin = true unless Fog.credentials exit diff --git a/lib/fog.rb b/lib/fog.rb index 08b340c0d..bab485f7c 100644 --- a/lib/fog.rb +++ b/lib/fog.rb @@ -27,17 +27,6 @@ require 'fog/parser' require 'fog/service' require 'fog/ssh' -require 'fog/aws' -require 'fog/bluebox' -require 'fog/go_grid' -require 'fog/linode' -require 'fog/local' -require 'fog/new_servers' -require 'fog/rackspace' -require 'fog/slicehost' -require 'fog/terremark' -require 'fog/vcloud' - module Fog unless const_defined?(:VERSION) @@ -92,3 +81,14 @@ module Fog end end + +require 'fog/aws' +require 'fog/bluebox' +require 'fog/go_grid' +require 'fog/linode' +require 'fog/local' +require 'fog/new_servers' +require 'fog/rackspace' +require 'fog/slicehost' +require 'fog/terremark' +require 'fog/vcloud' diff --git a/lib/fog/aws/ec2.rb b/lib/fog/aws/ec2.rb index 7bbe28a2f..03fe4bdde 100644 --- a/lib/fog/aws/ec2.rb +++ b/lib/fog/aws/ec2.rb @@ -1,7 +1,6 @@ module Fog module AWS - module EC2 - extend Fog::Service + class EC2 < Fog::Service requires :aws_access_key_id, :aws_secret_access_key diff --git a/lib/fog/aws/elb.rb b/lib/fog/aws/elb.rb index 2316cb8a2..0555334c6 100644 --- a/lib/fog/aws/elb.rb +++ b/lib/fog/aws/elb.rb @@ -1,7 +1,6 @@ module Fog module AWS - module ELB - extend Fog::Service + class ELB < Fog::Service requires :aws_access_key_id, :aws_secret_access_key diff --git a/lib/fog/aws/models/ec2/address.rb b/lib/fog/aws/models/ec2/address.rb index 6150443f7..b7fa193aa 100644 --- a/lib/fog/aws/models/ec2/address.rb +++ b/lib/fog/aws/models/ec2/address.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module AWS - module EC2 + class EC2 class Address < Fog::Model diff --git a/lib/fog/aws/models/ec2/addresses.rb b/lib/fog/aws/models/ec2/addresses.rb index ab54c58df..5a442b361 100644 --- a/lib/fog/aws/models/ec2/addresses.rb +++ b/lib/fog/aws/models/ec2/addresses.rb @@ -3,15 +3,7 @@ require 'fog/aws/models/ec2/address' module Fog module AWS - module EC2 - - module Collections - def addresses(attributes = {}) - Fog::AWS::EC2::Addresses.new({ - :connection => self - }.merge!(attributes)) - end - end + class EC2 class Addresses < Fog::Collection diff --git a/lib/fog/aws/models/ec2/flavor.rb b/lib/fog/aws/models/ec2/flavor.rb index 06a18d2d1..7a9212f6b 100644 --- a/lib/fog/aws/models/ec2/flavor.rb +++ b/lib/fog/aws/models/ec2/flavor.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module AWS - module EC2 + class EC2 class Flavor < Fog::Model @@ -18,4 +18,4 @@ module Fog end end -end \ No newline at end of file +end diff --git a/lib/fog/aws/models/ec2/flavors.rb b/lib/fog/aws/models/ec2/flavors.rb index 5bfe9da7e..655f0e740 100644 --- a/lib/fog/aws/models/ec2/flavors.rb +++ b/lib/fog/aws/models/ec2/flavors.rb @@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/flavor' module Fog module AWS - module EC2 - - module Collections - def flavors - Fog::AWS::EC2::Flavors.new(:connection => self) - end - end + class EC2 class Flavors < Fog::Collection diff --git a/lib/fog/aws/models/ec2/image.rb b/lib/fog/aws/models/ec2/image.rb index b6638ca58..2c03c63e2 100644 --- a/lib/fog/aws/models/ec2/image.rb +++ b/lib/fog/aws/models/ec2/image.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module AWS - module EC2 + class EC2 class Image < Fog::Model diff --git a/lib/fog/aws/models/ec2/images.rb b/lib/fog/aws/models/ec2/images.rb index a5bb980af..2f7e2bb3e 100644 --- a/lib/fog/aws/models/ec2/images.rb +++ b/lib/fog/aws/models/ec2/images.rb @@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/image' module Fog module AWS - module EC2 - - module Collections - def images - Fog::AWS::EC2::Images.new(:connection => self) - end - end + class EC2 class Images < Fog::Collection diff --git a/lib/fog/aws/models/ec2/key_pair.rb b/lib/fog/aws/models/ec2/key_pair.rb index b76710d0e..6982f1ac9 100644 --- a/lib/fog/aws/models/ec2/key_pair.rb +++ b/lib/fog/aws/models/ec2/key_pair.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module AWS - module EC2 + class EC2 class KeyPair < Fog::Model diff --git a/lib/fog/aws/models/ec2/key_pairs.rb b/lib/fog/aws/models/ec2/key_pairs.rb index f9e9c80ae..f0ab40b5f 100644 --- a/lib/fog/aws/models/ec2/key_pairs.rb +++ b/lib/fog/aws/models/ec2/key_pairs.rb @@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/key_pair' module Fog module AWS - module EC2 - - module Collections - def key_pairs - Fog::AWS::EC2::KeyPairs.new(:connection => self) - end - end + class EC2 class KeyPairs < Fog::Collection diff --git a/lib/fog/aws/models/ec2/security_group.rb b/lib/fog/aws/models/ec2/security_group.rb index d1bec8dfe..29058cc07 100644 --- a/lib/fog/aws/models/ec2/security_group.rb +++ b/lib/fog/aws/models/ec2/security_group.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module AWS - module EC2 + class EC2 class SecurityGroup < Fog::Model diff --git a/lib/fog/aws/models/ec2/security_groups.rb b/lib/fog/aws/models/ec2/security_groups.rb index df6e3ff75..398bf5717 100644 --- a/lib/fog/aws/models/ec2/security_groups.rb +++ b/lib/fog/aws/models/ec2/security_groups.rb @@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/security_group' module Fog module AWS - module EC2 - - module Collections - def security_groups - Fog::AWS::EC2::SecurityGroups.new(:connection => self) - end - end + class EC2 class SecurityGroups < Fog::Collection diff --git a/lib/fog/aws/models/ec2/server.rb b/lib/fog/aws/models/ec2/server.rb index 03556d3e6..4139cbfee 100644 --- a/lib/fog/aws/models/ec2/server.rb +++ b/lib/fog/aws/models/ec2/server.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module AWS - module EC2 + class EC2 class Server < Fog::Model diff --git a/lib/fog/aws/models/ec2/servers.rb b/lib/fog/aws/models/ec2/servers.rb index 36d04d3a7..398029044 100644 --- a/lib/fog/aws/models/ec2/servers.rb +++ b/lib/fog/aws/models/ec2/servers.rb @@ -3,13 +3,7 @@ require 'fog/aws/models/ec2/server' module Fog module AWS - module EC2 - - module Collections - def servers - Fog::AWS::EC2::Servers.new(:connection => self) - end - end + class EC2 class Servers < Fog::Collection diff --git a/lib/fog/aws/models/ec2/snapshot.rb b/lib/fog/aws/models/ec2/snapshot.rb index f9b16dd00..e823118d5 100644 --- a/lib/fog/aws/models/ec2/snapshot.rb +++ b/lib/fog/aws/models/ec2/snapshot.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module AWS - module EC2 + class EC2 class Snapshot < Fog::Model extend Fog::Deprecation diff --git a/lib/fog/aws/models/ec2/snapshots.rb b/lib/fog/aws/models/ec2/snapshots.rb index b205783b1..1bc2ffa07 100644 --- a/lib/fog/aws/models/ec2/snapshots.rb +++ b/lib/fog/aws/models/ec2/snapshots.rb @@ -3,15 +3,7 @@ require 'fog/aws/models/ec2/snapshot' module Fog module AWS - module EC2 - - module Collections - def snapshots(attributes = {}) - Fog::AWS::EC2::Snapshots.new({ - :connection => self - }.merge!(attributes)) - end - end + class EC2 class Snapshots < Fog::Collection diff --git a/lib/fog/aws/models/ec2/volume.rb b/lib/fog/aws/models/ec2/volume.rb index 1b618b1f8..7fa339146 100644 --- a/lib/fog/aws/models/ec2/volume.rb +++ b/lib/fog/aws/models/ec2/volume.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module AWS - module EC2 + class EC2 class Volume < Fog::Model extend Fog::Deprecation diff --git a/lib/fog/aws/models/ec2/volumes.rb b/lib/fog/aws/models/ec2/volumes.rb index 796fc3dd3..b8853288a 100644 --- a/lib/fog/aws/models/ec2/volumes.rb +++ b/lib/fog/aws/models/ec2/volumes.rb @@ -3,15 +3,7 @@ require 'fog/aws/models/ec2/volume' module Fog module AWS - module EC2 - - module Collections - def volumes(attributes = {}) - Fog::AWS::EC2::Volumes.new({ - :connection => self - }.merge!(attributes)) - end - end + class EC2 class Volumes < Fog::Collection diff --git a/lib/fog/aws/models/s3/directories.rb b/lib/fog/aws/models/s3/directories.rb index a0955df6b..c28b56149 100644 --- a/lib/fog/aws/models/s3/directories.rb +++ b/lib/fog/aws/models/s3/directories.rb @@ -3,13 +3,7 @@ require 'fog/aws/models/s3/directory' module Fog module AWS - module S3 - - module Collections - def directories - Fog::AWS::S3::Directories.new(:connection => self) - end - end + class S3 class Directories < Fog::Collection diff --git a/lib/fog/aws/models/s3/directory.rb b/lib/fog/aws/models/s3/directory.rb index 751cab23c..969994497 100644 --- a/lib/fog/aws/models/s3/directory.rb +++ b/lib/fog/aws/models/s3/directory.rb @@ -3,7 +3,7 @@ require 'fog/aws/models/s3/files' module Fog module AWS - module S3 + class S3 class Directory < Fog::Model extend Fog::Deprecation diff --git a/lib/fog/aws/models/s3/file.rb b/lib/fog/aws/models/s3/file.rb index 1c627ec5e..6398a697c 100644 --- a/lib/fog/aws/models/s3/file.rb +++ b/lib/fog/aws/models/s3/file.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module AWS - module S3 + class S3 class File < Fog::Model diff --git a/lib/fog/aws/models/s3/files.rb b/lib/fog/aws/models/s3/files.rb index b631da7b1..e91dcbdea 100644 --- a/lib/fog/aws/models/s3/files.rb +++ b/lib/fog/aws/models/s3/files.rb @@ -3,13 +3,7 @@ require 'fog/aws/models/s3/file' module Fog module AWS - module S3 - - module Collections - def files - Fog::AWS::S3::Files.new(:connection => self) - end - end + class S3 class Files < Fog::Collection diff --git a/lib/fog/aws/requests/ec2/allocate_address.rb b/lib/fog/aws/requests/ec2/allocate_address.rb index 6417ea9ad..4f79cd6b9 100644 --- a/lib/fog/aws/requests/ec2/allocate_address.rb +++ b/lib/fog/aws/requests/ec2/allocate_address.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/allocate_address' diff --git a/lib/fog/aws/requests/ec2/associate_address.rb b/lib/fog/aws/requests/ec2/associate_address.rb index d2186878a..9774d765c 100644 --- a/lib/fog/aws/requests/ec2/associate_address.rb +++ b/lib/fog/aws/requests/ec2/associate_address.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Associate an elastic IP address with an instance diff --git a/lib/fog/aws/requests/ec2/attach_volume.rb b/lib/fog/aws/requests/ec2/attach_volume.rb index 62641c033..059537720 100644 --- a/lib/fog/aws/requests/ec2/attach_volume.rb +++ b/lib/fog/aws/requests/ec2/attach_volume.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/attach_volume' diff --git a/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb b/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb index f5ffc7bc6..3e8b2d858 100644 --- a/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb +++ b/lib/fog/aws/requests/ec2/authorize_security_group_ingress.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Add permissions to a security group diff --git a/lib/fog/aws/requests/ec2/create_image.rb b/lib/fog/aws/requests/ec2/create_image.rb index c454a0b3d..9cf7cc0cd 100644 --- a/lib/fog/aws/requests/ec2/create_image.rb +++ b/lib/fog/aws/requests/ec2/create_image.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/create_image' diff --git a/lib/fog/aws/requests/ec2/create_key_pair.rb b/lib/fog/aws/requests/ec2/create_key_pair.rb index 51bd3b772..c0a32b38c 100644 --- a/lib/fog/aws/requests/ec2/create_key_pair.rb +++ b/lib/fog/aws/requests/ec2/create_key_pair.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/create_key_pair' diff --git a/lib/fog/aws/requests/ec2/create_security_group.rb b/lib/fog/aws/requests/ec2/create_security_group.rb index 3f4de1c6c..60899b76b 100644 --- a/lib/fog/aws/requests/ec2/create_security_group.rb +++ b/lib/fog/aws/requests/ec2/create_security_group.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Create a new security group diff --git a/lib/fog/aws/requests/ec2/create_snapshot.rb b/lib/fog/aws/requests/ec2/create_snapshot.rb index 415142d04..5b7d2f7c2 100644 --- a/lib/fog/aws/requests/ec2/create_snapshot.rb +++ b/lib/fog/aws/requests/ec2/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/create_snapshot' diff --git a/lib/fog/aws/requests/ec2/create_volume.rb b/lib/fog/aws/requests/ec2/create_volume.rb index 41ab96671..ca1c5b7e5 100644 --- a/lib/fog/aws/requests/ec2/create_volume.rb +++ b/lib/fog/aws/requests/ec2/create_volume.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/create_volume' diff --git a/lib/fog/aws/requests/ec2/delete_key_pair.rb b/lib/fog/aws/requests/ec2/delete_key_pair.rb index 4789d620d..c609a9937 100644 --- a/lib/fog/aws/requests/ec2/delete_key_pair.rb +++ b/lib/fog/aws/requests/ec2/delete_key_pair.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Delete a key pair that you own diff --git a/lib/fog/aws/requests/ec2/delete_security_group.rb b/lib/fog/aws/requests/ec2/delete_security_group.rb index 4a45b3873..d1b08c821 100644 --- a/lib/fog/aws/requests/ec2/delete_security_group.rb +++ b/lib/fog/aws/requests/ec2/delete_security_group.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Delete a security group that you own diff --git a/lib/fog/aws/requests/ec2/delete_snapshot.rb b/lib/fog/aws/requests/ec2/delete_snapshot.rb index dd16365ca..0bd1d5aae 100644 --- a/lib/fog/aws/requests/ec2/delete_snapshot.rb +++ b/lib/fog/aws/requests/ec2/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Delete a snapshot of an EBS volume that you own diff --git a/lib/fog/aws/requests/ec2/delete_volume.rb b/lib/fog/aws/requests/ec2/delete_volume.rb index 962667664..ca2037712 100644 --- a/lib/fog/aws/requests/ec2/delete_volume.rb +++ b/lib/fog/aws/requests/ec2/delete_volume.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Delete an EBS volume diff --git a/lib/fog/aws/requests/ec2/deregister_image.rb b/lib/fog/aws/requests/ec2/deregister_image.rb index 372236a38..72fcc9500 100644 --- a/lib/fog/aws/requests/ec2/deregister_image.rb +++ b/lib/fog/aws/requests/ec2/deregister_image.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/deregister_image' diff --git a/lib/fog/aws/requests/ec2/describe_addresses.rb b/lib/fog/aws/requests/ec2/describe_addresses.rb index 3f0538b87..54f30f6cf 100644 --- a/lib/fog/aws/requests/ec2/describe_addresses.rb +++ b/lib/fog/aws/requests/ec2/describe_addresses.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_addresses' diff --git a/lib/fog/aws/requests/ec2/describe_availability_zones.rb b/lib/fog/aws/requests/ec2/describe_availability_zones.rb index 1044e5e20..6263f296a 100644 --- a/lib/fog/aws/requests/ec2/describe_availability_zones.rb +++ b/lib/fog/aws/requests/ec2/describe_availability_zones.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_availability_zones' diff --git a/lib/fog/aws/requests/ec2/describe_images.rb b/lib/fog/aws/requests/ec2/describe_images.rb index d16453b77..f496a527f 100644 --- a/lib/fog/aws/requests/ec2/describe_images.rb +++ b/lib/fog/aws/requests/ec2/describe_images.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_images' diff --git a/lib/fog/aws/requests/ec2/describe_instances.rb b/lib/fog/aws/requests/ec2/describe_instances.rb index d6ac2a10c..74dfc55d2 100644 --- a/lib/fog/aws/requests/ec2/describe_instances.rb +++ b/lib/fog/aws/requests/ec2/describe_instances.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_instances' diff --git a/lib/fog/aws/requests/ec2/describe_key_pairs.rb b/lib/fog/aws/requests/ec2/describe_key_pairs.rb index 63385d3c8..3fad4a0f7 100644 --- a/lib/fog/aws/requests/ec2/describe_key_pairs.rb +++ b/lib/fog/aws/requests/ec2/describe_key_pairs.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_key_pairs' diff --git a/lib/fog/aws/requests/ec2/describe_regions.rb b/lib/fog/aws/requests/ec2/describe_regions.rb index 0bf43d54c..4d3e49378 100644 --- a/lib/fog/aws/requests/ec2/describe_regions.rb +++ b/lib/fog/aws/requests/ec2/describe_regions.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_regions' diff --git a/lib/fog/aws/requests/ec2/describe_reserved_instances.rb b/lib/fog/aws/requests/ec2/describe_reserved_instances.rb index 273ba6db3..f650d616e 100644 --- a/lib/fog/aws/requests/ec2/describe_reserved_instances.rb +++ b/lib/fog/aws/requests/ec2/describe_reserved_instances.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_reserved_instances' diff --git a/lib/fog/aws/requests/ec2/describe_security_groups.rb b/lib/fog/aws/requests/ec2/describe_security_groups.rb index e13eef606..ae267dcea 100644 --- a/lib/fog/aws/requests/ec2/describe_security_groups.rb +++ b/lib/fog/aws/requests/ec2/describe_security_groups.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_security_groups' diff --git a/lib/fog/aws/requests/ec2/describe_snapshots.rb b/lib/fog/aws/requests/ec2/describe_snapshots.rb index 2e7385853..cd2ac8b39 100644 --- a/lib/fog/aws/requests/ec2/describe_snapshots.rb +++ b/lib/fog/aws/requests/ec2/describe_snapshots.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_snapshots' diff --git a/lib/fog/aws/requests/ec2/describe_volumes.rb b/lib/fog/aws/requests/ec2/describe_volumes.rb index 08de87a7f..890808b4c 100644 --- a/lib/fog/aws/requests/ec2/describe_volumes.rb +++ b/lib/fog/aws/requests/ec2/describe_volumes.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/describe_volumes' diff --git a/lib/fog/aws/requests/ec2/detach_volume.rb b/lib/fog/aws/requests/ec2/detach_volume.rb index 094e27f87..f5caec747 100644 --- a/lib/fog/aws/requests/ec2/detach_volume.rb +++ b/lib/fog/aws/requests/ec2/detach_volume.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/detach_volume' diff --git a/lib/fog/aws/requests/ec2/disassociate_address.rb b/lib/fog/aws/requests/ec2/disassociate_address.rb index a1fcc54b5..21a6d6a85 100644 --- a/lib/fog/aws/requests/ec2/disassociate_address.rb +++ b/lib/fog/aws/requests/ec2/disassociate_address.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Disassociate an elastic IP address from its instance (if any) diff --git a/lib/fog/aws/requests/ec2/get_console_output.rb b/lib/fog/aws/requests/ec2/get_console_output.rb index bc6f8ad85..55198ee86 100644 --- a/lib/fog/aws/requests/ec2/get_console_output.rb +++ b/lib/fog/aws/requests/ec2/get_console_output.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/get_console_output' diff --git a/lib/fog/aws/requests/ec2/modify_image_attributes.rb b/lib/fog/aws/requests/ec2/modify_image_attributes.rb index 4c5cb69ad..d661c92f4 100644 --- a/lib/fog/aws/requests/ec2/modify_image_attributes.rb +++ b/lib/fog/aws/requests/ec2/modify_image_attributes.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Modify image attributes diff --git a/lib/fog/aws/requests/ec2/modify_snapshot_attribute.rb b/lib/fog/aws/requests/ec2/modify_snapshot_attribute.rb index 3810419a0..b958a976e 100644 --- a/lib/fog/aws/requests/ec2/modify_snapshot_attribute.rb +++ b/lib/fog/aws/requests/ec2/modify_snapshot_attribute.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Modify snapshot attributes diff --git a/lib/fog/aws/requests/ec2/reboot_instances.rb b/lib/fog/aws/requests/ec2/reboot_instances.rb index 23fb75a76..6f420d397 100644 --- a/lib/fog/aws/requests/ec2/reboot_instances.rb +++ b/lib/fog/aws/requests/ec2/reboot_instances.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Reboot specified instances diff --git a/lib/fog/aws/requests/ec2/register_image.rb b/lib/fog/aws/requests/ec2/register_image.rb index 14d2af932..62b23fe10 100644 --- a/lib/fog/aws/requests/ec2/register_image.rb +++ b/lib/fog/aws/requests/ec2/register_image.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/register_image' diff --git a/lib/fog/aws/requests/ec2/release_address.rb b/lib/fog/aws/requests/ec2/release_address.rb index f2fc3ec2b..aa24ac63c 100644 --- a/lib/fog/aws/requests/ec2/release_address.rb +++ b/lib/fog/aws/requests/ec2/release_address.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Release an elastic IP address. diff --git a/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb b/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb index 213639792..b23b11533 100644 --- a/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb +++ b/lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real # Remove permissions from a security group diff --git a/lib/fog/aws/requests/ec2/run_instances.rb b/lib/fog/aws/requests/ec2/run_instances.rb index ff7b09fcc..4ae1f8861 100644 --- a/lib/fog/aws/requests/ec2/run_instances.rb +++ b/lib/fog/aws/requests/ec2/run_instances.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/run_instances' diff --git a/lib/fog/aws/requests/ec2/start_instances.rb b/lib/fog/aws/requests/ec2/start_instances.rb index fc33a5358..5831ddee2 100644 --- a/lib/fog/aws/requests/ec2/start_instances.rb +++ b/lib/fog/aws/requests/ec2/start_instances.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/start_stop_instances' diff --git a/lib/fog/aws/requests/ec2/stop_instances.rb b/lib/fog/aws/requests/ec2/stop_instances.rb index 8ebc7a7ad..35a20edd1 100644 --- a/lib/fog/aws/requests/ec2/stop_instances.rb +++ b/lib/fog/aws/requests/ec2/stop_instances.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/start_stop_instances' diff --git a/lib/fog/aws/requests/ec2/terminate_instances.rb b/lib/fog/aws/requests/ec2/terminate_instances.rb index 9888c56da..5b0328532 100644 --- a/lib/fog/aws/requests/ec2/terminate_instances.rb +++ b/lib/fog/aws/requests/ec2/terminate_instances.rb @@ -1,6 +1,6 @@ module Fog module AWS - module EC2 + class EC2 class Real require 'fog/aws/parsers/ec2/terminate_instances' diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb index eb16fa91e..cef282fe1 100644 --- a/lib/fog/aws/requests/elb/create_load_balancer.rb +++ b/lib/fog/aws/requests/elb/create_load_balancer.rb @@ -1,6 +1,6 @@ module Fog module AWS - module ELB + class ELB class Real require 'fog/aws/parsers/elb/create_load_balancer' diff --git a/lib/fog/aws/requests/elb/delete_load_balancer.rb b/lib/fog/aws/requests/elb/delete_load_balancer.rb index 6c0d3318f..b4ca1f7fe 100644 --- a/lib/fog/aws/requests/elb/delete_load_balancer.rb +++ b/lib/fog/aws/requests/elb/delete_load_balancer.rb @@ -1,6 +1,6 @@ module Fog module AWS - module ELB + class ELB class Real require 'fog/aws/parsers/elb/delete_load_balancer' diff --git a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb index 7cd323792..44e1e0700 100644 --- a/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb +++ b/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb @@ -1,6 +1,6 @@ module Fog module AWS - module ELB + class ELB class Real require 'fog/aws/parsers/elb/deregister_instances_from_load_balancer' diff --git a/lib/fog/aws/requests/elb/describe_instance_health.rb b/lib/fog/aws/requests/elb/describe_instance_health.rb index b8e0a3de9..6ea22bf4d 100644 --- a/lib/fog/aws/requests/elb/describe_instance_health.rb +++ b/lib/fog/aws/requests/elb/describe_instance_health.rb @@ -1,6 +1,6 @@ module Fog module AWS - module ELB + class ELB class Real require 'fog/aws/parsers/elb/describe_instance_health' diff --git a/lib/fog/aws/requests/elb/describe_load_balancers.rb b/lib/fog/aws/requests/elb/describe_load_balancers.rb index 674dcc7a4..a741300a8 100644 --- a/lib/fog/aws/requests/elb/describe_load_balancers.rb +++ b/lib/fog/aws/requests/elb/describe_load_balancers.rb @@ -1,6 +1,6 @@ module Fog module AWS - module ELB + class ELB class Real require 'fog/aws/parsers/elb/describe_load_balancers' diff --git a/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb b/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb index 7e55ec8f5..0e56b4c0f 100644 --- a/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb +++ b/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb @@ -1,6 +1,6 @@ module Fog module AWS - module ELB + class ELB class Real require 'fog/aws/parsers/elb/disable_availability_zones_for_load_balancer' diff --git a/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb b/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb index 2ec961fde..e074067bb 100644 --- a/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb +++ b/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb @@ -1,6 +1,6 @@ module Fog module AWS - module ELB + class ELB class Real require 'fog/aws/parsers/elb/enable_availability_zones_for_load_balancer' diff --git a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb index aead83813..8a8f678a9 100644 --- a/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb +++ b/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb @@ -1,6 +1,6 @@ module Fog module AWS - module ELB + class ELB class Real require 'fog/aws/parsers/elb/register_instances_with_load_balancer' diff --git a/lib/fog/aws/requests/s3/copy_object.rb b/lib/fog/aws/requests/s3/copy_object.rb index 12f8edfba..91cd2d752 100644 --- a/lib/fog/aws/requests/s3/copy_object.rb +++ b/lib/fog/aws/requests/s3/copy_object.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/copy_object' diff --git a/lib/fog/aws/requests/s3/delete_bucket.rb b/lib/fog/aws/requests/s3/delete_bucket.rb index 041a4adb7..1bcde8382 100644 --- a/lib/fog/aws/requests/s3/delete_bucket.rb +++ b/lib/fog/aws/requests/s3/delete_bucket.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Delete an S3 bucket diff --git a/lib/fog/aws/requests/s3/delete_object.rb b/lib/fog/aws/requests/s3/delete_object.rb index bf8eeeb30..58a1b144c 100644 --- a/lib/fog/aws/requests/s3/delete_object.rb +++ b/lib/fog/aws/requests/s3/delete_object.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Delete an object from S3 @@ -42,4 +42,4 @@ module Fog end end end -end \ No newline at end of file +end diff --git a/lib/fog/aws/requests/s3/get_bucket.rb b/lib/fog/aws/requests/s3/get_bucket.rb index 4898c98e9..afee29b83 100644 --- a/lib/fog/aws/requests/s3/get_bucket.rb +++ b/lib/fog/aws/requests/s3/get_bucket.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/get_bucket' diff --git a/lib/fog/aws/requests/s3/get_bucket_acl.rb b/lib/fog/aws/requests/s3/get_bucket_acl.rb index 2d8eab860..fe283461c 100644 --- a/lib/fog/aws/requests/s3/get_bucket_acl.rb +++ b/lib/fog/aws/requests/s3/get_bucket_acl.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/access_control_list' diff --git a/lib/fog/aws/requests/s3/get_bucket_location.rb b/lib/fog/aws/requests/s3/get_bucket_location.rb index c73ee9894..e2f13d9e9 100644 --- a/lib/fog/aws/requests/s3/get_bucket_location.rb +++ b/lib/fog/aws/requests/s3/get_bucket_location.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/get_bucket_location' diff --git a/lib/fog/aws/requests/s3/get_bucket_logging.rb b/lib/fog/aws/requests/s3/get_bucket_logging.rb index 700acc049..154884fad 100644 --- a/lib/fog/aws/requests/s3/get_bucket_logging.rb +++ b/lib/fog/aws/requests/s3/get_bucket_logging.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/get_bucket_logging' diff --git a/lib/fog/aws/requests/s3/get_bucket_object_versions.rb b/lib/fog/aws/requests/s3/get_bucket_object_versions.rb index cdd6ae5e6..ec21dfd53 100644 --- a/lib/fog/aws/requests/s3/get_bucket_object_versions.rb +++ b/lib/fog/aws/requests/s3/get_bucket_object_versions.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/get_bucket_object_versions' diff --git a/lib/fog/aws/requests/s3/get_bucket_versioning.rb b/lib/fog/aws/requests/s3/get_bucket_versioning.rb index 391a7c233..5e9921091 100644 --- a/lib/fog/aws/requests/s3/get_bucket_versioning.rb +++ b/lib/fog/aws/requests/s3/get_bucket_versioning.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/get_bucket_versioning' diff --git a/lib/fog/aws/requests/s3/get_object.rb b/lib/fog/aws/requests/s3/get_object.rb index ed5a6e37d..c8158f317 100644 --- a/lib/fog/aws/requests/s3/get_object.rb +++ b/lib/fog/aws/requests/s3/get_object.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Get an object from S3 diff --git a/lib/fog/aws/requests/s3/get_object_acl.rb b/lib/fog/aws/requests/s3/get_object_acl.rb index 734ae0fd2..5b9814a03 100644 --- a/lib/fog/aws/requests/s3/get_object_acl.rb +++ b/lib/fog/aws/requests/s3/get_object_acl.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/access_control_list' diff --git a/lib/fog/aws/requests/s3/get_object_torrent.rb b/lib/fog/aws/requests/s3/get_object_torrent.rb index d10f3aed8..b3b2d834b 100644 --- a/lib/fog/aws/requests/s3/get_object_torrent.rb +++ b/lib/fog/aws/requests/s3/get_object_torrent.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Get torrent for an S3 object diff --git a/lib/fog/aws/requests/s3/get_object_url.rb b/lib/fog/aws/requests/s3/get_object_url.rb index 799eaf249..99ea1a667 100644 --- a/lib/fog/aws/requests/s3/get_object_url.rb +++ b/lib/fog/aws/requests/s3/get_object_url.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Get an expiring object url from S3 diff --git a/lib/fog/aws/requests/s3/get_request_payment.rb b/lib/fog/aws/requests/s3/get_request_payment.rb index a8b473eaa..2c7c4ba82 100644 --- a/lib/fog/aws/requests/s3/get_request_payment.rb +++ b/lib/fog/aws/requests/s3/get_request_payment.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/get_request_payment' diff --git a/lib/fog/aws/requests/s3/get_service.rb b/lib/fog/aws/requests/s3/get_service.rb index 171e2e970..862ac7e5c 100644 --- a/lib/fog/aws/requests/s3/get_service.rb +++ b/lib/fog/aws/requests/s3/get_service.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real require 'fog/aws/parsers/s3/get_service' diff --git a/lib/fog/aws/requests/s3/head_object.rb b/lib/fog/aws/requests/s3/head_object.rb index ea791b721..30c85f0a0 100644 --- a/lib/fog/aws/requests/s3/head_object.rb +++ b/lib/fog/aws/requests/s3/head_object.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Get headers for an object from S3 diff --git a/lib/fog/aws/requests/s3/put_bucket.rb b/lib/fog/aws/requests/s3/put_bucket.rb index f6f411b23..c632eaa6f 100644 --- a/lib/fog/aws/requests/s3/put_bucket.rb +++ b/lib/fog/aws/requests/s3/put_bucket.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Create an S3 bucket diff --git a/lib/fog/aws/requests/s3/put_bucket_acl.rb b/lib/fog/aws/requests/s3/put_bucket_acl.rb index 1f944615a..14414df0d 100644 --- a/lib/fog/aws/requests/s3/put_bucket_acl.rb +++ b/lib/fog/aws/requests/s3/put_bucket_acl.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Change access control list for an S3 bucket diff --git a/lib/fog/aws/requests/s3/put_bucket_logging.rb b/lib/fog/aws/requests/s3/put_bucket_logging.rb index df1e2ac41..a3ab90d2b 100644 --- a/lib/fog/aws/requests/s3/put_bucket_logging.rb +++ b/lib/fog/aws/requests/s3/put_bucket_logging.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Change logging status for an S3 bucket diff --git a/lib/fog/aws/requests/s3/put_bucket_versioning.rb b/lib/fog/aws/requests/s3/put_bucket_versioning.rb index 057cbe419..db90a5055 100644 --- a/lib/fog/aws/requests/s3/put_bucket_versioning.rb +++ b/lib/fog/aws/requests/s3/put_bucket_versioning.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Change versioning status for an S3 bucket diff --git a/lib/fog/aws/requests/s3/put_object.rb b/lib/fog/aws/requests/s3/put_object.rb index 18134545a..6184a841e 100644 --- a/lib/fog/aws/requests/s3/put_object.rb +++ b/lib/fog/aws/requests/s3/put_object.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Create an object in an S3 bucket diff --git a/lib/fog/aws/requests/s3/put_object_url.rb b/lib/fog/aws/requests/s3/put_object_url.rb index b274855d8..1f0ce2f0d 100644 --- a/lib/fog/aws/requests/s3/put_object_url.rb +++ b/lib/fog/aws/requests/s3/put_object_url.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Get an expiring object url from S3 for putting an object diff --git a/lib/fog/aws/requests/s3/put_request_payment.rb b/lib/fog/aws/requests/s3/put_request_payment.rb index 4bb718cf7..eda7e52d3 100644 --- a/lib/fog/aws/requests/s3/put_request_payment.rb +++ b/lib/fog/aws/requests/s3/put_request_payment.rb @@ -1,6 +1,6 @@ module Fog module AWS - module S3 + class S3 class Real # Change who pays for requests to an S3 bucket diff --git a/lib/fog/aws/requests/simpledb/batch_put_attributes.rb b/lib/fog/aws/requests/simpledb/batch_put_attributes.rb index f35945011..ec4ebaa73 100644 --- a/lib/fog/aws/requests/simpledb/batch_put_attributes.rb +++ b/lib/fog/aws/requests/simpledb/batch_put_attributes.rb @@ -1,6 +1,6 @@ module Fog module AWS - module SimpleDB + class SimpleDB class Real # Put items attributes into a SimpleDB domain diff --git a/lib/fog/aws/requests/simpledb/create_domain.rb b/lib/fog/aws/requests/simpledb/create_domain.rb index ccabf2992..1078cb34d 100644 --- a/lib/fog/aws/requests/simpledb/create_domain.rb +++ b/lib/fog/aws/requests/simpledb/create_domain.rb @@ -1,6 +1,6 @@ module Fog module AWS - module SimpleDB + class SimpleDB class Real # Create a SimpleDB domain diff --git a/lib/fog/aws/requests/simpledb/delete_attributes.rb b/lib/fog/aws/requests/simpledb/delete_attributes.rb index 8d9ba2f22..f2dcd6fae 100644 --- a/lib/fog/aws/requests/simpledb/delete_attributes.rb +++ b/lib/fog/aws/requests/simpledb/delete_attributes.rb @@ -1,6 +1,6 @@ module Fog module AWS - module SimpleDB + class SimpleDB class Real # List metadata for SimpleDB domain diff --git a/lib/fog/aws/requests/simpledb/delete_domain.rb b/lib/fog/aws/requests/simpledb/delete_domain.rb index ad9f25e57..f157cfaba 100644 --- a/lib/fog/aws/requests/simpledb/delete_domain.rb +++ b/lib/fog/aws/requests/simpledb/delete_domain.rb @@ -1,6 +1,6 @@ module Fog module AWS - module SimpleDB + class SimpleDB class Real # Delete a SimpleDB domain diff --git a/lib/fog/aws/requests/simpledb/domain_metadata.rb b/lib/fog/aws/requests/simpledb/domain_metadata.rb index 8c7a02c44..fbe988e5d 100644 --- a/lib/fog/aws/requests/simpledb/domain_metadata.rb +++ b/lib/fog/aws/requests/simpledb/domain_metadata.rb @@ -1,6 +1,6 @@ module Fog module AWS - module SimpleDB + class SimpleDB class Real require 'fog/aws/parsers/simpledb/domain_metadata' diff --git a/lib/fog/aws/requests/simpledb/get_attributes.rb b/lib/fog/aws/requests/simpledb/get_attributes.rb index 067cdb908..f2b94e74f 100644 --- a/lib/fog/aws/requests/simpledb/get_attributes.rb +++ b/lib/fog/aws/requests/simpledb/get_attributes.rb @@ -1,6 +1,6 @@ module Fog module AWS - module SimpleDB + class SimpleDB class Real require 'fog/aws/parsers/simpledb/get_attributes' diff --git a/lib/fog/aws/requests/simpledb/list_domains.rb b/lib/fog/aws/requests/simpledb/list_domains.rb index 1ed147c5f..a842102a3 100644 --- a/lib/fog/aws/requests/simpledb/list_domains.rb +++ b/lib/fog/aws/requests/simpledb/list_domains.rb @@ -1,6 +1,6 @@ module Fog module AWS - module SimpleDB + class SimpleDB class Real require 'fog/aws/parsers/simpledb/list_domains' diff --git a/lib/fog/aws/requests/simpledb/put_attributes.rb b/lib/fog/aws/requests/simpledb/put_attributes.rb index 810066b7a..435d23c2f 100644 --- a/lib/fog/aws/requests/simpledb/put_attributes.rb +++ b/lib/fog/aws/requests/simpledb/put_attributes.rb @@ -1,6 +1,6 @@ module Fog module AWS - module SimpleDB + class SimpleDB class Real # Put item attributes into a SimpleDB domain diff --git a/lib/fog/aws/requests/simpledb/select.rb b/lib/fog/aws/requests/simpledb/select.rb index 2028a0e8b..2104be75b 100644 --- a/lib/fog/aws/requests/simpledb/select.rb +++ b/lib/fog/aws/requests/simpledb/select.rb @@ -1,6 +1,6 @@ module Fog module AWS - module SimpleDB + class SimpleDB class Real require 'fog/aws/parsers/simpledb/select' diff --git a/lib/fog/aws/s3.rb b/lib/fog/aws/s3.rb index 4ece65272..9810975ba 100644 --- a/lib/fog/aws/s3.rb +++ b/lib/fog/aws/s3.rb @@ -1,7 +1,6 @@ module Fog module AWS - module S3 - extend Fog::Service + class S3 < Fog::Service requires :aws_access_key_id, :aws_secret_access_key diff --git a/lib/fog/aws/simpledb.rb b/lib/fog/aws/simpledb.rb index b59f65076..8c5fdcb32 100644 --- a/lib/fog/aws/simpledb.rb +++ b/lib/fog/aws/simpledb.rb @@ -1,7 +1,6 @@ module Fog module AWS - module SimpleDB - extend Fog::Service + class SimpleDB < Fog::Service requires :aws_access_key_id, :aws_secret_access_key diff --git a/lib/fog/bluebox.rb b/lib/fog/bluebox.rb index c6018e9fe..92e437973 100644 --- a/lib/fog/bluebox.rb +++ b/lib/fog/bluebox.rb @@ -1,6 +1,5 @@ module Fog - module Bluebox - extend Fog::Service + class Bluebox < Fog::Service requires :bluebox_api_key, :bluebox_customer_id diff --git a/lib/fog/bluebox/models/flavor.rb b/lib/fog/bluebox/models/flavor.rb index efffd1c25..7ac4a5d69 100644 --- a/lib/fog/bluebox/models/flavor.rb +++ b/lib/fog/bluebox/models/flavor.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Bluebox + class Bluebox class Flavor < Fog::Model diff --git a/lib/fog/bluebox/models/flavors.rb b/lib/fog/bluebox/models/flavors.rb index 3852b8c36..d1512e611 100644 --- a/lib/fog/bluebox/models/flavors.rb +++ b/lib/fog/bluebox/models/flavors.rb @@ -2,13 +2,7 @@ require 'fog/collection' require 'fog/bluebox/models/flavor' module Fog - module Bluebox - - module Collections - def flavors - Fog::Bluebox::Flavors.new(:connection => self) - end - end + class Bluebox class Flavors < Fog::Collection diff --git a/lib/fog/bluebox/models/image.rb b/lib/fog/bluebox/models/image.rb index 5fa21b933..8f28010de 100644 --- a/lib/fog/bluebox/models/image.rb +++ b/lib/fog/bluebox/models/image.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Bluebox + class Bluebox class Image < Fog::Model diff --git a/lib/fog/bluebox/models/images.rb b/lib/fog/bluebox/models/images.rb index 3666ed532..ce6e96408 100644 --- a/lib/fog/bluebox/models/images.rb +++ b/lib/fog/bluebox/models/images.rb @@ -2,15 +2,7 @@ require 'fog/collection' require 'fog/bluebox/models/image' module Fog - module Bluebox - - module Collections - def images(attributes = {}) - Fog::Bluebox::Images.new({ - :connection => self - }.merge!(attributes)) - end - end + class Bluebox class Images < Fog::Collection diff --git a/lib/fog/bluebox/models/server.rb b/lib/fog/bluebox/models/server.rb index 6d46cc5de..104db6a5d 100644 --- a/lib/fog/bluebox/models/server.rb +++ b/lib/fog/bluebox/models/server.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Bluebox + class Bluebox class BlockInstantiationError < StandardError; end diff --git a/lib/fog/bluebox/models/servers.rb b/lib/fog/bluebox/models/servers.rb index 4dbcc16b5..a396bf7b1 100644 --- a/lib/fog/bluebox/models/servers.rb +++ b/lib/fog/bluebox/models/servers.rb @@ -2,13 +2,7 @@ require 'fog/collection' require 'fog/bluebox/models/server' module Fog - module Bluebox - - module Collections - def servers - Fog::Bluebox::Servers.new(:connection => self) - end - end + class Bluebox class Servers < Fog::Collection diff --git a/lib/fog/bluebox/requests/create_block.rb b/lib/fog/bluebox/requests/create_block.rb index ffdfe1148..acea1469c 100644 --- a/lib/fog/bluebox/requests/create_block.rb +++ b/lib/fog/bluebox/requests/create_block.rb @@ -1,5 +1,5 @@ module Fog - module Bluebox + class Bluebox class Real # Create a new block diff --git a/lib/fog/bluebox/requests/destroy_block.rb b/lib/fog/bluebox/requests/destroy_block.rb index 6abc0ddda..519569bf5 100644 --- a/lib/fog/bluebox/requests/destroy_block.rb +++ b/lib/fog/bluebox/requests/destroy_block.rb @@ -1,5 +1,5 @@ module Fog - module Bluebox + class Bluebox class Real # Destroy a block diff --git a/lib/fog/bluebox/requests/get_block.rb b/lib/fog/bluebox/requests/get_block.rb index 96c2cdb22..d94def9e0 100644 --- a/lib/fog/bluebox/requests/get_block.rb +++ b/lib/fog/bluebox/requests/get_block.rb @@ -1,5 +1,5 @@ module Fog - module Bluebox + class Bluebox class Real # Get details of a block. diff --git a/lib/fog/bluebox/requests/get_blocks.rb b/lib/fog/bluebox/requests/get_blocks.rb index 285cd08e9..6363d4acb 100644 --- a/lib/fog/bluebox/requests/get_blocks.rb +++ b/lib/fog/bluebox/requests/get_blocks.rb @@ -1,5 +1,5 @@ module Fog - module Bluebox + class Bluebox class Real # Get list of blocks diff --git a/lib/fog/bluebox/requests/get_product.rb b/lib/fog/bluebox/requests/get_product.rb index 947ae59fa..539d4619a 100644 --- a/lib/fog/bluebox/requests/get_product.rb +++ b/lib/fog/bluebox/requests/get_product.rb @@ -1,5 +1,5 @@ module Fog - module Bluebox + class Bluebox class Real # Get details of a product diff --git a/lib/fog/bluebox/requests/get_products.rb b/lib/fog/bluebox/requests/get_products.rb index 4ba3332c3..2cbc33e90 100644 --- a/lib/fog/bluebox/requests/get_products.rb +++ b/lib/fog/bluebox/requests/get_products.rb @@ -1,5 +1,5 @@ module Fog - module Bluebox + class Bluebox class Real # Get list of products diff --git a/lib/fog/bluebox/requests/get_template.rb b/lib/fog/bluebox/requests/get_template.rb index 0142ffce2..f57fed601 100644 --- a/lib/fog/bluebox/requests/get_template.rb +++ b/lib/fog/bluebox/requests/get_template.rb @@ -1,5 +1,5 @@ module Fog - module Bluebox + class Bluebox class Real # Get details of a template diff --git a/lib/fog/bluebox/requests/get_templates.rb b/lib/fog/bluebox/requests/get_templates.rb index 616bfb57d..e01fd48e5 100644 --- a/lib/fog/bluebox/requests/get_templates.rb +++ b/lib/fog/bluebox/requests/get_templates.rb @@ -1,5 +1,5 @@ module Fog - module Bluebox + class Bluebox class Real # Get list of OS templates diff --git a/lib/fog/bluebox/requests/reboot_block.rb b/lib/fog/bluebox/requests/reboot_block.rb index 32ff1bd4e..e9bf11731 100644 --- a/lib/fog/bluebox/requests/reboot_block.rb +++ b/lib/fog/bluebox/requests/reboot_block.rb @@ -1,5 +1,5 @@ module Fog - module Bluebox + class Bluebox class Real # Reboot block diff --git a/lib/fog/go_grid.rb b/lib/fog/go_grid.rb index 02499aa33..30cb6e29b 100644 --- a/lib/fog/go_grid.rb +++ b/lib/fog/go_grid.rb @@ -1,6 +1,5 @@ module Fog - module GoGrid - extend Fog::Service + class GoGrid < Fog::Service requires :go_grid_api_key requires :go_grid_shared_secret diff --git a/lib/fog/go_grid/requests/common_lookup_list.rb b/lib/fog/go_grid/requests/common_lookup_list.rb index 9c82fe3ab..3386ef558 100644 --- a/lib/fog/go_grid/requests/common_lookup_list.rb +++ b/lib/fog/go_grid/requests/common_lookup_list.rb @@ -1,5 +1,5 @@ module Fog - module GoGrid + class GoGrid class Real # List options and lookups diff --git a/lib/fog/go_grid/requests/grid_image_list.rb b/lib/fog/go_grid/requests/grid_image_list.rb index 3e2d78eaa..b442aeeda 100644 --- a/lib/fog/go_grid/requests/grid_image_list.rb +++ b/lib/fog/go_grid/requests/grid_image_list.rb @@ -1,5 +1,5 @@ module Fog - module GoGrid + class GoGrid class Real # List images diff --git a/lib/fog/go_grid/requests/grid_ip_list.rb b/lib/fog/go_grid/requests/grid_ip_list.rb index d54b849db..721f167ca 100644 --- a/lib/fog/go_grid/requests/grid_ip_list.rb +++ b/lib/fog/go_grid/requests/grid_ip_list.rb @@ -1,5 +1,5 @@ module Fog - module GoGrid + class GoGrid class Real # List ips diff --git a/lib/fog/go_grid/requests/grid_loadbalancer_list.rb b/lib/fog/go_grid/requests/grid_loadbalancer_list.rb index b43491a0a..5ae14c76a 100644 --- a/lib/fog/go_grid/requests/grid_loadbalancer_list.rb +++ b/lib/fog/go_grid/requests/grid_loadbalancer_list.rb @@ -1,5 +1,5 @@ module Fog - module GoGrid + class GoGrid class Real # List load balancers diff --git a/lib/fog/go_grid/requests/grid_server_add.rb b/lib/fog/go_grid/requests/grid_server_add.rb index d7d2ae3c9..0f5d20086 100644 --- a/lib/fog/go_grid/requests/grid_server_add.rb +++ b/lib/fog/go_grid/requests/grid_server_add.rb @@ -1,5 +1,5 @@ module Fog - module GoGrid + class GoGrid class Real # Create a new server diff --git a/lib/fog/go_grid/requests/grid_server_delete.rb b/lib/fog/go_grid/requests/grid_server_delete.rb index b03ad3b36..30bd641bc 100644 --- a/lib/fog/go_grid/requests/grid_server_delete.rb +++ b/lib/fog/go_grid/requests/grid_server_delete.rb @@ -1,5 +1,5 @@ module Fog - module GoGrid + class GoGrid class Real # Delete a server diff --git a/lib/fog/go_grid/requests/grid_server_get.rb b/lib/fog/go_grid/requests/grid_server_get.rb index 1de597588..cadacae20 100644 --- a/lib/fog/go_grid/requests/grid_server_get.rb +++ b/lib/fog/go_grid/requests/grid_server_get.rb @@ -1,5 +1,5 @@ module Fog - module GoGrid + class GoGrid class Real # Get one or more servers by name diff --git a/lib/fog/go_grid/requests/grid_server_list.rb b/lib/fog/go_grid/requests/grid_server_list.rb index 64a2d6251..459e7885f 100644 --- a/lib/fog/go_grid/requests/grid_server_list.rb +++ b/lib/fog/go_grid/requests/grid_server_list.rb @@ -1,5 +1,5 @@ module Fog - module GoGrid + class GoGrid class Real # List servers diff --git a/lib/fog/go_grid/requests/grid_server_power.rb b/lib/fog/go_grid/requests/grid_server_power.rb index ccdf6fb67..9361566af 100644 --- a/lib/fog/go_grid/requests/grid_server_power.rb +++ b/lib/fog/go_grid/requests/grid_server_power.rb @@ -1,5 +1,5 @@ module Fog - module GoGrid + class GoGrid class Real # Start, Stop or Restart a server diff --git a/lib/fog/linode.rb b/lib/fog/linode.rb index 8cc489b67..d15232693 100644 --- a/lib/fog/linode.rb +++ b/lib/fog/linode.rb @@ -1,6 +1,5 @@ module Fog - module Linode - extend Fog::Service + class Linode < Fog::Service requires :linode_api_key diff --git a/lib/fog/linode/requests/avail_datacenters.rb b/lib/fog/linode/requests/avail_datacenters.rb index 20527fb79..38ce1f957 100644 --- a/lib/fog/linode/requests/avail_datacenters.rb +++ b/lib/fog/linode/requests/avail_datacenters.rb @@ -1,5 +1,5 @@ module Fog - module Linode + class Linode class Real # Get available data centers diff --git a/lib/fog/linode/requests/avail_distributions.rb b/lib/fog/linode/requests/avail_distributions.rb index 4138c7258..b6ab4e92d 100644 --- a/lib/fog/linode/requests/avail_distributions.rb +++ b/lib/fog/linode/requests/avail_distributions.rb @@ -1,5 +1,5 @@ module Fog - module Linode + class Linode class Real # Get available distributions diff --git a/lib/fog/linode/requests/avail_kernels.rb b/lib/fog/linode/requests/avail_kernels.rb index 9f5417904..11dbcfd03 100644 --- a/lib/fog/linode/requests/avail_kernels.rb +++ b/lib/fog/linode/requests/avail_kernels.rb @@ -1,5 +1,5 @@ module Fog - module Linode + class Linode class Real # Get available kernels diff --git a/lib/fog/linode/requests/avail_linodeplans.rb b/lib/fog/linode/requests/avail_linodeplans.rb index 304681bee..dd0750c3c 100644 --- a/lib/fog/linode/requests/avail_linodeplans.rb +++ b/lib/fog/linode/requests/avail_linodeplans.rb @@ -1,5 +1,5 @@ module Fog - module Linode + class Linode class Real # Get available plans diff --git a/lib/fog/linode/requests/avail_stackscripts.rb b/lib/fog/linode/requests/avail_stackscripts.rb index 38c9eed9d..3375f9887 100644 --- a/lib/fog/linode/requests/avail_stackscripts.rb +++ b/lib/fog/linode/requests/avail_stackscripts.rb @@ -1,5 +1,5 @@ module Fog - module Linode + class Linode class Real # Get available stack scripts diff --git a/lib/fog/linode/requests/linode_create.rb b/lib/fog/linode/requests/linode_create.rb index 8bdc56c57..4b3489c55 100644 --- a/lib/fog/linode/requests/linode_create.rb +++ b/lib/fog/linode/requests/linode_create.rb @@ -1,5 +1,5 @@ module Fog - module Linode + class Linode class Real # Creates a linode and assigns you full privileges diff --git a/lib/fog/linode/requests/linode_delete.rb b/lib/fog/linode/requests/linode_delete.rb index ac6640795..e3854b5da 100644 --- a/lib/fog/linode/requests/linode_delete.rb +++ b/lib/fog/linode/requests/linode_delete.rb @@ -1,5 +1,5 @@ module Fog - module Linode + class Linode class Real # List all linodes user has access or delete to diff --git a/lib/fog/linode/requests/linode_list.rb b/lib/fog/linode/requests/linode_list.rb index e472fa370..64aef03a3 100644 --- a/lib/fog/linode/requests/linode_list.rb +++ b/lib/fog/linode/requests/linode_list.rb @@ -1,5 +1,5 @@ module Fog - module Linode + class Linode class Real # List all linodes user has access or delete to diff --git a/lib/fog/linode/requests/linode_reboot.rb b/lib/fog/linode/requests/linode_reboot.rb index d37f7f13a..ee4d971cf 100644 --- a/lib/fog/linode/requests/linode_reboot.rb +++ b/lib/fog/linode/requests/linode_reboot.rb @@ -1,5 +1,5 @@ module Fog - module Linode + class Linode class Real # Issues a shutdown, and then a boot job for a given linode diff --git a/lib/fog/local.rb b/lib/fog/local.rb index 3b725ef5e..faa738094 100644 --- a/lib/fog/local.rb +++ b/lib/fog/local.rb @@ -1,6 +1,5 @@ module Fog - module Local - extend Fog::Service + class Local < Fog::Service requires :local_root diff --git a/lib/fog/local/models/directories.rb b/lib/fog/local/models/directories.rb index d1493e7dd..23a6f28ba 100644 --- a/lib/fog/local/models/directories.rb +++ b/lib/fog/local/models/directories.rb @@ -2,13 +2,7 @@ require 'fog/collection' require 'fog/local/models/directory' module Fog - module Local - - module Collections - def directories - Fog::Local::Directories.new(:connection => self) - end - end + class Local class Directories < Fog::Collection diff --git a/lib/fog/local/models/directory.rb b/lib/fog/local/models/directory.rb index 668189ebe..c13e2d27f 100644 --- a/lib/fog/local/models/directory.rb +++ b/lib/fog/local/models/directory.rb @@ -2,7 +2,7 @@ require 'fog/model' # require 'fog/local/models/files' module Fog - module Local + class Local class Directory < Fog::Model extend Fog::Deprecation diff --git a/lib/fog/local/models/file.rb b/lib/fog/local/models/file.rb index f2a5510b6..70659a952 100644 --- a/lib/fog/local/models/file.rb +++ b/lib/fog/local/models/file.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Local + class Local class File < Fog::Model diff --git a/lib/fog/local/models/files.rb b/lib/fog/local/models/files.rb index 5135df83d..3e1d40465 100644 --- a/lib/fog/local/models/files.rb +++ b/lib/fog/local/models/files.rb @@ -2,13 +2,7 @@ require 'fog/collection' require 'fog/local/models/file' module Fog - module Local - - module Collections - def files - Fog::Local::Files.new(:connection => self) - end - end + class Local class Files < Fog::Collection diff --git a/lib/fog/new_servers.rb b/lib/fog/new_servers.rb index deab193b0..5cd772941 100644 --- a/lib/fog/new_servers.rb +++ b/lib/fog/new_servers.rb @@ -1,8 +1,7 @@ require 'fog/parser' module Fog - module NewServers - extend Fog::Service + class NewServers < Fog::Service requires :new_servers_password requires :new_servers_username diff --git a/lib/fog/new_servers/requests/add_server.rb b/lib/fog/new_servers/requests/add_server.rb index fea7ce267..2024c62a7 100644 --- a/lib/fog/new_servers/requests/add_server.rb +++ b/lib/fog/new_servers/requests/add_server.rb @@ -1,5 +1,5 @@ module Fog - module NewServers + class NewServers class Real # Boot a new server diff --git a/lib/fog/new_servers/requests/cancel_server.rb b/lib/fog/new_servers/requests/cancel_server.rb index ad0bd771a..f43dbb3a3 100644 --- a/lib/fog/new_servers/requests/cancel_server.rb +++ b/lib/fog/new_servers/requests/cancel_server.rb @@ -1,5 +1,5 @@ module Fog - module NewServers + class NewServers class Real # Shutdown a running server diff --git a/lib/fog/new_servers/requests/get_server.rb b/lib/fog/new_servers/requests/get_server.rb index c6e850eb7..0242eeb5c 100644 --- a/lib/fog/new_servers/requests/get_server.rb +++ b/lib/fog/new_servers/requests/get_server.rb @@ -1,5 +1,5 @@ module Fog - module NewServers + class NewServers class Real # List servers diff --git a/lib/fog/new_servers/requests/list_images.rb b/lib/fog/new_servers/requests/list_images.rb index e74b5f05d..7fdc9c17f 100644 --- a/lib/fog/new_servers/requests/list_images.rb +++ b/lib/fog/new_servers/requests/list_images.rb @@ -1,5 +1,5 @@ module Fog - module NewServers + class NewServers class Real # List images diff --git a/lib/fog/new_servers/requests/list_plans.rb b/lib/fog/new_servers/requests/list_plans.rb index 9cb6c37f1..931c01e3b 100644 --- a/lib/fog/new_servers/requests/list_plans.rb +++ b/lib/fog/new_servers/requests/list_plans.rb @@ -1,5 +1,5 @@ module Fog - module NewServers + class NewServers class Real # List available plans diff --git a/lib/fog/new_servers/requests/list_servers.rb b/lib/fog/new_servers/requests/list_servers.rb index 116eb3111..69a22e7f7 100644 --- a/lib/fog/new_servers/requests/list_servers.rb +++ b/lib/fog/new_servers/requests/list_servers.rb @@ -1,5 +1,5 @@ module Fog - module NewServers + class NewServers class Real # List servers @@ -40,4 +40,3 @@ module Fog end end end - \ No newline at end of file diff --git a/lib/fog/new_servers/requests/reboot_server.rb b/lib/fog/new_servers/requests/reboot_server.rb index 7c4c68e32..19d66e1d6 100644 --- a/lib/fog/new_servers/requests/reboot_server.rb +++ b/lib/fog/new_servers/requests/reboot_server.rb @@ -1,5 +1,5 @@ module Fog - module NewServers + class NewServers class Real # Reboot a running server diff --git a/lib/fog/rackspace/files.rb b/lib/fog/rackspace/files.rb index e028aa790..c7d16b519 100644 --- a/lib/fog/rackspace/files.rb +++ b/lib/fog/rackspace/files.rb @@ -1,7 +1,6 @@ module Fog module Rackspace - module Files - extend Fog::Service + class Files < Fog::Service requires :rackspace_api_key, :rackspace_username diff --git a/lib/fog/rackspace/models/files/directories.rb b/lib/fog/rackspace/models/files/directories.rb index e23cbe173..ec4638df7 100644 --- a/lib/fog/rackspace/models/files/directories.rb +++ b/lib/fog/rackspace/models/files/directories.rb @@ -3,13 +3,7 @@ require 'fog/rackspace/models/files/directory' module Fog module Rackspace - module Files - - module Collections - def directories - Fog::Rackspace::Files::Directories.new(:connection => self) - end - end + class Files class Directories < Fog::Collection diff --git a/lib/fog/rackspace/models/files/directory.rb b/lib/fog/rackspace/models/files/directory.rb index 44517b571..7dece15bf 100644 --- a/lib/fog/rackspace/models/files/directory.rb +++ b/lib/fog/rackspace/models/files/directory.rb @@ -3,7 +3,7 @@ require 'fog/rackspace/models/files/files' module Fog module Rackspace - module Files + class Files class Directory < Fog::Model extend Fog::Deprecation diff --git a/lib/fog/rackspace/models/files/file.rb b/lib/fog/rackspace/models/files/file.rb index a0a63a4b2..18372f5e0 100644 --- a/lib/fog/rackspace/models/files/file.rb +++ b/lib/fog/rackspace/models/files/file.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module Rackspace - module Files + class Files class File < Fog::Model diff --git a/lib/fog/rackspace/models/files/files.rb b/lib/fog/rackspace/models/files/files.rb index 1d56f4160..91c9c421e 100644 --- a/lib/fog/rackspace/models/files/files.rb +++ b/lib/fog/rackspace/models/files/files.rb @@ -3,13 +3,7 @@ require 'fog/rackspace/models/files/file' module Fog module Rackspace - module Files - - module Collections - def files - Fog::Rackspace::Files::Files.new(:connection => self) - end - end + class Files class Files < Fog::Collection diff --git a/lib/fog/rackspace/models/servers/flavor.rb b/lib/fog/rackspace/models/servers/flavor.rb index 8adcc985c..925e1e501 100644 --- a/lib/fog/rackspace/models/servers/flavor.rb +++ b/lib/fog/rackspace/models/servers/flavor.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module Rackspace - module Servers + class Servers class Flavor < Fog::Model diff --git a/lib/fog/rackspace/models/servers/flavors.rb b/lib/fog/rackspace/models/servers/flavors.rb index db2122035..b9f8f3c81 100644 --- a/lib/fog/rackspace/models/servers/flavors.rb +++ b/lib/fog/rackspace/models/servers/flavors.rb @@ -3,13 +3,7 @@ require 'fog/rackspace/models/servers/flavor' module Fog module Rackspace - module Servers - - module Collections - def flavors - Fog::Rackspace::Servers::Flavors.new(:connection => self) - end - end + class Servers class Flavors < Fog::Collection diff --git a/lib/fog/rackspace/models/servers/image.rb b/lib/fog/rackspace/models/servers/image.rb index 312aeb756..a4a18da3b 100644 --- a/lib/fog/rackspace/models/servers/image.rb +++ b/lib/fog/rackspace/models/servers/image.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module Rackspace - module Servers + class Servers class Image < Fog::Model diff --git a/lib/fog/rackspace/models/servers/images.rb b/lib/fog/rackspace/models/servers/images.rb index 7cc658395..0d25aa349 100644 --- a/lib/fog/rackspace/models/servers/images.rb +++ b/lib/fog/rackspace/models/servers/images.rb @@ -3,15 +3,7 @@ require 'fog/rackspace/models/servers/image' module Fog module Rackspace - module Servers - - module Collections - def images(attributes = {}) - Fog::Rackspace::Servers::Images.new({ - :connection => self - }.merge!(attributes)) - end - end + class Servers class Images < Fog::Collection diff --git a/lib/fog/rackspace/models/servers/server.rb b/lib/fog/rackspace/models/servers/server.rb index 647bffd58..6b25bb6f2 100644 --- a/lib/fog/rackspace/models/servers/server.rb +++ b/lib/fog/rackspace/models/servers/server.rb @@ -2,7 +2,7 @@ require 'fog/model' module Fog module Rackspace - module Servers + class Servers class Server < Fog::Model diff --git a/lib/fog/rackspace/models/servers/servers.rb b/lib/fog/rackspace/models/servers/servers.rb index 9096f7e79..f7dd44eff 100644 --- a/lib/fog/rackspace/models/servers/servers.rb +++ b/lib/fog/rackspace/models/servers/servers.rb @@ -3,13 +3,7 @@ require 'fog/rackspace/models/servers/server' module Fog module Rackspace - module Servers - - module Collections - def servers - Fog::Rackspace::Servers::Servers.new(:connection => self) - end - end + class Servers class Servers < Fog::Collection diff --git a/lib/fog/rackspace/requests/files/delete_container.rb b/lib/fog/rackspace/requests/files/delete_container.rb index 3c658967f..a4cb58af2 100644 --- a/lib/fog/rackspace/requests/files/delete_container.rb +++ b/lib/fog/rackspace/requests/files/delete_container.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # Delete an existing container diff --git a/lib/fog/rackspace/requests/files/delete_object.rb b/lib/fog/rackspace/requests/files/delete_object.rb index fb38c0254..01e918dc8 100644 --- a/lib/fog/rackspace/requests/files/delete_object.rb +++ b/lib/fog/rackspace/requests/files/delete_object.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # Delete an existing container diff --git a/lib/fog/rackspace/requests/files/get_container.rb b/lib/fog/rackspace/requests/files/get_container.rb index b52d345dd..90c9d4200 100644 --- a/lib/fog/rackspace/requests/files/get_container.rb +++ b/lib/fog/rackspace/requests/files/get_container.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # Get details for container and total bytes stored diff --git a/lib/fog/rackspace/requests/files/get_containers.rb b/lib/fog/rackspace/requests/files/get_containers.rb index 6b3ead2ab..bbdfc7375 100644 --- a/lib/fog/rackspace/requests/files/get_containers.rb +++ b/lib/fog/rackspace/requests/files/get_containers.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # List existing storage containers diff --git a/lib/fog/rackspace/requests/files/get_object.rb b/lib/fog/rackspace/requests/files/get_object.rb index a7005db86..457deb956 100644 --- a/lib/fog/rackspace/requests/files/get_object.rb +++ b/lib/fog/rackspace/requests/files/get_object.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # Get details for object diff --git a/lib/fog/rackspace/requests/files/head_container.rb b/lib/fog/rackspace/requests/files/head_container.rb index 783d4e50b..ad7f9f301 100644 --- a/lib/fog/rackspace/requests/files/head_container.rb +++ b/lib/fog/rackspace/requests/files/head_container.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # List number of objects and total bytes stored diff --git a/lib/fog/rackspace/requests/files/head_containers.rb b/lib/fog/rackspace/requests/files/head_containers.rb index 62fef6221..346050b52 100644 --- a/lib/fog/rackspace/requests/files/head_containers.rb +++ b/lib/fog/rackspace/requests/files/head_containers.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # List number of containers and total bytes stored diff --git a/lib/fog/rackspace/requests/files/head_object.rb b/lib/fog/rackspace/requests/files/head_object.rb index e2fcdaf15..1c7ab6a62 100644 --- a/lib/fog/rackspace/requests/files/head_object.rb +++ b/lib/fog/rackspace/requests/files/head_object.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # Get headers for object diff --git a/lib/fog/rackspace/requests/files/put_container.rb b/lib/fog/rackspace/requests/files/put_container.rb index 3b7d5a64f..e7f58a4c3 100644 --- a/lib/fog/rackspace/requests/files/put_container.rb +++ b/lib/fog/rackspace/requests/files/put_container.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # Create a new container diff --git a/lib/fog/rackspace/requests/files/put_object.rb b/lib/fog/rackspace/requests/files/put_object.rb index 177058bbe..45e1d6a7b 100644 --- a/lib/fog/rackspace/requests/files/put_object.rb +++ b/lib/fog/rackspace/requests/files/put_object.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Files + class Files class Real # Create a new object diff --git a/lib/fog/rackspace/requests/servers/create_image.rb b/lib/fog/rackspace/requests/servers/create_image.rb index b536ef6b4..1de9bdd4f 100644 --- a/lib/fog/rackspace/requests/servers/create_image.rb +++ b/lib/fog/rackspace/requests/servers/create_image.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # Create an image from a running server diff --git a/lib/fog/rackspace/requests/servers/create_server.rb b/lib/fog/rackspace/requests/servers/create_server.rb index 1b383343f..42113eb98 100644 --- a/lib/fog/rackspace/requests/servers/create_server.rb +++ b/lib/fog/rackspace/requests/servers/create_server.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # Create a new server diff --git a/lib/fog/rackspace/requests/servers/delete_image.rb b/lib/fog/rackspace/requests/servers/delete_image.rb index c4722519b..0ef7d4976 100644 --- a/lib/fog/rackspace/requests/servers/delete_image.rb +++ b/lib/fog/rackspace/requests/servers/delete_image.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # Delete an image diff --git a/lib/fog/rackspace/requests/servers/delete_server.rb b/lib/fog/rackspace/requests/servers/delete_server.rb index bd7647b0b..8579174ba 100644 --- a/lib/fog/rackspace/requests/servers/delete_server.rb +++ b/lib/fog/rackspace/requests/servers/delete_server.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # Delete an existing server diff --git a/lib/fog/rackspace/requests/servers/get_flavor_details.rb b/lib/fog/rackspace/requests/servers/get_flavor_details.rb index 96dd85f4d..0b6eaaefe 100644 --- a/lib/fog/rackspace/requests/servers/get_flavor_details.rb +++ b/lib/fog/rackspace/requests/servers/get_flavor_details.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # Get details for flavor by id diff --git a/lib/fog/rackspace/requests/servers/get_image_details.rb b/lib/fog/rackspace/requests/servers/get_image_details.rb index 985dd74b8..d4f4bc973 100644 --- a/lib/fog/rackspace/requests/servers/get_image_details.rb +++ b/lib/fog/rackspace/requests/servers/get_image_details.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # Get details for image by id diff --git a/lib/fog/rackspace/requests/servers/get_server_details.rb b/lib/fog/rackspace/requests/servers/get_server_details.rb index 71cc23474..dbcb857e7 100644 --- a/lib/fog/rackspace/requests/servers/get_server_details.rb +++ b/lib/fog/rackspace/requests/servers/get_server_details.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # Get details about a server diff --git a/lib/fog/rackspace/requests/servers/list_addresses.rb b/lib/fog/rackspace/requests/servers/list_addresses.rb index 45e961bc6..4299fbf97 100644 --- a/lib/fog/rackspace/requests/servers/list_addresses.rb +++ b/lib/fog/rackspace/requests/servers/list_addresses.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # List all server addresses diff --git a/lib/fog/rackspace/requests/servers/list_flavors.rb b/lib/fog/rackspace/requests/servers/list_flavors.rb index 82c75f8e8..c8b9cda26 100644 --- a/lib/fog/rackspace/requests/servers/list_flavors.rb +++ b/lib/fog/rackspace/requests/servers/list_flavors.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # List all flavors (IDs and names only) diff --git a/lib/fog/rackspace/requests/servers/list_flavors_detail.rb b/lib/fog/rackspace/requests/servers/list_flavors_detail.rb index aedf57cdb..1077306f6 100644 --- a/lib/fog/rackspace/requests/servers/list_flavors_detail.rb +++ b/lib/fog/rackspace/requests/servers/list_flavors_detail.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # List all flavors diff --git a/lib/fog/rackspace/requests/servers/list_images.rb b/lib/fog/rackspace/requests/servers/list_images.rb index 6758cdcc7..7d83167e0 100644 --- a/lib/fog/rackspace/requests/servers/list_images.rb +++ b/lib/fog/rackspace/requests/servers/list_images.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # List all images (IDs and names only) diff --git a/lib/fog/rackspace/requests/servers/list_images_detail.rb b/lib/fog/rackspace/requests/servers/list_images_detail.rb index 6ac5e3a93..6c1d2de7f 100644 --- a/lib/fog/rackspace/requests/servers/list_images_detail.rb +++ b/lib/fog/rackspace/requests/servers/list_images_detail.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # List all images diff --git a/lib/fog/rackspace/requests/servers/list_private_addresses.rb b/lib/fog/rackspace/requests/servers/list_private_addresses.rb index 702d29409..1ff5a7d2c 100644 --- a/lib/fog/rackspace/requests/servers/list_private_addresses.rb +++ b/lib/fog/rackspace/requests/servers/list_private_addresses.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # List private server addresses diff --git a/lib/fog/rackspace/requests/servers/list_public_addresses.rb b/lib/fog/rackspace/requests/servers/list_public_addresses.rb index 77e4c2754..94672874e 100644 --- a/lib/fog/rackspace/requests/servers/list_public_addresses.rb +++ b/lib/fog/rackspace/requests/servers/list_public_addresses.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # List public server addresses diff --git a/lib/fog/rackspace/requests/servers/list_servers.rb b/lib/fog/rackspace/requests/servers/list_servers.rb index 78c8d69b8..8aee9c025 100644 --- a/lib/fog/rackspace/requests/servers/list_servers.rb +++ b/lib/fog/rackspace/requests/servers/list_servers.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # List all servers (IDs and names only) diff --git a/lib/fog/rackspace/requests/servers/list_servers_detail.rb b/lib/fog/rackspace/requests/servers/list_servers_detail.rb index c9b353817..953b67d4f 100644 --- a/lib/fog/rackspace/requests/servers/list_servers_detail.rb +++ b/lib/fog/rackspace/requests/servers/list_servers_detail.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # List all servers details diff --git a/lib/fog/rackspace/requests/servers/reboot_server.rb b/lib/fog/rackspace/requests/servers/reboot_server.rb index ccdc85bbb..8fe76e716 100644 --- a/lib/fog/rackspace/requests/servers/reboot_server.rb +++ b/lib/fog/rackspace/requests/servers/reboot_server.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # Reboot an existing server diff --git a/lib/fog/rackspace/requests/servers/update_server.rb b/lib/fog/rackspace/requests/servers/update_server.rb index 912e63f27..fefbb84db 100644 --- a/lib/fog/rackspace/requests/servers/update_server.rb +++ b/lib/fog/rackspace/requests/servers/update_server.rb @@ -1,6 +1,6 @@ module Fog module Rackspace - module Servers + class Servers class Real # Update an existing server diff --git a/lib/fog/rackspace/servers.rb b/lib/fog/rackspace/servers.rb index 718aaba68..4acc1f215 100644 --- a/lib/fog/rackspace/servers.rb +++ b/lib/fog/rackspace/servers.rb @@ -1,7 +1,6 @@ module Fog module Rackspace - module Servers - extend Fog::Service + class Servers < Fog::Service requires :rackspace_api_key, :rackspace_username diff --git a/lib/fog/service.rb b/lib/fog/service.rb index 568195b93..e05f1b160 100644 --- a/lib/fog/service.rb +++ b/lib/fog/service.rb @@ -1,116 +1,127 @@ module Fog - module Service + class Service - def self.extended(other) - super - other.module_eval <<-EOS, __FILE__, __LINE__ - class Error < Fog::Errors::Error; end - class NotFound < Fog::Errors::NotFound; end + class Error < Fog::Errors::Error; end + class NotFound < Fog::Errors::NotFound; end - def self.new(options={}) - if Fog.bin - default_credentials = Fog.credentials.reject {|key, value| !requirements.include?(key)} - options = default_credentials.merge(options) - end + module Collections - missing = [] - for requirement in requirements - missing << requirement unless options[requirement] - end - unless missing.empty? - if missing.length == 1 - raise(ArgumentError, [missing.first, "is required for this service"].join(' ')) - else - raise(ArgumentError, [missing[0...-1].join(", "), 'and', missing[-1], 'are required for this service'].join(' ')) + def collections + service.collections + end + + def requests + service.requests + end + + end + + class << self + + def inherited(child) + child.class_eval <<-EOS, __FILE__, __LINE__ + module Collections + include Fog::Service::Collections + + def service + #{child} end end - unless @required - for collection in collections - require [@model_path, collection].join('/') - end - for model in models - require [@model_path, model].join('/') - end - for request in requests - require [@request_path, request].join('/') - end - @required = true + def self.service + #{child} end + EOS + end - instance = if Fog.mocking? - Mock.new(options) + def new(options={}) + if Fog.bin + default_credentials = Fog.credentials.reject {|key, value| !requirements.include?(key)} + options = default_credentials.merge(options) + end + + missing = [] + for requirement in requirements + missing << requirement unless options[requirement] + end + unless missing.empty? + if missing.length == 1 + raise(ArgumentError, [missing.first, "is required for this service"].join(' ')) else - Real.new(options) + raise(ArgumentError, [missing[0...-1].join(", "), 'and', missing[-1], 'are required for this service'].join(' ')) end - - if self.respond_to?(:after_new) - instance = self.after_new(instance, options) - end - instance end - module Collections - - def collections - service.collections + unless @required + for collection in collections + require [@model_path, collection].join('/') + constant = collection.to_s.split('_').map {|characters| characters[0...1].upcase << characters[1..-1]}.join('') + service::Collections.module_eval <<-EOS, __FILE__, __LINE__ + def #{collection}(attributes={}) + #{service}::#{constant}.new({:connection => self}.merge(attributes)) + end + EOS end - - def requests - service.requests + for model in models + require [@model_path, model].join('/') end - - def service - @service ||= eval(self.class.to_s.split('::')[0...-1].join('::')) + for request in requests + require [@request_path, request].join('/') end - + @required = true end - EOS - end + if Fog.mocking? + service::Mock.new(options) + else + service::Real.new(options) + end + end - def model_path(new_path) - @model_path = new_path - end + def model_path(new_path) + @model_path = new_path + end - def collection(new_collection) - collections << new_collection - end + def collection(new_collection) + collections << new_collection + end - def collections - @collections ||= [] - end + def collections + @collections ||= [] + end - def model(new_model) - models << new_model - end + def model(new_model) + models << new_model + end - def models - @models ||= [] - end + def models + @models ||= [] + end - def request_path(new_path) - @request_path = new_path - end + def request_path(new_path) + @request_path = new_path + end - def request(new_request) - requests << new_request - end + def request(new_request) + requests << new_request + end - def requests - @requests ||= [] - end + def requests + @requests ||= [] + end - def requires(*args) - requirements.concat(args) - end + def requires(*args) + requirements.concat(args) + end - def requirements - @requirements ||= [] - end + def requirements + @requirements ||= [] + end + + def reset_data(keys=Mock.data.keys) + Mock.reset_data(keys) + end - def reset_data(keys=Mock.data.keys) - Mock.reset_data(keys) end end diff --git a/lib/fog/slicehost.rb b/lib/fog/slicehost.rb index 71a4c32e9..9a2c4d729 100644 --- a/lib/fog/slicehost.rb +++ b/lib/fog/slicehost.rb @@ -1,6 +1,5 @@ module Fog - module Slicehost - extend Fog::Service + class Slicehost < Fog::Service requires :slicehost_password diff --git a/lib/fog/slicehost/models/flavor.rb b/lib/fog/slicehost/models/flavor.rb index dc78f2c65..6185cab4f 100644 --- a/lib/fog/slicehost/models/flavor.rb +++ b/lib/fog/slicehost/models/flavor.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Slicehost + class Slicehost class Flavor < Fog::Model diff --git a/lib/fog/slicehost/models/flavors.rb b/lib/fog/slicehost/models/flavors.rb index 3727df065..d7d804286 100644 --- a/lib/fog/slicehost/models/flavors.rb +++ b/lib/fog/slicehost/models/flavors.rb @@ -2,13 +2,7 @@ require 'fog/collection' require 'fog/slicehost/models/flavor' module Fog - module Slicehost - - module Collections - def flavors - Fog::Slicehost::Flavors.new(:connection => self) - end - end + class Slicehost class Flavors < Fog::Collection diff --git a/lib/fog/slicehost/models/image.rb b/lib/fog/slicehost/models/image.rb index 97bf3cf4c..717303f81 100644 --- a/lib/fog/slicehost/models/image.rb +++ b/lib/fog/slicehost/models/image.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Slicehost + class Slicehost class Image < Fog::Model diff --git a/lib/fog/slicehost/models/images.rb b/lib/fog/slicehost/models/images.rb index d5e593f0c..ef9a3d460 100644 --- a/lib/fog/slicehost/models/images.rb +++ b/lib/fog/slicehost/models/images.rb @@ -2,15 +2,7 @@ require 'fog/collection' require 'fog/slicehost/models/image' module Fog - module Slicehost - - module Collections - def images(attributes = {}) - Fog::Slicehost::Images.new({ - :connection => self - }.merge!(attributes)) - end - end + class Slicehost class Images < Fog::Collection diff --git a/lib/fog/slicehost/models/server.rb b/lib/fog/slicehost/models/server.rb index 93c64b510..36939da23 100644 --- a/lib/fog/slicehost/models/server.rb +++ b/lib/fog/slicehost/models/server.rb @@ -1,7 +1,7 @@ require 'fog/model' module Fog - module Slicehost + class Slicehost class Server < Fog::Model diff --git a/lib/fog/slicehost/models/servers.rb b/lib/fog/slicehost/models/servers.rb index 7090967ba..eb3006634 100644 --- a/lib/fog/slicehost/models/servers.rb +++ b/lib/fog/slicehost/models/servers.rb @@ -2,13 +2,7 @@ require 'fog/collection' require 'fog/slicehost/models/server' module Fog - module Slicehost - - module Collections - def servers - Fog::Slicehost::Servers.new(:connection => self) - end - end + class Slicehost class Servers < Fog::Collection diff --git a/lib/fog/slicehost/requests/create_slice.rb b/lib/fog/slicehost/requests/create_slice.rb index dfc18edec..7070e6936 100644 --- a/lib/fog/slicehost/requests/create_slice.rb +++ b/lib/fog/slicehost/requests/create_slice.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real require 'fog/slicehost/parsers/create_slice' diff --git a/lib/fog/slicehost/requests/delete_slice.rb b/lib/fog/slicehost/requests/delete_slice.rb index 918c9c913..57c26eaf8 100644 --- a/lib/fog/slicehost/requests/delete_slice.rb +++ b/lib/fog/slicehost/requests/delete_slice.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real # Get list of slices diff --git a/lib/fog/slicehost/requests/get_backups.rb b/lib/fog/slicehost/requests/get_backups.rb index 1c7907fe5..f43fe33c0 100644 --- a/lib/fog/slicehost/requests/get_backups.rb +++ b/lib/fog/slicehost/requests/get_backups.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real require 'fog/slicehost/parsers/get_backups' diff --git a/lib/fog/slicehost/requests/get_flavor.rb b/lib/fog/slicehost/requests/get_flavor.rb index c187307c0..34d5d95e0 100644 --- a/lib/fog/slicehost/requests/get_flavor.rb +++ b/lib/fog/slicehost/requests/get_flavor.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real require 'fog/slicehost/parsers/get_flavor' diff --git a/lib/fog/slicehost/requests/get_flavors.rb b/lib/fog/slicehost/requests/get_flavors.rb index 23ab32239..fd367910a 100644 --- a/lib/fog/slicehost/requests/get_flavors.rb +++ b/lib/fog/slicehost/requests/get_flavors.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real require 'fog/slicehost/parsers/get_flavors' diff --git a/lib/fog/slicehost/requests/get_image.rb b/lib/fog/slicehost/requests/get_image.rb index a757721e4..aacff163d 100644 --- a/lib/fog/slicehost/requests/get_image.rb +++ b/lib/fog/slicehost/requests/get_image.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real require 'fog/slicehost/parsers/get_image' diff --git a/lib/fog/slicehost/requests/get_images.rb b/lib/fog/slicehost/requests/get_images.rb index 1dbb4335e..f6da578f8 100644 --- a/lib/fog/slicehost/requests/get_images.rb +++ b/lib/fog/slicehost/requests/get_images.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real require 'fog/slicehost/parsers/get_images' diff --git a/lib/fog/slicehost/requests/get_slice.rb b/lib/fog/slicehost/requests/get_slice.rb index 031a8d6da..d82ebc86e 100644 --- a/lib/fog/slicehost/requests/get_slice.rb +++ b/lib/fog/slicehost/requests/get_slice.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real require 'fog/slicehost/parsers/get_slice' diff --git a/lib/fog/slicehost/requests/get_slices.rb b/lib/fog/slicehost/requests/get_slices.rb index 777684704..1cdcf68be 100644 --- a/lib/fog/slicehost/requests/get_slices.rb +++ b/lib/fog/slicehost/requests/get_slices.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real require 'fog/slicehost/parsers/get_slices' diff --git a/lib/fog/slicehost/requests/reboot_slice.rb b/lib/fog/slicehost/requests/reboot_slice.rb index cbd04a7b1..edfee6ad9 100644 --- a/lib/fog/slicehost/requests/reboot_slice.rb +++ b/lib/fog/slicehost/requests/reboot_slice.rb @@ -1,5 +1,5 @@ module Fog - module Slicehost + class Slicehost class Real # Reboot slice diff --git a/lib/fog/vcloud.rb b/lib/fog/vcloud.rb index cd8b7e4de..1541c7c4a 100644 --- a/lib/fog/vcloud.rb +++ b/lib/fog/vcloud.rb @@ -1,12 +1,11 @@ +require 'fog/vcloud/service' require 'builder' require 'fog/vcloud/model' require 'fog/vcloud/collection' require 'fog/vcloud/generators' -require 'fog/vcloud/extension' require 'fog/vcloud/terremark/ecloud' require 'fog/vcloud/terremark/vcloud' - module URI class Generic def host_url @@ -16,8 +15,7 @@ module URI end module Fog - module Vcloud - extend Fog::Service + class Vcloud < Fog::Service requires :username, :password, :versions_uri @@ -32,13 +30,6 @@ module Fog request :get_organization request :get_network - def self.after_new(instance, options={}) - if mod = options[:module] - instance.extend eval("#{mod}") - end - instance - end - class UnsupportedVersion < Exception ; end class Real @@ -48,7 +39,7 @@ module Fog attr_reader :versions_uri def supporting_versions - ["v0.8"] + ["0.8"] end def initialize(options = {}) diff --git a/lib/fog/vcloud/collection.rb b/lib/fog/vcloud/collection.rb index 302cc014c..98734427d 100644 --- a/lib/fog/vcloud/collection.rb +++ b/lib/fog/vcloud/collection.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud class Collection < Fog::Collection def load(objects) diff --git a/lib/fog/vcloud/extension.rb b/lib/fog/vcloud/extension.rb deleted file mode 100644 index 6c5443a03..000000000 --- a/lib/fog/vcloud/extension.rb +++ /dev/null @@ -1,37 +0,0 @@ -module Fog - module Vcloud - module Extension - include Fog::Service - - @versions = [] - - def self.extended(other) - other.module_eval <<-EOS,__FILE__,__LINE__ - module #{other}::Real - extend Fog::Vcloud::Generators - end - module #{other}::Mock - end - def self.extended(klass) - unless @required - models.each do |model| - require File.join(@model_path, model.to_s) - end - requests.each do |request| - require File.join(@request_path, request.to_s) - end - @required = true - end - if Fog.mocking? - klass.extend #{other}::Real - klass.extend #{other}::Mock - else - klass.extend #{other}::Real - end - end - EOS - end - - end - end -end diff --git a/lib/fog/vcloud/generators.rb b/lib/fog/vcloud/generators.rb index 4397dcb39..ac75a7140 100644 --- a/lib/fog/vcloud/generators.rb +++ b/lib/fog/vcloud/generators.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Generators def unauthenticated_basic_request(*args) diff --git a/lib/fog/vcloud/model.rb b/lib/fog/vcloud/model.rb index 808b5da7a..c803500e2 100644 --- a/lib/fog/vcloud/model.rb +++ b/lib/fog/vcloud/model.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud class Model < Fog::Model attr_accessor :loaded diff --git a/lib/fog/vcloud/models/vdc.rb b/lib/fog/vcloud/models/vdc.rb index 205e994cf..bf1ec7dbe 100644 --- a/lib/fog/vcloud/models/vdc.rb +++ b/lib/fog/vcloud/models/vdc.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud class Vdc < Fog::Vcloud::Model identity :href diff --git a/lib/fog/vcloud/models/vdcs.rb b/lib/fog/vcloud/models/vdcs.rb index 5f690c751..77e1e6431 100644 --- a/lib/fog/vcloud/models/vdcs.rb +++ b/lib/fog/vcloud/models/vdcs.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud class Real def vdcs(options = {}) diff --git a/lib/fog/vcloud/requests/get_network.rb b/lib/fog/vcloud/requests/get_network.rb index db8357b5b..cc947c3a2 100644 --- a/lib/fog/vcloud/requests/get_network.rb +++ b/lib/fog/vcloud/requests/get_network.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud class Real basic_request :get_network diff --git a/lib/fog/vcloud/requests/get_organization.rb b/lib/fog/vcloud/requests/get_organization.rb index 740447f26..e4eb92353 100644 --- a/lib/fog/vcloud/requests/get_organization.rb +++ b/lib/fog/vcloud/requests/get_organization.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud class Real basic_request :get_organization diff --git a/lib/fog/vcloud/requests/get_vdc.rb b/lib/fog/vcloud/requests/get_vdc.rb index 7fa962544..fd89fd814 100644 --- a/lib/fog/vcloud/requests/get_vdc.rb +++ b/lib/fog/vcloud/requests/get_vdc.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud class Real basic_request :get_vdc diff --git a/lib/fog/vcloud/requests/get_versions.rb b/lib/fog/vcloud/requests/get_versions.rb index 4ca507eda..276f13d98 100644 --- a/lib/fog/vcloud/requests/get_versions.rb +++ b/lib/fog/vcloud/requests/get_versions.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud class Real unauthenticated_basic_request :get_versions diff --git a/lib/fog/vcloud/requests/login.rb b/lib/fog/vcloud/requests/login.rb index 2c86ccc86..81953c1d1 100644 --- a/lib/fog/vcloud/requests/login.rb +++ b/lib/fog/vcloud/requests/login.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud class Real diff --git a/lib/fog/vcloud/service.rb b/lib/fog/vcloud/service.rb new file mode 100644 index 000000000..30b34339c --- /dev/null +++ b/lib/fog/vcloud/service.rb @@ -0,0 +1,28 @@ +module Fog + class Vcloud < Fog::Service + class Service < Fog::Service + + class << self + + @versions = [] + + def inherited(child) + super + child.class_eval <<-EOS, __FILE__, __LINE__ + module #{child}::Real + extend Fog::Vcloud::Generators + end + module #{child}::Mock + end + EOS + child.extend(child::Real) + if Fog.mocking? + child.extend(child::Mock) + end + end + + end + + end + end +end diff --git a/lib/fog/vcloud/terremark/ecloud.rb b/lib/fog/vcloud/terremark/ecloud.rb index 07ebec22b..79750855b 100644 --- a/lib/fog/vcloud/terremark/ecloud.rb +++ b/lib/fog/vcloud/terremark/ecloud.rb @@ -1,8 +1,7 @@ module Fog - module Vcloud + class Vcloud module Terremark - module Ecloud - extend Fog::Vcloud::Extension + class Ecloud < Fog::Vcloud::Service model_path 'fog/vcloud/terremark/ecloud/models' model :catalog_item diff --git a/lib/fog/vcloud/terremark/ecloud/models/catalog.rb b/lib/fog/vcloud/terremark/ecloud/models/catalog.rb index baefc751d..42005a460 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/catalog.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/catalog.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb b/lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb index b30e6f45e..3c5414231 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class CatalogItem < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb b/lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb index d4bd5c281..dd315515d 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class FirewallAcl < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb b/lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb index 24cba598c..4c80928a7 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb b/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb index 44a9777ea..29aabefc3 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class InternetService < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb b/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb index 288501607..837824f63 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/models/ip.rb b/lib/fog/vcloud/terremark/ecloud/models/ip.rb index 35972edbf..4bb4dbab4 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/ip.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/ip.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class Ip < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/ips.rb b/lib/fog/vcloud/terremark/ecloud/models/ips.rb index b91d911d6..a1b6ac292 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/ips.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/ips.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/models/network.rb b/lib/fog/vcloud/terremark/ecloud/models/network.rb index c7dae3d8b..5379a20d7 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/network.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/network.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class Network < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/networks.rb b/lib/fog/vcloud/terremark/ecloud/models/networks.rb index e7c854007..4b11a743b 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/networks.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/networks.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/models/node.rb b/lib/fog/vcloud/terremark/ecloud/models/node.rb index 878667a47..d368055d0 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/node.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/node.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class Node < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/nodes.rb b/lib/fog/vcloud/terremark/ecloud/models/nodes.rb index 537aea686..7bf9ec2f1 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/nodes.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/nodes.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb b/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb index 229ec124d..f8912cd3d 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class PublicIp < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb b/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb index 56300ec45..2b2593ac5 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/models/server.rb b/lib/fog/vcloud/terremark/ecloud/models/server.rb index 142b0c617..68dd6dc4f 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/server.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/server.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class Server < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/servers.rb b/lib/fog/vcloud/terremark/ecloud/models/servers.rb index 0baf3e345..0b001f53b 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/servers.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/servers.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/models/task.rb b/lib/fog/vcloud/terremark/ecloud/models/task.rb index 5f59299f9..90a192b4c 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/task.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/task.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class Task < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/tasks.rb b/lib/fog/vcloud/terremark/ecloud/models/tasks.rb index 99d75ea1f..37942dfd6 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/tasks.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/tasks.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/models/vdc.rb b/lib/fog/vcloud/terremark/ecloud/models/vdc.rb index 893c1b91a..3d749d52d 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/vdc.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/vdc.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud class Vdc < Fog::Vcloud::Model diff --git a/lib/fog/vcloud/terremark/ecloud/models/vdcs.rb b/lib/fog/vcloud/terremark/ecloud/models/vdcs.rb index 746018881..c0dd5edf9 100644 --- a/lib/fog/vcloud/terremark/ecloud/models/vdcs.rb +++ b/lib/fog/vcloud/terremark/ecloud/models/vdcs.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb b/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb index 41aa2b71e..cb4954ee0 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud module Real diff --git a/lib/fog/vcloud/terremark/ecloud/requests/add_node.rb b/lib/fog/vcloud/terremark/ecloud/requests/add_node.rb index 57c177f7c..54961db92 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/add_node.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/add_node.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud module Real diff --git a/lib/fog/vcloud/terremark/ecloud/requests/clone_vapp.rb b/lib/fog/vcloud/terremark/ecloud/requests/clone_vapp.rb index 3ca12515e..a83954fdf 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/clone_vapp.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/clone_vapp.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb b/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb index 3c71aea12..47fe29c4d 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud module Real diff --git a/lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb b/lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb index 98bf8c97d..ade44f149 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud module Real diff --git a/lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb b/lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb index a5a37cc05..42ce75afb 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud module Real diff --git a/lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb b/lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb index 952ded274..7d3fb598d 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud module Real diff --git a/lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb b/lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb index f6450d7e2..b02e4db2a 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud module Real diff --git a/lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb b/lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb index b3f0e6c29..137c1b744 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb b/lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb index 63474b419..54bcb4ca4 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb b/lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb index 5bca0d3af..4853c7b82 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb index 6f19e0a0d..2ea837b41 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb index 18182bc92..6e244a301 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb index d6441b52c..d5fe9fd1f 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acl.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acl.rb index 37c9573df..9fa593fab 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acl.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acl.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acls.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acls.rb index 02a4f6ed6..716590f36 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acls.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acls.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb index 970c3d0f0..8d1e8e925 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_network.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_network.rb index de0239981..01d8b3124 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_network.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_network.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb index 3d0b3a269..04025aa88 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb index a2df69bdf..179bcc9f1 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb @@ -3,7 +3,7 @@ # module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb index da2031dbb..86cb51307 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb @@ -3,7 +3,7 @@ # module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_node.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_node.rb index d6edeba90..683b46bb3 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_node.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_node.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb index 547949489..c9c4cff00 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb index 708908970..feaec31c2 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb index 14fdfcd8b..40835919e 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_task.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_task.rb index 45c53450e..c36c8ef39 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_task.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_task.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb index f0bc1d30b..34ca02c85 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb index 2dc74daf3..e002187e3 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_vapp_template.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_vapp_template.rb index d49827038..c190ad331 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_vapp_template.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_vapp_template.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb b/lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb index 4bb8b29a9..67d841f5a 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb b/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb index 02475ed53..86524311b 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/power_off.rb b/lib/fog/vcloud/terremark/ecloud/requests/power_off.rb index 05c67741a..6f1823039 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/power_off.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/power_off.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/power_on.rb b/lib/fog/vcloud/terremark/ecloud/requests/power_on.rb index 9d8abf30b..1303561ed 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/power_on.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/power_on.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb b/lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb index a1408eadc..cd1028889 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb b/lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb index 88f6f6609..0a76cabff 100644 --- a/lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb +++ b/lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Ecloud diff --git a/lib/fog/vcloud/terremark/vcloud.rb b/lib/fog/vcloud/terremark/vcloud.rb index 08c9b9b3b..eac0c2698 100644 --- a/lib/fog/vcloud/terremark/vcloud.rb +++ b/lib/fog/vcloud/terremark/vcloud.rb @@ -1,8 +1,7 @@ module Fog - module Vcloud + class Vcloud module Terremark - module Vcloud - extend Fog::Vcloud::Extension + class Vcloud < Fog::Vcloud::Service request_path 'fog/vcloud/terremark/vcloud/requests' request :get_vdc diff --git a/lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb b/lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb index 9c640c285..7d586eada 100644 --- a/lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb +++ b/lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb @@ -1,5 +1,5 @@ module Fog - module Vcloud + class Vcloud module Terremark module Vcloud