From 9ea5432fde8ce3e7842fd5209e03cdb3518057d7 Mon Sep 17 00:00:00 2001 From: geemus Date: Thu, 19 May 2011 15:35:33 -0700 Subject: [PATCH] [mock] cleanup and reset related fixes --- docs/about/contributing.markdown | 2 +- .../requests/simpledb/batch_put_attributes.rb | 10 +++++----- lib/fog/aws/requests/simpledb/create_domain.rb | 2 +- .../aws/requests/simpledb/delete_attributes.rb | 6 +++--- lib/fog/aws/requests/simpledb/delete_domain.rb | 2 +- .../aws/requests/simpledb/domain_metadata.rb | 2 +- .../aws/requests/simpledb/get_attributes.rb | 10 +++++----- lib/fog/aws/requests/simpledb/list_domains.rb | 4 ++-- .../aws/requests/simpledb/put_attributes.rb | 12 ++++++------ lib/fog/aws/simpledb.rb | 6 ++++-- lib/fog/cdn/aws.rb | 6 ++++-- lib/fog/cdn/rackspace.rb | 6 ++++-- lib/fog/compute/aws.rb | 6 +++--- lib/fog/compute/bluebox.rb | 6 ++++-- lib/fog/compute/ecloud.rb | 5 +++++ lib/fog/compute/go_grid.rb | 6 ++++-- lib/fog/compute/linode.rb | 6 ++++-- lib/fog/compute/new_servers.rb | 6 ++++-- lib/fog/compute/rackspace.rb | 6 ++++-- .../compute/requests/aws/allocate_address.rb | 4 ++-- .../compute/requests/aws/associate_address.rb | 4 ++-- lib/fog/compute/requests/aws/attach_volume.rb | 4 ++-- .../aws/authorize_security_group_ingress.rb | 6 +++--- .../compute/requests/aws/create_key_pair.rb | 4 ++-- .../requests/aws/create_security_group.rb | 6 +++--- .../compute/requests/aws/create_snapshot.rb | 8 ++++---- lib/fog/compute/requests/aws/create_tags.rb | 10 +++++----- lib/fog/compute/requests/aws/create_volume.rb | 4 ++-- .../compute/requests/aws/delete_key_pair.rb | 2 +- .../requests/aws/delete_security_group.rb | 4 ++-- .../compute/requests/aws/delete_snapshot.rb | 2 +- lib/fog/compute/requests/aws/delete_tags.rb | 6 +++--- lib/fog/compute/requests/aws/delete_volume.rb | 4 ++-- .../compute/requests/aws/describe_addresses.rb | 2 +- .../compute/requests/aws/describe_images.rb | 2 +- .../compute/requests/aws/describe_instances.rb | 18 +++++++++--------- .../compute/requests/aws/describe_key_pairs.rb | 2 +- .../requests/aws/describe_security_groups.rb | 2 +- .../compute/requests/aws/describe_snapshots.rb | 2 +- .../compute/requests/aws/describe_volumes.rb | 10 +++++----- lib/fog/compute/requests/aws/detach_volume.rb | 2 +- .../requests/aws/disassociate_address.rb | 4 ++-- .../compute/requests/aws/get_console_output.rb | 2 +- .../compute/requests/aws/get_password_data.rb | 2 +- .../compute/requests/aws/import_key_pair.rb | 4 ++-- .../compute/requests/aws/monitor_instances.rb | 2 +- .../compute/requests/aws/reboot_instances.rb | 4 ++-- .../compute/requests/aws/release_address.rb | 2 +- .../aws/revoke_security_group_ingress.rb | 2 +- lib/fog/compute/requests/aws/run_instances.rb | 6 +++--- .../requests/aws/terminate_instances.rb | 6 +++--- .../requests/aws/unmonitor_instances.rb | 2 +- .../compute/requests/go_grid/grid_image_get.rb | 2 +- .../requests/go_grid/grid_image_list.rb | 2 +- .../rackspace/confirm_resized_server.rb | 6 +++--- .../compute/requests/rackspace/create_image.rb | 4 ++-- .../requests/rackspace/create_server.rb | 4 ++-- .../compute/requests/rackspace/delete_image.rb | 4 ++-- .../requests/rackspace/delete_server.rb | 4 ++-- .../requests/rackspace/list_images_detail.rb | 4 ++-- .../requests/rackspace/list_servers_detail.rb | 4 ++-- .../requests/rackspace/resize_server.rb | 8 ++++---- .../rackspace/revert_resized_server.rb | 8 ++++---- lib/fog/compute/slicehost.rb | 6 ++++-- lib/fog/compute/storm_on_demand.rb | 9 ++++++++- lib/fog/compute/voxel.rb | 6 ++++-- lib/fog/core/mock.rb | 2 +- lib/fog/dns/aws.rb | 6 ++++-- lib/fog/dns/bluebox.rb | 6 ++++-- lib/fog/dns/dnsimple.rb | 6 ++++-- lib/fog/dns/linode.rb | 6 ++++-- lib/fog/dns/slicehost.rb | 6 ++++-- lib/fog/dns/zerigo.rb | 6 ++++-- lib/fog/storage/aws.rb | 6 ++++-- lib/fog/storage/google.rb | 10 ++++++---- lib/fog/storage/local.rb | 6 ++++-- lib/fog/storage/rackspace.rb | 6 ++++-- lib/fog/storage/requests/aws/copy_object.rb | 4 ++-- lib/fog/storage/requests/aws/delete_bucket.rb | 6 +++--- lib/fog/storage/requests/aws/delete_object.rb | 2 +- lib/fog/storage/requests/aws/get_bucket.rb | 2 +- lib/fog/storage/requests/aws/get_bucket_acl.rb | 2 +- .../requests/aws/get_bucket_location.rb | 2 +- lib/fog/storage/requests/aws/get_object.rb | 2 +- lib/fog/storage/requests/aws/get_object_acl.rb | 2 +- .../requests/aws/get_request_payment.rb | 2 +- lib/fog/storage/requests/aws/get_service.rb | 2 +- lib/fog/storage/requests/aws/put_bucket.rb | 6 +++--- lib/fog/storage/requests/aws/put_object.rb | 6 +++--- .../requests/aws/put_request_payment.rb | 2 +- lib/fog/storage/requests/google/copy_object.rb | 4 ++-- .../storage/requests/google/delete_bucket.rb | 6 +++--- .../storage/requests/google/delete_object.rb | 2 +- lib/fog/storage/requests/google/get_bucket.rb | 2 +- .../storage/requests/google/get_bucket_acl.rb | 2 +- lib/fog/storage/requests/google/get_object.rb | 2 +- .../storage/requests/google/get_object_acl.rb | 2 +- lib/fog/storage/requests/google/get_service.rb | 4 ++-- lib/fog/storage/requests/google/put_bucket.rb | 6 +++--- lib/fog/storage/requests/google/put_object.rb | 6 +++--- .../terremark/requests/shared/get_network.rb | 2 +- .../requests/shared/get_organization.rb | 2 +- .../requests/shared/get_organizations.rb | 2 +- .../requests/shared/get_public_ips.rb | 2 +- lib/fog/terremark/requests/shared/get_vdc.rb | 2 +- lib/fog/terremark/shared.rb | 4 ++++ lib/fog/terremark/vcloud.rb | 12 +++++++++++- spec/ecloud/spec_helper.rb | 6 +++--- 108 files changed, 282 insertions(+), 216 deletions(-) diff --git a/docs/about/contributing.markdown b/docs/about/contributing.markdown index e82938406..79803ea38 100644 --- a/docs/about/contributing.markdown +++ b/docs/about/contributing.markdown @@ -201,7 +201,7 @@ For instance: class Mock def destroy_server(server_identity) - if data = @data[:servers].delete(server_identity) + if data = self.data[:servers].delete(server_identity) response = Excon::Response.new response.status = 202 response.body = data diff --git a/lib/fog/aws/requests/simpledb/batch_put_attributes.rb b/lib/fog/aws/requests/simpledb/batch_put_attributes.rb index ec4ebaa73..6af08287a 100644 --- a/lib/fog/aws/requests/simpledb/batch_put_attributes.rb +++ b/lib/fog/aws/requests/simpledb/batch_put_attributes.rb @@ -34,16 +34,16 @@ module Fog def batch_put_attributes(domain_name, items, replace_attributes = Hash.new([])) response = Excon::Response.new - if @data[:domains][domain_name] + if self.data[:domains][domain_name] for item_name, attributes in items do for key, value in attributes do - @data[:domains][domain_name][item_name] ||= {} + self.data[:domains][domain_name][item_name] ||= {} if replace_attributes[item_name] && replace_attributes[item_name].include?(key) - @data[:domains][domain_name][item_name][key.to_s] = [] + self.data[:domains][domain_name][item_name][key.to_s] = [] else - @data[:domains][domain_name][item_name][key.to_s] ||= [] + self.data[:domains][domain_name][item_name][key.to_s] ||= [] end - @data[:domains][domain_name][item_name][key.to_s] << value.to_s + self.data[:domains][domain_name][item_name][key.to_s] << value.to_s end end response.status = 200 diff --git a/lib/fog/aws/requests/simpledb/create_domain.rb b/lib/fog/aws/requests/simpledb/create_domain.rb index c4a2a2a7e..6101ddafc 100644 --- a/lib/fog/aws/requests/simpledb/create_domain.rb +++ b/lib/fog/aws/requests/simpledb/create_domain.rb @@ -29,7 +29,7 @@ module Fog def create_domain(domain_name) response = Excon::Response.new - @data[:domains][domain_name] = {} + self.data[:domains][domain_name] = {} response.status = 200 response.body = { 'BoxUsage' => Fog::AWS::Mock.box_usage, diff --git a/lib/fog/aws/requests/simpledb/delete_attributes.rb b/lib/fog/aws/requests/simpledb/delete_attributes.rb index 7fefed80a..7aa8696ae 100644 --- a/lib/fog/aws/requests/simpledb/delete_attributes.rb +++ b/lib/fog/aws/requests/simpledb/delete_attributes.rb @@ -37,11 +37,11 @@ module Fog def delete_attributes(domain_name, item_name, attributes = nil) response = Excon::Response.new - if @data[:domains][domain_name] + if self.data[:domains][domain_name] if attributes for key, value in attributes - if @data[:domains][domain_name][key] - @data[:domains][domain_name][key].delete('value') + if self.data[:domains][domain_name][key] + self.data[:domains][domain_name][key].delete('value') end end end diff --git a/lib/fog/aws/requests/simpledb/delete_domain.rb b/lib/fog/aws/requests/simpledb/delete_domain.rb index 30df4d3d9..628219945 100644 --- a/lib/fog/aws/requests/simpledb/delete_domain.rb +++ b/lib/fog/aws/requests/simpledb/delete_domain.rb @@ -29,7 +29,7 @@ module Fog def delete_domain(domain_name) response = Excon::Response.new - if @data[:domains].delete(domain_name) + if self.data[:domains].delete(domain_name) response.status = 200 response.body = { 'BoxUsage' => Fog::AWS::Mock.box_usage, diff --git a/lib/fog/aws/requests/simpledb/domain_metadata.rb b/lib/fog/aws/requests/simpledb/domain_metadata.rb index 515f3a718..213856bef 100644 --- a/lib/fog/aws/requests/simpledb/domain_metadata.rb +++ b/lib/fog/aws/requests/simpledb/domain_metadata.rb @@ -38,7 +38,7 @@ module Fog def domain_metadata(domain_name) response = Excon::Response.new - if domain = @data[:domains][domain_name] + if domain = self.data[:domains][domain_name] response.status = 200 attribute_names = [] diff --git a/lib/fog/aws/requests/simpledb/get_attributes.rb b/lib/fog/aws/requests/simpledb/get_attributes.rb index 0ba081b78..89a99a4c9 100644 --- a/lib/fog/aws/requests/simpledb/get_attributes.rb +++ b/lib/fog/aws/requests/simpledb/get_attributes.rb @@ -42,16 +42,16 @@ module Fog def get_attributes(domain_name, item_name, attributes = nil) response = Excon::Response.new - if @data[:domains][domain_name] + if self.data[:domains][domain_name] object = {} if attributes for attribute in attributes - if @data[:domains][domain_name][item_name] && @data[:domains][domain_name][item_name] - object[attribute] = @data[:domains][domain_name][item_name][attribute] + if self.data[:domains][domain_name][item_name] && self.data[:domains][domain_name][item_name] + object[attribute] = self.data[:domains][domain_name][item_name][attribute] end end - elsif @data[:domains][domain_name][item_name] - object = @data[:domains][domain_name][item_name] + elsif self.data[:domains][domain_name][item_name] + object = self.data[:domains][domain_name][item_name] end response.status = 200 response.body = { diff --git a/lib/fog/aws/requests/simpledb/list_domains.rb b/lib/fog/aws/requests/simpledb/list_domains.rb index 0742b4c20..c76829e44 100644 --- a/lib/fog/aws/requests/simpledb/list_domains.rb +++ b/lib/fog/aws/requests/simpledb/list_domains.rb @@ -34,11 +34,11 @@ module Fog def list_domains(options = {}) response = Excon::Response.new - keys = @data[:domains].keys + keys = self.data[:domains].keys max = options['MaxNumberOfDomains'] || keys.size offset = options['NextToken'] || 0 domains = [] - for key, value in @data[:domains].keys[offset...max] + for key, value in self.data[:domains].keys[offset...max] domains << key end response.status = 200 diff --git a/lib/fog/aws/requests/simpledb/put_attributes.rb b/lib/fog/aws/requests/simpledb/put_attributes.rb index deeca8298..c891100bd 100644 --- a/lib/fog/aws/requests/simpledb/put_attributes.rb +++ b/lib/fog/aws/requests/simpledb/put_attributes.rb @@ -43,20 +43,20 @@ module Fog options[:expect] = {} unless options[:expect] options[:replace] = [] unless options[:replace] response = Excon::Response.new - if @data[:domains][domain_name] + if self.data[:domains][domain_name] options[:expect].each do |ck, cv| - if @data[:domains][domain_name][item_name][ck] != [cv] + if self.data[:domains][domain_name][item_name][ck] != [cv] response.status = 409 raise(Excon::Errors.status_error({:expects => 200}, response)) end end attributes.each do |key, value| - @data[:domains][domain_name][item_name] ||= {} - @data[:domains][domain_name][item_name][key.to_s] = [] unless @data[:domains][domain_name][item_name][key.to_s] + self.data[:domains][domain_name][item_name] ||= {} + self.data[:domains][domain_name][item_name][key.to_s] = [] unless self.data[:domains][domain_name][item_name][key.to_s] if options[:replace].include?(key.to_s) - @data[:domains][domain_name][item_name][key.to_s] = [*value].map {|x| x.to_s} + self.data[:domains][domain_name][item_name][key.to_s] = [*value].map {|x| x.to_s} else - @data[:domains][domain_name][item_name][key.to_s] += [*value].map {|x| x.to_s} + self.data[:domains][domain_name][item_name][key.to_s] += [*value].map {|x| x.to_s} end end response.status = 200 diff --git a/lib/fog/aws/simpledb.rb b/lib/fog/aws/simpledb.rb index 70c4d08f3..ce5bc8837 100644 --- a/lib/fog/aws/simpledb.rb +++ b/lib/fog/aws/simpledb.rb @@ -32,12 +32,14 @@ module Fog def initialize(options={}) @aws_access_key_id = options[:aws_access_key_id] - @data = self.class.data[@aws_access_key_id] + end + + def data + self.class.data[@aws_access_key_id] end def reset_data self.class.data.delete(@aws_access_key_id) - @data = self.class.data[@aws_access_key_id] end end diff --git a/lib/fog/cdn/aws.rb b/lib/fog/cdn/aws.rb index 4d510ac51..54e7c4691 100644 --- a/lib/fog/cdn/aws.rb +++ b/lib/fog/cdn/aws.rb @@ -43,12 +43,14 @@ module Fog require 'mime/types' @aws_access_key_id = options[:aws_access_key_id] @region = options[:region] - @data = self.class.data[@region][@aws_access_key_id] + end + + def data + self.class.data[@region][@aws_access_key_id] end def reset_data self.class.data[@region].delete(@aws_access_key_id) - @data = self.class.data[@region][@aws_access_key_id] end def signature(params) diff --git a/lib/fog/cdn/rackspace.rb b/lib/fog/cdn/rackspace.rb index 90c3bac2a..2b67b98f4 100644 --- a/lib/fog/cdn/rackspace.rb +++ b/lib/fog/cdn/rackspace.rb @@ -35,12 +35,14 @@ module Fog end @rackspace_username = options[:rackspace_username] - @data = self.class.data[@rackspace_username] + end + + def data + self.class.data[@rackspace_username] end def reset_data self.class.data.delete(@rackspace_username) - @data = self.class.data[@rackspace_username] end end diff --git a/lib/fog/compute/aws.rb b/lib/fog/compute/aws.rb index 2b24f18f1..d6f2771bb 100644 --- a/lib/fog/compute/aws.rb +++ b/lib/fog/compute/aws.rb @@ -146,14 +146,14 @@ module Fog unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1'].include?(@region) raise ArgumentError, "Unknown region: #{@region.inspect}" end + end - @data = self.class.data[@region][@aws_access_key_id] - @owner_id = @data[:owner_id] + def data + self.class.data[@region][@aws_access_key_id] end def reset_data self.class.data[@region].delete(@aws_access_key_id) - @data = self.class.data[@region][@aws_access_key_id] end def apply_tag_filters(resources, filters) diff --git a/lib/fog/compute/bluebox.rb b/lib/fog/compute/bluebox.rb index f55eca925..1cdf4e9b6 100644 --- a/lib/fog/compute/bluebox.rb +++ b/lib/fog/compute/bluebox.rb @@ -46,12 +46,14 @@ module Fog end @bluebox_api_key = options[:bluebox_api_key] - @data = self.class.data[@bluebox_api_key] + end + + def data + self.class.data[@bluebox_api_key] end def reset_data self.class.data.delete(@bluebox_api_key) - @data = self.class.data[@bluebox_api_key] end end diff --git a/lib/fog/compute/ecloud.rb b/lib/fog/compute/ecloud.rb index 767ed3401..fc5a23dff 100644 --- a/lib/fog/compute/ecloud.rb +++ b/lib/fog/compute/ecloud.rb @@ -1065,6 +1065,11 @@ module Fog @mock_data = nil end + def self.data_reset + Formatador.display_line("[yellow][WARN] #{self} => #data_reset is deprecated, use #reset instead[/] [light_black](#{caller.first})[/]") + self.reset + end + def initialize(options = {}) require 'builder' require 'fog/core/parser' diff --git a/lib/fog/compute/go_grid.rb b/lib/fog/compute/go_grid.rb index bad4c2377..87884802c 100644 --- a/lib/fog/compute/go_grid.rb +++ b/lib/fog/compute/go_grid.rb @@ -50,12 +50,14 @@ module Fog @go_grid_api_key = options[:go_grid_api_key] @go_grid_shared_secret = options[:go_grid_shared_secret] - @data = self.class.data[@go_grid_api_key] + end + + def data + self.class.data[@go_grid_api_key] end def reset_data self.class.data.delete(@go_grid_api_key) - @data = self.class.data[@go_grid_api_key] end end diff --git a/lib/fog/compute/linode.rb b/lib/fog/compute/linode.rb index 7c9b91751..ed6d1bd9f 100644 --- a/lib/fog/compute/linode.rb +++ b/lib/fog/compute/linode.rb @@ -44,12 +44,14 @@ module Fog end @linode_api_key = options[:linode_api_key] - @data = self.class.data[@linode_api_key] + end + + def data + self.class.data[@linode_api_key] end def reset_data self.class.data.delete(@linode_api_key) - @data = self.class.data[@linode_api_key] end end diff --git a/lib/fog/compute/new_servers.rb b/lib/fog/compute/new_servers.rb index d3ae028f8..b68353d6b 100644 --- a/lib/fog/compute/new_servers.rb +++ b/lib/fog/compute/new_servers.rb @@ -38,12 +38,14 @@ module Fog end @new_server_username = options[:new_servers_username] - @data = self.class.data[@new_server_username] + end + + def data + self.class.data[@new_server_username] end def reset_data self.class.data.delete(@new_server_username) - @data = self.class.data[@new_server_username] end end diff --git a/lib/fog/compute/rackspace.rb b/lib/fog/compute/rackspace.rb index da871cbec..100cae669 100644 --- a/lib/fog/compute/rackspace.rb +++ b/lib/fog/compute/rackspace.rb @@ -66,12 +66,14 @@ module Fog end @rackspace_username = options[:rackspace_username] - @data = self.class.data[@rackspace_username] + end + + def data + self.class.data[@rackspace_username] end def reset_data self.class.data.delete(@rackspace_username) - @data = self.class.data[@rackspace_username] end end diff --git a/lib/fog/compute/requests/aws/allocate_address.rb b/lib/fog/compute/requests/aws/allocate_address.rb index 65d6edae7..a99b405d1 100644 --- a/lib/fog/compute/requests/aws/allocate_address.rb +++ b/lib/fog/compute/requests/aws/allocate_address.rb @@ -27,14 +27,14 @@ module Fog def allocate_address response = Excon::Response.new - if describe_addresses.body['addressesSet'].size < @data[:limits][:addresses] + if describe_addresses.body['addressesSet'].size < self.data[:limits][:addresses] response.status = 200 public_ip = Fog::AWS::Mock.ip_address data ={ 'instanceId' => nil, 'publicIp' => public_ip } - @data[:addresses][public_ip] = data + self.data[:addresses][public_ip] = data response.body = { 'publicIp' => public_ip, 'requestId' => Fog::AWS::Mock.request_id diff --git a/lib/fog/compute/requests/aws/associate_address.rb b/lib/fog/compute/requests/aws/associate_address.rb index afa73089b..e5401ac66 100644 --- a/lib/fog/compute/requests/aws/associate_address.rb +++ b/lib/fog/compute/requests/aws/associate_address.rb @@ -35,8 +35,8 @@ module Fog def associate_address(instance_id, public_ip) response = Excon::Response.new response.status = 200 - instance = @data[:instances][instance_id] - address = @data[:addresses][public_ip] + instance = self.data[:instances][instance_id] + address = self.data[:addresses][public_ip] if instance && address address['instanceId'] = instance_id instance['originalIpAddress'] = instance['ipAddress'] diff --git a/lib/fog/compute/requests/aws/attach_volume.rb b/lib/fog/compute/requests/aws/attach_volume.rb index 07fb6537e..d0b79e7bc 100644 --- a/lib/fog/compute/requests/aws/attach_volume.rb +++ b/lib/fog/compute/requests/aws/attach_volume.rb @@ -42,8 +42,8 @@ module Fog response = Excon::Response.new if instance_id && volume_id && device response.status = 200 - instance = @data[:instances][instance_id] - volume = @data[:volumes][volume_id] + instance = self.data[:instances][instance_id] + volume = self.data[:volumes][volume_id] if instance && volume unless volume['status'] == 'available' raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is unavailable") diff --git a/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb b/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb index d66ae4e5b..600600b53 100644 --- a/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb +++ b/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb @@ -58,14 +58,14 @@ module Fog end response = Excon::Response.new - group = @data[:security_groups][group_name] + group = self.data[:security_groups][group_name] if group group['ipPermissions'] ||= [] if group_name && options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId'] ['tcp', 'udp'].each do |protocol| group['ipPermissions'] << { - 'groups' => [{'groupName' => group_name, 'userId' => @owner_id}], + 'groups' => [{'groupName' => group_name, 'userId' => self.data[:owner_id]}], 'fromPort' => 1, 'ipRanges' => [], 'ipProtocol' => protocol, @@ -73,7 +73,7 @@ module Fog } end group['ipPermissions'] << { - 'groups' => [{'groupName' => group_name, 'userId' => @owner_id}], + 'groups' => [{'groupName' => group_name, 'userId' => self.data[:owner_id]}], 'fromPort' => -1, 'ipRanges' => [], 'ipProtocol' => 'icmp', diff --git a/lib/fog/compute/requests/aws/create_key_pair.rb b/lib/fog/compute/requests/aws/create_key_pair.rb index fb40341d4..0b648cd63 100644 --- a/lib/fog/compute/requests/aws/create_key_pair.rb +++ b/lib/fog/compute/requests/aws/create_key_pair.rb @@ -33,14 +33,14 @@ module Fog def create_key_pair(key_name) response = Excon::Response.new - unless @data[:key_pairs][key_name] + unless self.data[:key_pairs][key_name] response.status = 200 data = { 'keyFingerprint' => Fog::AWS::Mock.key_fingerprint, 'keyMaterial' => Fog::AWS::Mock.key_material, 'keyName' => key_name } - @data[:key_pairs][key_name] = data + self.data[:key_pairs][key_name] = data response.body = { 'requestId' => Fog::AWS::Mock.request_id }.merge!(data) diff --git a/lib/fog/compute/requests/aws/create_security_group.rb b/lib/fog/compute/requests/aws/create_security_group.rb index d0b02af78..e59e434d8 100644 --- a/lib/fog/compute/requests/aws/create_security_group.rb +++ b/lib/fog/compute/requests/aws/create_security_group.rb @@ -33,14 +33,14 @@ module Fog def create_security_group(name, description) response = Excon::Response.new - unless @data[:security_groups][name] + unless self.data[:security_groups][name] data = { 'groupDescription' => description, 'groupName' => name, 'ipPermissions' => [], - 'ownerId' => @owner_id + 'ownerId' => self.data[:owner_id] } - @data[:security_groups][name] = data + self.data[:security_groups][name] = data response.body = { 'requestId' => Fog::AWS::Mock.request_id, 'return' => true diff --git a/lib/fog/compute/requests/aws/create_snapshot.rb b/lib/fog/compute/requests/aws/create_snapshot.rb index bedd22e2a..c45fd892c 100644 --- a/lib/fog/compute/requests/aws/create_snapshot.rb +++ b/lib/fog/compute/requests/aws/create_snapshot.rb @@ -42,12 +42,12 @@ module Fog def create_snapshot(volume_id, description = nil) response = Excon::Response.new - if volume = @data[:volumes][volume_id] + if volume = self.data[:volumes][volume_id] response.status = 200 snapshot_id = Fog::AWS::Mock.snapshot_id data = { 'description' => description, - 'ownerId' => @owner_id, + 'ownerId' => self.data[:owner_id], 'progress' => nil, 'snapshotId' => snapshot_id, 'startTime' => Time.now, @@ -55,11 +55,11 @@ module Fog 'volumeId' => volume_id, 'volumeSize' => volume['size'] } - @data[:snapshots][snapshot_id] = data + self.data[:snapshots][snapshot_id] = data response.body = { 'requestId' => Fog::AWS::Mock.request_id }.merge!(data) - @data[:snapshots][snapshot_id]['tagSet'] = {} + self.data[:snapshots][snapshot_id]['tagSet'] = {} else response.status = 400 raise(Excon::Errors.status_error({:expects => 200}, response)) diff --git a/lib/fog/compute/requests/aws/create_tags.rb b/lib/fog/compute/requests/aws/create_tags.rb index 9bb657fde..08accde79 100644 --- a/lib/fog/compute/requests/aws/create_tags.rb +++ b/lib/fog/compute/requests/aws/create_tags.rb @@ -53,7 +53,7 @@ module Fog when /^vol\-[a-z0-9]{8}$/i 'volume' end - if type && @data[:"#{type}s"][resource_id] + if type && self.data[:"#{type}s"][resource_id] { 'resourceId' => resource_id, 'resourceType' => type } else raise(Fog::Service::NotFound.new("The #{type} ID '#{resource_id}' does not exist")) @@ -61,11 +61,11 @@ module Fog end tags.each do |key, value| - @data[:tags][key] ||= {} - @data[:tags][key][value] ||= [] - @data[:tags][key][value] = @data[:tags][key][value] & tagged + self.data[:tags][key] ||= {} + self.data[:tags][key][value] ||= [] + self.data[:tags][key][value] = self.data[:tags][key][value] & tagged - tagged.each {|resource| @data[:"#{resource['resourceType']}s"][resource['resourceId']]['tagSet'][key] = value} + tagged.each {|resource| self.data[:"#{resource['resourceType']}s"][resource['resourceId']]['tagSet'][key] = value} end response = Excon::Response.new diff --git a/lib/fog/compute/requests/aws/create_volume.rb b/lib/fog/compute/requests/aws/create_volume.rb index 0c3d136b7..29271869d 100644 --- a/lib/fog/compute/requests/aws/create_volume.rb +++ b/lib/fog/compute/requests/aws/create_volume.rb @@ -40,7 +40,7 @@ module Fog def create_volume(availability_zone, size, snapshot_id = nil) response = Excon::Response.new if availability_zone && size - if snapshot_id && !@data[:snapshots][snapshot_id] + if snapshot_id && !self.data[:snapshots][snapshot_id] raise Fog::AWS::Compute::NotFound.new("The snapshot '#{snapshot_id}' does not exist.") end @@ -56,7 +56,7 @@ module Fog 'tagSet' => {}, 'volumeId' => volume_id } - @data[:volumes][volume_id] = data + self.data[:volumes][volume_id] = data response.body = { 'requestId' => Fog::AWS::Mock.request_id }.merge!(data.reject {|key,value| !['availabilityZone','createTime','size','snapshotId','status','volumeId'].include?(key) }) diff --git a/lib/fog/compute/requests/aws/delete_key_pair.rb b/lib/fog/compute/requests/aws/delete_key_pair.rb index d35a846d6..5ac6dbb2b 100644 --- a/lib/fog/compute/requests/aws/delete_key_pair.rb +++ b/lib/fog/compute/requests/aws/delete_key_pair.rb @@ -32,7 +32,7 @@ module Fog def delete_key_pair(key_name) response = Excon::Response.new - @data[:key_pairs].delete(key_name) + self.data[:key_pairs].delete(key_name) response.status = 200 response.body = { 'requestId' => Fog::AWS::Mock.request_id, diff --git a/lib/fog/compute/requests/aws/delete_security_group.rb b/lib/fog/compute/requests/aws/delete_security_group.rb index 2614032fe..0748186c8 100644 --- a/lib/fog/compute/requests/aws/delete_security_group.rb +++ b/lib/fog/compute/requests/aws/delete_security_group.rb @@ -31,8 +31,8 @@ module Fog class Mock def delete_security_group(name) response = Excon::Response.new - if @data[:security_groups][name] - @data[:security_groups].delete(name) + if self.data[:security_groups][name] + self.data[:security_groups].delete(name) response.status = 200 response.body = { 'requestId' => Fog::AWS::Mock.request_id, diff --git a/lib/fog/compute/requests/aws/delete_snapshot.rb b/lib/fog/compute/requests/aws/delete_snapshot.rb index 07478036d..67fd6118a 100644 --- a/lib/fog/compute/requests/aws/delete_snapshot.rb +++ b/lib/fog/compute/requests/aws/delete_snapshot.rb @@ -32,7 +32,7 @@ module Fog def delete_snapshot(snapshot_id) response = Excon::Response.new - if snapshot = @data[:snapshots].delete(snapshot_id) + if snapshot = self.data[:snapshots].delete(snapshot_id) response.status = true response.body = { 'requestId' => Fog::AWS::Mock.request_id, diff --git a/lib/fog/compute/requests/aws/delete_tags.rb b/lib/fog/compute/requests/aws/delete_tags.rb index d38ec5b8e..179d8ac3d 100644 --- a/lib/fog/compute/requests/aws/delete_tags.rb +++ b/lib/fog/compute/requests/aws/delete_tags.rb @@ -53,7 +53,7 @@ module Fog when /^vol\-[a-z0-9]{8}$/i 'volume' end - if type && @data[:"#{type}s"][resource_id] + if type && self.data[:"#{type}s"][resource_id] { 'resourceId' => resource_id, 'resourceType' => type } else raise(Fog::Service::NotFound.new("The #{type} ID '#{resource_id}' does not exist")) @@ -61,11 +61,11 @@ module Fog end tags.each do |key, value| - @data[:tags][key][value] = @data[:tags][key][value] - tagged + self.data[:tags][key][value] = self.data[:tags][key][value] - tagged end tagged.each do |resource| - object = @data[:"#{resource['resourceType']}s"][resource['resourceId']] + object = self.data[:"#{resource['resourceType']}s"][resource['resourceId']] tags.each do |key, value| tagset = object['tagSet'] tagset.delete(key) if tagset.has_key?(key) && (value.nil? || tagset[key] == value) diff --git a/lib/fog/compute/requests/aws/delete_volume.rb b/lib/fog/compute/requests/aws/delete_volume.rb index aa1b47554..e0543988f 100644 --- a/lib/fog/compute/requests/aws/delete_volume.rb +++ b/lib/fog/compute/requests/aws/delete_volume.rb @@ -32,12 +32,12 @@ module Fog def delete_volume(volume_id) response = Excon::Response.new - if volume = @data[:volumes][volume_id] + if volume = self.data[:volumes][volume_id] if volume["attachmentSet"].any? attach = volume["attachmentSet"].first raise Fog::AWS::Compute::Error.new("Client.VolumeInUse => Volume #{volume_id} is currently attached to #{attach["instanceId"]}") end - @data[:deleted_at][volume_id] = Time.now + self.data[:deleted_at][volume_id] = Time.now volume['status'] = 'deleting' response.status = 200 response.body = { diff --git a/lib/fog/compute/requests/aws/describe_addresses.rb b/lib/fog/compute/requests/aws/describe_addresses.rb index 9db91e271..67a1c3343 100644 --- a/lib/fog/compute/requests/aws/describe_addresses.rb +++ b/lib/fog/compute/requests/aws/describe_addresses.rb @@ -44,7 +44,7 @@ module Fog response = Excon::Response.new - addresses_set = @data[:addresses].values + addresses_set = self.data[:addresses].values aliases = {'public-ip' => 'publicIp', 'instance-id' => 'instanceId'} for filter_key, filter_value in filters diff --git a/lib/fog/compute/requests/aws/describe_images.rb b/lib/fog/compute/requests/aws/describe_images.rb index 04d471917..2be17162d 100644 --- a/lib/fog/compute/requests/aws/describe_images.rb +++ b/lib/fog/compute/requests/aws/describe_images.rb @@ -93,7 +93,7 @@ module Fog 'virtualization-type' => 'virtualizationType' } - image_set = @data[:images].values + image_set = self.data[:images].values for filter_key, filter_value in filters aliased_key = aliases[filter_key] diff --git a/lib/fog/compute/requests/aws/describe_instances.rb b/lib/fog/compute/requests/aws/describe_instances.rb index df5c1eaf0..87f1ea965 100644 --- a/lib/fog/compute/requests/aws/describe_instances.rb +++ b/lib/fog/compute/requests/aws/describe_instances.rb @@ -83,7 +83,7 @@ module Fog response = Excon::Response.new - instance_set = @data[:instances].values + instance_set = self.data[:instances].values instance_set = apply_tag_filters(instance_set, filters) aliases = { @@ -166,20 +166,20 @@ module Fog when 'rebooting' instance['instanceState'] = { 'code' => 16, 'name' => 'running' } when 'shutting-down' - if Time.now - @data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay * 2 - @data[:deleted_at].delete(instance['instanceId']) - @data[:instances].delete(instance['instanceId']) - elsif Time.now - @data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay + if Time.now - self.data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay * 2 + self.data[:deleted_at].delete(instance['instanceId']) + self.data[:instances].delete(instance['instanceId']) + elsif Time.now - self.data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay instance['instanceState'] = { 'code' => 48, 'name' => 'terminating' } end when 'terminating' - if Time.now - @data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay - @data[:deleted_at].delete(instance['instanceId']) - @data[:instances].delete(instance['instanceId']) + if Time.now - self.data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay + self.data[:deleted_at].delete(instance['instanceId']) + self.data[:instances].delete(instance['instanceId']) end end - if @data[:instances][instance['instanceId']] + if self.data[:instances][instance['instanceId']] reservation_set[instance['reservationId']] ||= { 'groupSet' => instance['groupSet'], diff --git a/lib/fog/compute/requests/aws/describe_key_pairs.rb b/lib/fog/compute/requests/aws/describe_key_pairs.rb index 22219cc0d..000ffbeb6 100644 --- a/lib/fog/compute/requests/aws/describe_key_pairs.rb +++ b/lib/fog/compute/requests/aws/describe_key_pairs.rb @@ -44,7 +44,7 @@ module Fog response = Excon::Response.new - key_set = @data[:key_pairs].values + key_set = self.data[:key_pairs].values aliases = {'fingerprint' => 'keyFingerprint', 'key-name' => 'keyName'} for filter_key, filter_value in filters diff --git a/lib/fog/compute/requests/aws/describe_security_groups.rb b/lib/fog/compute/requests/aws/describe_security_groups.rb index 2068e4f25..92d865833 100644 --- a/lib/fog/compute/requests/aws/describe_security_groups.rb +++ b/lib/fog/compute/requests/aws/describe_security_groups.rb @@ -54,7 +54,7 @@ module Fog response = Excon::Response.new - security_group_info = @data[:security_groups].values + security_group_info = self.data[:security_groups].values aliases = { 'description' => 'groupDescription', diff --git a/lib/fog/compute/requests/aws/describe_snapshots.rb b/lib/fog/compute/requests/aws/describe_snapshots.rb index d777e7bcd..2723d4079 100644 --- a/lib/fog/compute/requests/aws/describe_snapshots.rb +++ b/lib/fog/compute/requests/aws/describe_snapshots.rb @@ -63,7 +63,7 @@ module Fog response = Excon::Response.new - snapshot_set = @data[:snapshots].values + snapshot_set = self.data[:snapshots].values if filters.delete('owner-alias') Formatador.display_line("[yellow][WARN] describe_snapshots with owner-alias is not mocked[/] [light_black](#{caller.first})[/]") diff --git a/lib/fog/compute/requests/aws/describe_volumes.rb b/lib/fog/compute/requests/aws/describe_volumes.rb index ba131eef5..293e62f47 100644 --- a/lib/fog/compute/requests/aws/describe_volumes.rb +++ b/lib/fog/compute/requests/aws/describe_volumes.rb @@ -54,7 +54,7 @@ module Fog response = Excon::Response.new - volume_set = @data[:volumes].values + volume_set = self.data[:volumes].values volume_set = apply_tag_filters(volume_set, filters) aliases = { @@ -94,13 +94,13 @@ module Fog volume['status'] = 'available' end when 'deleting' - if Time.now - @data[:deleted_at][volume['volumeId']] >= Fog::Mock.delay - @data[:deleted_at].delete(volume['volumeId']) - @data[:volumes].delete(volume['volumeId']) + if Time.now - self.data[:deleted_at][volume['volumeId']] >= Fog::Mock.delay + self.data[:deleted_at].delete(volume['volumeId']) + self.data[:volumes].delete(volume['volumeId']) end end end - volume_set = volume_set.reject {|volume| !@data[:volumes][volume['volumeId']]} + volume_set = volume_set.reject {|volume| !self.data[:volumes][volume['volumeId']]} response.status = 200 response.body = { diff --git a/lib/fog/compute/requests/aws/detach_volume.rb b/lib/fog/compute/requests/aws/detach_volume.rb index e84ff4cfd..cbb581b6e 100644 --- a/lib/fog/compute/requests/aws/detach_volume.rb +++ b/lib/fog/compute/requests/aws/detach_volume.rb @@ -41,7 +41,7 @@ module Fog def detach_volume(volume_id, options = {}) response = Excon::Response.new response.status = 200 - if (volume = @data[:volumes][volume_id]) && !volume['attachmentSet'].empty? + if (volume = self.data[:volumes][volume_id]) && !volume['attachmentSet'].empty? data = volume['attachmentSet'].pop volume['status'] = 'available' response.status = 200 diff --git a/lib/fog/compute/requests/aws/disassociate_address.rb b/lib/fog/compute/requests/aws/disassociate_address.rb index b234954ff..645e481a2 100644 --- a/lib/fog/compute/requests/aws/disassociate_address.rb +++ b/lib/fog/compute/requests/aws/disassociate_address.rb @@ -33,9 +33,9 @@ module Fog def disassociate_address(public_ip) response = Excon::Response.new response.status = 200 - if address = @data[:addresses][public_ip] + if address = self.data[:addresses][public_ip] instance_id = address['instanceId'] - instance = @data[:instances][instance_id] + instance = self.data[:instances][instance_id] instance['ipAddress'] = instance['originalIpAddress'] instance['dnsName'] = Fog::AWS::Mock.dns_name_for(instance['ipAddress']) address['instanceId'] = nil diff --git a/lib/fog/compute/requests/aws/get_console_output.rb b/lib/fog/compute/requests/aws/get_console_output.rb index a3c1b5c04..a4be07956 100644 --- a/lib/fog/compute/requests/aws/get_console_output.rb +++ b/lib/fog/compute/requests/aws/get_console_output.rb @@ -34,7 +34,7 @@ module Fog def get_console_output(instance_id) response = Excon::Response.new - if instance = @data[:instances][instance_id] + if instance = self.data[:instances][instance_id] response.status = 200 response.body = { 'instanceId' => instance_id, diff --git a/lib/fog/compute/requests/aws/get_password_data.rb b/lib/fog/compute/requests/aws/get_password_data.rb index c8ca5728b..ef6f3a0bb 100644 --- a/lib/fog/compute/requests/aws/get_password_data.rb +++ b/lib/fog/compute/requests/aws/get_password_data.rb @@ -36,7 +36,7 @@ module Fog def get_password_data(instance_id) response = Excon::Response.new - if instance = @data[:instances][instance_id] + if instance = self.data[:instances][instance_id] response.status = 200 response.body = { 'instanceId' => instance_id, diff --git a/lib/fog/compute/requests/aws/import_key_pair.rb b/lib/fog/compute/requests/aws/import_key_pair.rb index 5b6f55ab7..f6323ceb5 100644 --- a/lib/fog/compute/requests/aws/import_key_pair.rb +++ b/lib/fog/compute/requests/aws/import_key_pair.rb @@ -34,13 +34,13 @@ module Fog def import_key_pair(key_name, public_key_material) response = Excon::Response.new - unless @data[:key_pairs][key_name] + unless self.data[:key_pairs][key_name] response.status = 200 data = { 'keyFingerprint' => Fog::AWS::Mock.key_fingerprint, 'keyName' => key_name } - @data[:key_pairs][key_name] = data + self.data[:key_pairs][key_name] = data response.body = { 'requestId' => Fog::AWS::Mock.request_id }.merge!(data) diff --git a/lib/fog/compute/requests/aws/monitor_instances.rb b/lib/fog/compute/requests/aws/monitor_instances.rb index d98f9f2ad..0dd0ebf0a 100644 --- a/lib/fog/compute/requests/aws/monitor_instances.rb +++ b/lib/fog/compute/requests/aws/monitor_instances.rb @@ -36,7 +36,7 @@ module Fog response = Excon::Response.new response.status = 200 [*instance_ids].each do |instance_id| - if instance = @data[:instances][instance_id] + if instance = self.data[:instances][instance_id] instance['monitoring']['state'] = 'enabled' else raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids}' does not exist") diff --git a/lib/fog/compute/requests/aws/reboot_instances.rb b/lib/fog/compute/requests/aws/reboot_instances.rb index 28d7f8fc2..5113805b3 100644 --- a/lib/fog/compute/requests/aws/reboot_instances.rb +++ b/lib/fog/compute/requests/aws/reboot_instances.rb @@ -33,9 +33,9 @@ module Fog def reboot_instances(instance_id = []) response = Excon::Response.new instance_id = [*instance_id] - if (@data[:instances].keys & instance_id).length == instance_id.length + if (self.data[:instances].keys & instance_id).length == instance_id.length for instance_id in instance_id - @data[:instances][instance_id]['status'] = 'rebooting' + self.data[:instances][instance_id]['status'] = 'rebooting' end response.status = 200 response.body = { diff --git a/lib/fog/compute/requests/aws/release_address.rb b/lib/fog/compute/requests/aws/release_address.rb index 9db1d56c2..0355600b2 100644 --- a/lib/fog/compute/requests/aws/release_address.rb +++ b/lib/fog/compute/requests/aws/release_address.rb @@ -29,7 +29,7 @@ module Fog def release_address(public_ip) response = Excon::Response.new - if (address = @data[:addresses].delete(public_ip)) + if (address = self.data[:addresses].delete(public_ip)) response.status = 200 response.body = { 'requestId' => Fog::AWS::Mock.request_id, diff --git a/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb b/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb index 41e0c568c..f3b22cd13 100644 --- a/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb +++ b/lib/fog/compute/requests/aws/revoke_security_group_ingress.rb @@ -56,7 +56,7 @@ module Fog group_name = options['GroupName'] end response = Excon::Response.new - group = @data[:security_groups][group_name] + group = self.data[:security_groups][group_name] if group if options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId'] group['ipPermissions'].delete_if {|permission| diff --git a/lib/fog/compute/requests/aws/run_instances.rb b/lib/fog/compute/requests/aws/run_instances.rb index 8a24d52f3..1d39eabc4 100644 --- a/lib/fog/compute/requests/aws/run_instances.rb +++ b/lib/fog/compute/requests/aws/run_instances.rb @@ -147,10 +147,10 @@ module Fog 'rootDeviceType' => 'instance-store' } instances_set << instance - @data[:instances][instance_id] = instance.merge({ + self.data[:instances][instance_id] = instance.merge({ 'architecture' => 'i386', 'groupSet' => group_set, - 'ownerId' => @owner_id, + 'ownerId' => self.data[:owner_id], 'privateIpAddress' => nil, 'reservationId' => reservation_id, 'stateReason' => {}, @@ -160,7 +160,7 @@ module Fog response.body = { 'groupSet' => group_set, 'instancesSet' => instances_set, - 'ownerId' => @owner_id, + 'ownerId' => self.data[:owner_id], 'requestId' => Fog::AWS::Mock.request_id, 'reservationId' => reservation_id } diff --git a/lib/fog/compute/requests/aws/terminate_instances.rb b/lib/fog/compute/requests/aws/terminate_instances.rb index 4a7846463..dc33aaf1f 100644 --- a/lib/fog/compute/requests/aws/terminate_instances.rb +++ b/lib/fog/compute/requests/aws/terminate_instances.rb @@ -40,15 +40,15 @@ module Fog def terminate_instances(instance_id) response = Excon::Response.new instance_id = [*instance_id] - if (@data[:instances].keys & instance_id).length == instance_id.length + if (self.data[:instances].keys & instance_id).length == instance_id.length response.body = { 'requestId' => Fog::AWS::Mock.request_id, 'instancesSet' => [] } response.status = 200 for id in instance_id - instance = @data[:instances][id] - @data[:deleted_at][id] = Time.now + instance = self.data[:instances][id] + self.data[:deleted_at][id] = Time.now code = case instance['instanceState']['name'] when 'pending' 0 diff --git a/lib/fog/compute/requests/aws/unmonitor_instances.rb b/lib/fog/compute/requests/aws/unmonitor_instances.rb index 1f982d139..02cba87c9 100644 --- a/lib/fog/compute/requests/aws/unmonitor_instances.rb +++ b/lib/fog/compute/requests/aws/unmonitor_instances.rb @@ -36,7 +36,7 @@ module Fog response = Excon::Response.new response.status = 200 [*instance_ids].each do |instance_id| - if instance = @data[:instances][instance_id] + if instance = self.data[:instances][instance_id] instance['monitoring']['state'] = 'enabled' else raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids}' does not exist") diff --git a/lib/fog/compute/requests/go_grid/grid_image_get.rb b/lib/fog/compute/requests/go_grid/grid_image_get.rb index 38a011d6e..ff2839cf4 100644 --- a/lib/fog/compute/requests/go_grid/grid_image_get.rb +++ b/lib/fog/compute/requests/go_grid/grid_image_get.rb @@ -29,7 +29,7 @@ module Fog def grid_image_get(options={}) #response = Excon::Response.new - #images = @data[:list].values + #images = self.data[:list].values #for image in images # case image['state'] # when 'Available' diff --git a/lib/fog/compute/requests/go_grid/grid_image_list.rb b/lib/fog/compute/requests/go_grid/grid_image_list.rb index 360a57398..de65ac103 100644 --- a/lib/fog/compute/requests/go_grid/grid_image_list.rb +++ b/lib/fog/compute/requests/go_grid/grid_image_list.rb @@ -32,7 +32,7 @@ module Fog def grid_image_list(options={}) #response = Excon::Response.new - #images = @data[:list].values + #images = self.data[:list].values #for image in images # case image['state'] # when 'Available' diff --git a/lib/fog/compute/requests/rackspace/confirm_resized_server.rb b/lib/fog/compute/requests/rackspace/confirm_resized_server.rb index a74dd667c..a3faadd1e 100644 --- a/lib/fog/compute/requests/rackspace/confirm_resized_server.rb +++ b/lib/fog/compute/requests/rackspace/confirm_resized_server.rb @@ -21,9 +21,9 @@ module Fog response = Excon::Response.new response.status = 204 - @data[:servers][server_id].delete('old_flavorId') - @data[:last_modified][:servers][server_id] = Time.now - @data[:servers][server_id]['status'] = 'ACTIVE' + self.data[:servers][server_id].delete('old_flavorId') + self.data[:last_modified][:servers][server_id] = Time.now + self.data[:servers][server_id]['status'] = 'ACTIVE' response end diff --git a/lib/fog/compute/requests/rackspace/create_image.rb b/lib/fog/compute/requests/rackspace/create_image.rb index c0e43820a..4c2e11879 100644 --- a/lib/fog/compute/requests/rackspace/create_image.rb +++ b/lib/fog/compute/requests/rackspace/create_image.rb @@ -50,8 +50,8 @@ module Fog 'updated' => now.to_s, } - @data[:last_modified][:images][data['id']] = now - @data[:images][data['id']] = data + self.data[:last_modified][:images][data['id']] = now + self.data[:images][data['id']] = data response.body = { 'image' => data.reject {|key, value| !['id', 'name', 'serverId', 'status', 'updated'].include?(key)} } response end diff --git a/lib/fog/compute/requests/rackspace/create_server.rb b/lib/fog/compute/requests/rackspace/create_server.rb index d9585d62e..42eb3b9cb 100644 --- a/lib/fog/compute/requests/rackspace/create_server.rb +++ b/lib/fog/compute/requests/rackspace/create_server.rb @@ -82,8 +82,8 @@ module Fog 'progress' => 0, 'status' => 'BUILD' } - @data[:last_modified][:servers][data['id']] = Time.now - @data[:servers][data['id']] = data + self.data[:last_modified][:servers][data['id']] = Time.now + self.data[:servers][data['id']] = data response.body = { 'server' => data.merge({'adminPass' => 'password'}) } response end diff --git a/lib/fog/compute/requests/rackspace/delete_image.rb b/lib/fog/compute/requests/rackspace/delete_image.rb index 902d65104..7c2273b77 100644 --- a/lib/fog/compute/requests/rackspace/delete_image.rb +++ b/lib/fog/compute/requests/rackspace/delete_image.rb @@ -27,8 +27,8 @@ module Fog response.status = 409 raise(Excon::Errors.status_error({:expects => 202}, response)) else - @data[:last_modified][:images].delete(image_id) - @data[:images].delete(image_id) + self.data[:last_modified][:images].delete(image_id) + self.data[:images].delete(image_id) response.status = 202 end response diff --git a/lib/fog/compute/requests/rackspace/delete_server.rb b/lib/fog/compute/requests/rackspace/delete_server.rb index 39ae6b573..88fafb0f8 100644 --- a/lib/fog/compute/requests/rackspace/delete_server.rb +++ b/lib/fog/compute/requests/rackspace/delete_server.rb @@ -27,8 +27,8 @@ module Fog response.status = 409 raise(Excon::Errors.status_error({:expects => 202}, response)) else - @data[:last_modified][:servers].delete(server_id) - @data[:servers].delete(server_id) + self.data[:last_modified][:servers].delete(server_id) + self.data[:servers].delete(server_id) response.status = 202 end response diff --git a/lib/fog/compute/requests/rackspace/list_images_detail.rb b/lib/fog/compute/requests/rackspace/list_images_detail.rb index a875de8b3..bfac9967c 100644 --- a/lib/fog/compute/requests/rackspace/list_images_detail.rb +++ b/lib/fog/compute/requests/rackspace/list_images_detail.rb @@ -28,11 +28,11 @@ module Fog def list_images_detail response = Excon::Response.new - images = @data[:images].values + images = self.data[:images].values for image in images case image['status'] when 'SAVING' - if Time.now - @data[:last_modified][:images][image['id']] >= Fog::Mock.delay + if Time.now - self.data[:last_modified][:images][image['id']] >= Fog::Mock.delay image['status'] = 'ACTIVE' end end diff --git a/lib/fog/compute/requests/rackspace/list_servers_detail.rb b/lib/fog/compute/requests/rackspace/list_servers_detail.rb index ade93149c..0373be63d 100644 --- a/lib/fog/compute/requests/rackspace/list_servers_detail.rb +++ b/lib/fog/compute/requests/rackspace/list_servers_detail.rb @@ -35,11 +35,11 @@ module Fog def list_servers_detail response = Excon::Response.new - servers = @data[:servers].values + servers = self.data[:servers].values for server in servers case server['status'] when 'BUILD' - if Time.now - @data[:last_modified][:servers][server['id']] > 2 + if Time.now - self.data[:last_modified][:servers][server['id']] > 2 server['status'] = 'ACTIVE' end end diff --git a/lib/fog/compute/requests/rackspace/resize_server.rb b/lib/fog/compute/requests/rackspace/resize_server.rb index 64f4d956a..c15010514 100644 --- a/lib/fog/compute/requests/rackspace/resize_server.rb +++ b/lib/fog/compute/requests/rackspace/resize_server.rb @@ -24,11 +24,11 @@ module Fog response.status = 202 # keep track of this for reverts - @data[:servers][server_id]['old_flavorId'] = @data[:servers][server_id]['flavorId'] + self.data[:servers][server_id]['old_flavorId'] = self.data[:servers][server_id]['flavorId'] - @data[:servers][server_id]['flavorId'] = flavor_id - @data[:last_modified][:servers][server_id] = Time.now - @data[:servers][server_id]['status'] = 'VERIFY_RESIZE' + self.data[:servers][server_id]['flavorId'] = flavor_id + self.data[:last_modified][:servers][server_id] = Time.now + self.data[:servers][server_id]['status'] = 'VERIFY_RESIZE' response end diff --git a/lib/fog/compute/requests/rackspace/revert_resized_server.rb b/lib/fog/compute/requests/rackspace/revert_resized_server.rb index 6aa1a967a..ce30f7697 100644 --- a/lib/fog/compute/requests/rackspace/revert_resized_server.rb +++ b/lib/fog/compute/requests/rackspace/revert_resized_server.rb @@ -21,10 +21,10 @@ module Fog response = Excon::Response.new response.status = 202 - @data[:servers][server_id]['flavorId'] = @data[:servers][server_id]['old_flavorId'] - @data[:servers][server_id].delete('old_flavorId') - @data[:last_modified][:servers][server_id] = Time.now - @data[:servers][server_id]['status'] = 'ACTIVE' + self.data[:servers][server_id]['flavorId'] = self.data[:servers][server_id]['old_flavorId'] + self.data[:servers][server_id].delete('old_flavorId') + self.data[:last_modified][:servers][server_id] = Time.now + self.data[:servers][server_id]['status'] = 'ACTIVE' response end diff --git a/lib/fog/compute/slicehost.rb b/lib/fog/compute/slicehost.rb index 2f5ca1abe..8750a5583 100644 --- a/lib/fog/compute/slicehost.rb +++ b/lib/fog/compute/slicehost.rb @@ -47,12 +47,14 @@ module Fog end @slicehost_password = options[:slicehost_password] - @data = self.class.data[@slicehost_password] + end + + def data + self.class.data[@slicehost_password] end def reset_data self.class.data.delete(@slicehost_password) - @data = self.class.data[@slicehost_password] end end diff --git a/lib/fog/compute/storm_on_demand.rb b/lib/fog/compute/storm_on_demand.rb index ff2919270..33f765bf6 100644 --- a/lib/fog/compute/storm_on_demand.rb +++ b/lib/fog/compute/storm_on_demand.rb @@ -68,7 +68,14 @@ module Fog def initialize(options={}) @storm_on_demand_username = options[:storm_on_demand_username] - @data = self.class.data[@storm_on_demand_username] + end + + def data + self.class.data[@storm_on_demand_username] + end + + def reset_data + self.class.data.delete(@storm_on_demand_username) end end diff --git a/lib/fog/compute/voxel.rb b/lib/fog/compute/voxel.rb index cebe8b1bc..249271e55 100644 --- a/lib/fog/compute/voxel.rb +++ b/lib/fog/compute/voxel.rb @@ -54,12 +54,14 @@ module Fog def initialize(options={}) @voxel_api_key = options[:voxel_api_key] - @data = self.class.data[@voxel_api_key] + end + + def data + self.class.data[@voxel_api_key] end def reset_data self.class.data.delete(@voxel_api_key) - @data = self.class.data[@voxel_api_key] end end diff --git a/lib/fog/core/mock.rb b/lib/fog/core/mock.rb index 4bd5477b7..f50fff997 100644 --- a/lib/fog/core/mock.rb +++ b/lib/fog/core/mock.rb @@ -66,7 +66,7 @@ module Fog def self.reset providers = Fog.providers.map{|p| eval("Fog::#{p}")} services = providers.map{|p| p.constants.map{|s| eval("#{p}::#{s}")}}.flatten - services.select!{|s| s.constants.include?(:Mock)} + services = services.select {|s| s.constants.include?(:Mock)} services.each do |service| next unless service::Mock.respond_to?(:reset) diff --git a/lib/fog/dns/aws.rb b/lib/fog/dns/aws.rb index 00ba35775..03bc758b2 100644 --- a/lib/fog/dns/aws.rb +++ b/lib/fog/dns/aws.rb @@ -48,12 +48,14 @@ module Fog require 'mime/types' @aws_access_key_id = options[:aws_access_key_id] @region = options[:region] - @data = self.class.data[@region][@aws_access_key_id] + end + + def data + self.class.data[@region][@aws_access_key_id] end def reset_data self.class.data[@region].delete(@aws_access_key_id) - @data = self.class.data[@region][@aws_access_key_id] end def signature(params) diff --git a/lib/fog/dns/bluebox.rb b/lib/fog/dns/bluebox.rb index 3bcb77e3e..7b1ed82e1 100644 --- a/lib/fog/dns/bluebox.rb +++ b/lib/fog/dns/bluebox.rb @@ -44,12 +44,14 @@ module Fog @bluebox_customer_id = options[:bluebox_customer_id] @bluebox_api_key = options[:bluebox_api_key] - @data = self.class.data[@bluebox_customer_id] + end + + def data + self.class.data[@bluebox_customer_id] end def reset_data self.class.data.delete(@bluebox_customer_id) - @data = self.class.data[@bluebox_customer_id] end end diff --git a/lib/fog/dns/dnsimple.rb b/lib/fog/dns/dnsimple.rb index 4067d56a7..02328af6b 100644 --- a/lib/fog/dns/dnsimple.rb +++ b/lib/fog/dns/dnsimple.rb @@ -45,12 +45,14 @@ module Fog @dnsimple_email = options[:dnsimple_email] @dnsimple_password = options[:dnsimple_password] - @data = self.class.data[@dnsimple_email] + end + + def data + self.class.data[@dnsimple_email] end def reset_data self.class.data.delete(@dnsimple_email) - @data = self.class.data[@dnsimple_email] end end diff --git a/lib/fog/dns/linode.rb b/lib/fog/dns/linode.rb index 60081a7d9..96b78001d 100644 --- a/lib/fog/dns/linode.rb +++ b/lib/fog/dns/linode.rb @@ -43,12 +43,14 @@ module Fog end @linode_api_key = options[:linode_api_key] - @data = self.class.data[@linode_api_key] + end + + def data + self.class.data[@linode_api_key] end def reset_data self.class.data.delete(@linode_api_key) - @data = self.class.data[@linode_api_key] end end diff --git a/lib/fog/dns/slicehost.rb b/lib/fog/dns/slicehost.rb index 203d8e710..de35e2fb5 100644 --- a/lib/fog/dns/slicehost.rb +++ b/lib/fog/dns/slicehost.rb @@ -43,12 +43,14 @@ module Fog end @slicehost_password = options[:slicehost_password] - @data = self.class.data[@slicehost_password] + end + + def data + self.class.data[@slicehost_password] end def reset_data self.class.data.delete(@slicehost_password) - @data = self.class.data[@slicehost_password] end end diff --git a/lib/fog/dns/zerigo.rb b/lib/fog/dns/zerigo.rb index bcdc351dc..61eb28fec 100644 --- a/lib/fog/dns/zerigo.rb +++ b/lib/fog/dns/zerigo.rb @@ -50,12 +50,14 @@ module Fog @zerigo_email = options[:zerigo_email] @zerigo_token = options[:zerigo_token] - @data = self.class.data[@zerigo_email] + end + + def data + self.class.data[@zerigo_email] end def reset_data self.class.data.delete(@zerigo_email) - @data = self.class.data[@zerigo_email] end end diff --git a/lib/fog/storage/aws.rb b/lib/fog/storage/aws.rb index c348f2e85..1a84c1291 100644 --- a/lib/fog/storage/aws.rb +++ b/lib/fog/storage/aws.rb @@ -179,12 +179,14 @@ module Fog raise ArgumentError, "Unknown region: #{options[:region].inspect}" end @region = options[:region] - @data = self.class.data[@region][@aws_access_key_id] + end + + def data + self.class.data[@region][@aws_access_key_id] end def reset_data self.class.data[@region].delete(@aws_access_key_id) - @data = self.class.data[@region][@aws_access_key_id] end def signature(params) diff --git a/lib/fog/storage/google.rb b/lib/fog/storage/google.rb index e26f6b673..fbffd29e0 100644 --- a/lib/fog/storage/google.rb +++ b/lib/fog/storage/google.rb @@ -119,6 +119,10 @@ module Fog end end + def self.reset + @data = nil + end + def initialize(options={}) unless options.delete(:provider) location = caller.first @@ -129,16 +133,14 @@ module Fog require 'mime/types' @google_storage_access_key_id = options[:google_storage_access_key_id] - @data = self.class.data[@google_storage_access_key_id] end - def self.reset - @data = nil + def data + self.class.data[@google_storage_access_key_id] end def reset_data self.class.data.delete(@google_storage_access_key_id) - @data = self.class.data[@google_storage_access_key_id] end def signature(params) diff --git a/lib/fog/storage/local.rb b/lib/fog/storage/local.rb index 65f094f49..511d9223a 100644 --- a/lib/fog/storage/local.rb +++ b/lib/fog/storage/local.rb @@ -35,7 +35,10 @@ module Fog end @local_root = ::File.expand_path(options[:local_root]) - @data = self.class.data[@local_root] + end + + def data + self.class.data[@local_root] end def local_root @@ -48,7 +51,6 @@ module Fog def reset_data self.class.data.delete(@local_root) - @data = self.class.data[@local_root] end end diff --git a/lib/fog/storage/rackspace.rb b/lib/fog/storage/rackspace.rb index 491deded8..b86241150 100644 --- a/lib/fog/storage/rackspace.rb +++ b/lib/fog/storage/rackspace.rb @@ -60,12 +60,14 @@ module Fog require 'mime/types' @rackspace_api_key = options[:rackspace_api_key] @rackspace_username = options[:rackspace_username] - @data = self.class.data[@rackspace_username] + end + + def data + self.class.data[@rackspace_username] end def reset_data self.class.data.delete(@rackspace_username) - @data = self.class.data[@rackspace_username] end end diff --git a/lib/fog/storage/requests/aws/copy_object.rb b/lib/fog/storage/requests/aws/copy_object.rb index 5986eb5ba..3c842db91 100644 --- a/lib/fog/storage/requests/aws/copy_object.rb +++ b/lib/fog/storage/requests/aws/copy_object.rb @@ -47,9 +47,9 @@ module Fog def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {}) response = Excon::Response.new - source_bucket = @data[:buckets][source_bucket_name] + source_bucket = self.data[:buckets][source_bucket_name] source_object = source_bucket && source_bucket[:objects][source_object_name] - target_bucket = @data[:buckets][target_bucket_name] + target_bucket = self.data[:buckets][target_bucket_name] if source_object && target_bucket response.status = 200 diff --git a/lib/fog/storage/requests/aws/delete_bucket.rb b/lib/fog/storage/requests/aws/delete_bucket.rb index 769212e8e..696c1c9eb 100644 --- a/lib/fog/storage/requests/aws/delete_bucket.rb +++ b/lib/fog/storage/requests/aws/delete_bucket.rb @@ -30,14 +30,14 @@ module Fog def delete_bucket(bucket_name) response = Excon::Response.new - if @data[:buckets][bucket_name].nil? + if self.data[:buckets][bucket_name].nil? response.status = 404 raise(Excon::Errors.status_error({:expects => 204}, response)) - elsif @data[:buckets][bucket_name] && !@data[:buckets][bucket_name][:objects].empty? + elsif self.data[:buckets][bucket_name] && !self.data[:buckets][bucket_name][:objects].empty? response.status = 409 raise(Excon::Errors.status_error({:expects => 204}, response)) else - @data[:buckets].delete(bucket_name) + self.data[:buckets].delete(bucket_name) response.status = 204 end response diff --git a/lib/fog/storage/requests/aws/delete_object.rb b/lib/fog/storage/requests/aws/delete_object.rb index b4e7d72d0..831490a66 100644 --- a/lib/fog/storage/requests/aws/delete_object.rb +++ b/lib/fog/storage/requests/aws/delete_object.rb @@ -33,7 +33,7 @@ module Fog def delete_object(bucket_name, object_name) response = Excon::Response.new - if bucket = @data[:buckets][bucket_name] + if bucket = self.data[:buckets][bucket_name] response.status = 204 bucket[:objects].delete(object_name) else diff --git a/lib/fog/storage/requests/aws/get_bucket.rb b/lib/fog/storage/requests/aws/get_bucket.rb index f8e792a80..222456f39 100644 --- a/lib/fog/storage/requests/aws/get_bucket.rb +++ b/lib/fog/storage/requests/aws/get_bucket.rb @@ -67,7 +67,7 @@ module Fog Fog::Mock.not_implemented end response = Excon::Response.new - if bucket = @data[:buckets][bucket_name] + if bucket = self.data[:buckets][bucket_name] contents = bucket[:objects].values.sort {|x,y| x['Key'] <=> y['Key']}.reject do |object| (options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) || (options['marker'] && object['Key'] <= options['marker']) diff --git a/lib/fog/storage/requests/aws/get_bucket_acl.rb b/lib/fog/storage/requests/aws/get_bucket_acl.rb index 6b137647f..117fe7c73 100644 --- a/lib/fog/storage/requests/aws/get_bucket_acl.rb +++ b/lib/fog/storage/requests/aws/get_bucket_acl.rb @@ -50,7 +50,7 @@ module Fog def get_bucket_acl(bucket_name) response = Excon::Response.new - if acl = @data[:acls][:bucket][bucket_name] + if acl = self.data[:acls][:bucket][bucket_name] response.status = 200 response.body = acl else diff --git a/lib/fog/storage/requests/aws/get_bucket_location.rb b/lib/fog/storage/requests/aws/get_bucket_location.rb index ea946fea0..170d785bc 100644 --- a/lib/fog/storage/requests/aws/get_bucket_location.rb +++ b/lib/fog/storage/requests/aws/get_bucket_location.rb @@ -36,7 +36,7 @@ module Fog def get_bucket_location(bucket_name) response = Excon::Response.new - if bucket = @data[:buckets][bucket_name] + if bucket = self.data[:buckets][bucket_name] response.status = 200 response.body = {'LocationConstraint' => bucket['LocationConstraint'] } else diff --git a/lib/fog/storage/requests/aws/get_object.rb b/lib/fog/storage/requests/aws/get_object.rb index 7452a54e0..f33ba6cf8 100644 --- a/lib/fog/storage/requests/aws/get_object.rb +++ b/lib/fog/storage/requests/aws/get_object.rb @@ -65,7 +65,7 @@ module Fog raise ArgumentError.new('object_name is required') end response = Excon::Response.new - if (bucket = @data[:buckets][bucket_name]) && (object = bucket[:objects][object_name]) + if (bucket = self.data[:buckets][bucket_name]) && (object = bucket[:objects][object_name]) if options['If-Match'] && options['If-Match'] != object['ETag'] response.status = 412 elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['Last-Modified']) diff --git a/lib/fog/storage/requests/aws/get_object_acl.rb b/lib/fog/storage/requests/aws/get_object_acl.rb index dc434026c..7df015e06 100644 --- a/lib/fog/storage/requests/aws/get_object_acl.rb +++ b/lib/fog/storage/requests/aws/get_object_acl.rb @@ -61,7 +61,7 @@ module Fog def get_object_acl(bucket_name, object_name) response = Excon::Response.new - if acl = @data[:acls][:object][bucket_name] && @data[:acls][:object][bucket_name][object_name] + if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name] response.status = 200 response.body = acl else diff --git a/lib/fog/storage/requests/aws/get_request_payment.rb b/lib/fog/storage/requests/aws/get_request_payment.rb index 7debf38fd..6bdb26c36 100644 --- a/lib/fog/storage/requests/aws/get_request_payment.rb +++ b/lib/fog/storage/requests/aws/get_request_payment.rb @@ -36,7 +36,7 @@ module Fog def get_request_payment(bucket_name) response = Excon::Response.new - if bucket = @data[:buckets][bucket_name] + if bucket = self.data[:buckets][bucket_name] response.status = 200 response.body = { 'Payer' => bucket['Payer'] } else diff --git a/lib/fog/storage/requests/aws/get_service.rb b/lib/fog/storage/requests/aws/get_service.rb index 41f5e0c9b..9b5f55cff 100644 --- a/lib/fog/storage/requests/aws/get_service.rb +++ b/lib/fog/storage/requests/aws/get_service.rb @@ -39,7 +39,7 @@ module Fog def get_service response = Excon::Response.new response.headers['Status'] = 200 - buckets = @data[:buckets].values.map do |bucket| + buckets = self.data[:buckets].values.map do |bucket| bucket.reject do |key, value| !['CreationDate', 'Name'].include?(key) end diff --git a/lib/fog/storage/requests/aws/put_bucket.rb b/lib/fog/storage/requests/aws/put_bucket.rb index 30c3d91c1..8ca6b40c2 100644 --- a/lib/fog/storage/requests/aws/put_bucket.rb +++ b/lib/fog/storage/requests/aws/put_bucket.rb @@ -48,7 +48,7 @@ DATA if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl) raise Excon::Errors::BadRequest.new('invalid x-amz-acl') else - @data[:acls][:bucket][bucket_name] = self.class.acls(acl) + self.data[:acls][:bucket][bucket_name] = self.class.acls(acl) end response = Excon::Response.new @@ -65,8 +65,8 @@ DATA else bucket['LocationConstraint'] = nil end - unless @data[:buckets][bucket_name] - @data[:buckets][bucket_name] = bucket + unless self.data[:buckets][bucket_name] + self.data[:buckets][bucket_name] = bucket end response end diff --git a/lib/fog/storage/requests/aws/put_object.rb b/lib/fog/storage/requests/aws/put_object.rb index e46895183..d92b13d35 100644 --- a/lib/fog/storage/requests/aws/put_object.rb +++ b/lib/fog/storage/requests/aws/put_object.rb @@ -52,8 +52,8 @@ module Fog if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl) raise Excon::Errors::BadRequest.new('invalid x-amz-acl') else - @data[:acls][:object][bucket_name] ||= {} - @data[:acls][:object][bucket_name][object_name] = self.class.acls(acl) + self.data[:acls][:object][bucket_name] ||= {} + self.data[:acls][:object][bucket_name][object_name] = self.class.acls(acl) end data = Fog::Storage.parse_data(data) @@ -61,7 +61,7 @@ module Fog data[:body] = data[:body].read end response = Excon::Response.new - if (bucket = @data[:buckets][bucket_name]) + if (bucket = self.data[:buckets][bucket_name]) response.status = 200 object = { :body => data[:body], diff --git a/lib/fog/storage/requests/aws/put_request_payment.rb b/lib/fog/storage/requests/aws/put_request_payment.rb index aba9cf7d8..7e8dc12e0 100644 --- a/lib/fog/storage/requests/aws/put_request_payment.rb +++ b/lib/fog/storage/requests/aws/put_request_payment.rb @@ -35,7 +35,7 @@ DATA def put_request_payment(bucket_name, payer) response = Excon::Response.new - if bucket = @data[:buckets][bucket_name] + if bucket = self.data[:buckets][bucket_name] response.status = 200 bucket['Payer'] = payer else diff --git a/lib/fog/storage/requests/google/copy_object.rb b/lib/fog/storage/requests/google/copy_object.rb index b6d78312c..c2b52477f 100644 --- a/lib/fog/storage/requests/google/copy_object.rb +++ b/lib/fog/storage/requests/google/copy_object.rb @@ -43,9 +43,9 @@ module Fog def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {}) response = Excon::Response.new - source_bucket = @data[:buckets][source_bucket_name] + source_bucket = self.data[:buckets][source_bucket_name] source_object = source_bucket && source_bucket[:objects][source_object_name] - target_bucket = @data[:buckets][target_bucket_name] + target_bucket = self.data[:buckets][target_bucket_name] if source_object && target_bucket response.status = 200 diff --git a/lib/fog/storage/requests/google/delete_bucket.rb b/lib/fog/storage/requests/google/delete_bucket.rb index 73177aa0e..7ee73d62d 100644 --- a/lib/fog/storage/requests/google/delete_bucket.rb +++ b/lib/fog/storage/requests/google/delete_bucket.rb @@ -26,14 +26,14 @@ module Fog def delete_bucket(bucket_name) response = Excon::Response.new - if @data[:buckets][bucket_name].nil? + if self.data[:buckets][bucket_name].nil? response.status = 404 raise(Excon::Errors.status_error({:expects => 204}, response)) - elsif @data[:buckets][bucket_name] && !@data[:buckets][bucket_name][:objects].empty? + elsif self.data[:buckets][bucket_name] && !self.data[:buckets][bucket_name][:objects].empty? response.status = 409 raise(Excon::Errors.status_error({:expects => 204}, response)) else - @data[:buckets].delete(bucket_name) + self.data[:buckets].delete(bucket_name) response.status = 204 end response diff --git a/lib/fog/storage/requests/google/delete_object.rb b/lib/fog/storage/requests/google/delete_object.rb index 919ee5e8d..9067efd01 100644 --- a/lib/fog/storage/requests/google/delete_object.rb +++ b/lib/fog/storage/requests/google/delete_object.rb @@ -29,7 +29,7 @@ module Fog def delete_object(bucket_name, object_name) response = Excon::Response.new - if bucket = @data[:buckets][bucket_name] + if bucket = self.data[:buckets][bucket_name] if object = bucket[:objects][object_name] response.status = 204 bucket[:objects].delete(object_name) diff --git a/lib/fog/storage/requests/google/get_bucket.rb b/lib/fog/storage/requests/google/get_bucket.rb index f9fd67772..158671e03 100644 --- a/lib/fog/storage/requests/google/get_bucket.rb +++ b/lib/fog/storage/requests/google/get_bucket.rb @@ -64,7 +64,7 @@ module Fog response = Excon::Response.new name = /(\w+\.?)*/.match(bucket_name) if bucket_name == name.to_s - if bucket = @data[:buckets][bucket_name] + if bucket = self.data[:buckets][bucket_name] contents = bucket[:objects].values.sort {|x,y| x['Key'] <=> y['Key']}.reject do |object| (options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) || (options['marker'] && object['Key'] <= options['marker']) diff --git a/lib/fog/storage/requests/google/get_bucket_acl.rb b/lib/fog/storage/requests/google/get_bucket_acl.rb index e21327207..c1dc4ae3c 100644 --- a/lib/fog/storage/requests/google/get_bucket_acl.rb +++ b/lib/fog/storage/requests/google/get_bucket_acl.rb @@ -47,7 +47,7 @@ module Fog def get_bucket_acl(bucket_name) response = Excon::Response.new - if acl = @data[:acls][:bucket][bucket_name] + if acl = self.data[:acls][:bucket][bucket_name] response.status = 200 response.body = acl else diff --git a/lib/fog/storage/requests/google/get_object.rb b/lib/fog/storage/requests/google/get_object.rb index a9aef7cc4..d7eed08ed 100644 --- a/lib/fog/storage/requests/google/get_object.rb +++ b/lib/fog/storage/requests/google/get_object.rb @@ -62,7 +62,7 @@ module Fog raise ArgumentError.new('object_name is required') end response = Excon::Response.new - if (bucket = @data[:buckets][bucket_name]) && (object = bucket[:objects][object_name]) + if (bucket = self.data[:buckets][bucket_name]) && (object = bucket[:objects][object_name]) if options['If-Match'] && options['If-Match'] != object['ETag'] response.status = 412 elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['Last-Modified']) diff --git a/lib/fog/storage/requests/google/get_object_acl.rb b/lib/fog/storage/requests/google/get_object_acl.rb index 87c11ef6c..286d9ddf0 100644 --- a/lib/fog/storage/requests/google/get_object_acl.rb +++ b/lib/fog/storage/requests/google/get_object_acl.rb @@ -58,7 +58,7 @@ module Fog def get_object_acl(bucket_name, object_name) response = Excon::Response.new - if acl = @data[:acls][:object][bucket_name] && @data[:acls][:object][bucket_name][object_name] + if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name] response.status = 200 response.body = acl else diff --git a/lib/fog/storage/requests/google/get_service.rb b/lib/fog/storage/requests/google/get_service.rb index 880d63b7a..00541b0fe 100644 --- a/lib/fog/storage/requests/google/get_service.rb +++ b/lib/fog/storage/requests/google/get_service.rb @@ -35,14 +35,14 @@ module Fog def get_service response = Excon::Response.new response.headers['Status'] = 200 - buckets = @data[:buckets].values.map do |bucket| + buckets = self.data[:buckets].values.map do |bucket| bucket.reject do |key, value| !['CreationDate', 'Name'].include?(key) end end response.body = { 'Buckets' => buckets, - 'Owner' => { 'DisplayName' => 'owner', 'ID' => 'some_id'} + 'Owner' => { 'ID' => 'some_id'} } response end diff --git a/lib/fog/storage/requests/google/put_bucket.rb b/lib/fog/storage/requests/google/put_bucket.rb index 622fd2131..e84ec1b6b 100644 --- a/lib/fog/storage/requests/google/put_bucket.rb +++ b/lib/fog/storage/requests/google/put_bucket.rb @@ -44,7 +44,7 @@ DATA if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl) raise Excon::Errors::BadRequest.new('invalid x-goog-acl') else - @data[:acls][:bucket][bucket_name] = self.class.acls(options[acl]) + self.data[:acls][:bucket][bucket_name] = self.class.acls(options[acl]) end response = Excon::Response.new response.status = 200 @@ -60,8 +60,8 @@ DATA else bucket['LocationConstraint'] = '' end - if @data[:buckets][bucket_name].nil? - @data[:buckets][bucket_name] = bucket + if self.data[:buckets][bucket_name].nil? + self.data[:buckets][bucket_name] = bucket else response.status = 409 raise(Excon::Errors.status_error({:expects => 200}, response)) diff --git a/lib/fog/storage/requests/google/put_object.rb b/lib/fog/storage/requests/google/put_object.rb index f04ee20ff..0a2279711 100644 --- a/lib/fog/storage/requests/google/put_object.rb +++ b/lib/fog/storage/requests/google/put_object.rb @@ -46,8 +46,8 @@ module Fog if !['private', 'public-read', 'public-read-write', 'authenticated-read'].include?(acl) raise Excon::Errors::BadRequest.new('invalid x-goog-acl') else - @data[:acls][:object][bucket_name] ||= {} - @data[:acls][:object][bucket_name][object_name] = self.class.acls(acl) + self.data[:acls][:object][bucket_name] ||= {} + self.data[:acls][:object][bucket_name][object_name] = self.class.acls(acl) end data = Fog::Storage.parse_data(data) @@ -55,7 +55,7 @@ module Fog data[:body] = data[:body].read end response = Excon::Response.new - if (bucket = @data[:buckets][bucket_name]) + if (bucket = self.data[:buckets][bucket_name]) response.status = 200 object = { :body => data[:body], diff --git a/lib/fog/terremark/requests/shared/get_network.rb b/lib/fog/terremark/requests/shared/get_network.rb index c45878b8e..f86dc8d40 100644 --- a/lib/fog/terremark/requests/shared/get_network.rb +++ b/lib/fog/terremark/requests/shared/get_network.rb @@ -28,7 +28,7 @@ module Fog def get_network(network_id) network_id = network_id.to_i response = Excon::Response.new - if network = @data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| network[:id] == network_id } + if network = self.data[:organizations].map { |org| org[:vdcs].map { |vdc| vdc[:networks] } }.flatten.detect { |network| network[:id] == network_id } body = { "links" => [], "type" => "application/vnd.vmware.vcloud.network+xml", diff --git a/lib/fog/terremark/requests/shared/get_organization.rb b/lib/fog/terremark/requests/shared/get_organization.rb index 40247d316..8d2180585 100644 --- a/lib/fog/terremark/requests/shared/get_organization.rb +++ b/lib/fog/terremark/requests/shared/get_organization.rb @@ -36,7 +36,7 @@ module Fog organization_id = organization_id.to_i response = Excon::Response.new - if org = @data[:organizations].detect { |org| org[:info][:id] == organization_id } + if org = self.data[:organizations].detect { |org| org[:info][:id] == organization_id } body = { "name" => org[:info][:name], "href" => "#{@base_url}/org/#{org[:info][:id]}", diff --git a/lib/fog/terremark/requests/shared/get_organizations.rb b/lib/fog/terremark/requests/shared/get_organizations.rb index 0036526d6..4fc2f9b0d 100644 --- a/lib/fog/terremark/requests/shared/get_organizations.rb +++ b/lib/fog/terremark/requests/shared/get_organizations.rb @@ -31,7 +31,7 @@ module Fog def get_organizations response = Excon::Response.new - org_list = @data[:organizations].map do |organization| + org_list = self.data[:organizations].map do |organization| { "name" => organization[:info][:name], "href" => "#{@base_url}/org/#{organization[:info][:id]}", "type" => "application/vnd.vmware.vcloud.org+xml" diff --git a/lib/fog/terremark/requests/shared/get_public_ips.rb b/lib/fog/terremark/requests/shared/get_public_ips.rb index 3a6ac419d..6815320fc 100644 --- a/lib/fog/terremark/requests/shared/get_public_ips.rb +++ b/lib/fog/terremark/requests/shared/get_public_ips.rb @@ -35,7 +35,7 @@ module Fog vdc_id = vdc_id.to_i response = Excon::Response.new - if vdc = @data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == vdc_id } + if vdc = self.data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == vdc_id } body = { "PublicIpAddresses" => [] } vdc[:public_ips].each do |ip| ip = { "name" => ip[:name], diff --git a/lib/fog/terremark/requests/shared/get_vdc.rb b/lib/fog/terremark/requests/shared/get_vdc.rb index 2eb2d109f..46fcfa22f 100644 --- a/lib/fog/terremark/requests/shared/get_vdc.rb +++ b/lib/fog/terremark/requests/shared/get_vdc.rb @@ -37,7 +37,7 @@ module Fog vdc_id = vdc_id.to_i response = Excon::Response.new - if vdc = @data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == vdc_id } + if vdc = self.data[:organizations].map { |org| org[:vdcs] }.flatten.detect { |vdc| vdc[:id] == vdc_id } body = { "name" => vdc[:name], "href" => "#{@base_url}/vdc/#{vdc[:id]}", diff --git a/lib/fog/terremark/shared.rb b/lib/fog/terremark/shared.rb index 88f3e33c0..c068c0256 100644 --- a/lib/fog/terremark/shared.rb +++ b/lib/fog/terremark/shared.rb @@ -208,6 +208,10 @@ module Fog end end' self.class.instance_eval ' + def self.reset + @data = nil + end + def self.reset_data(keys=data.keys) for key in [*keys] data.delete(key) diff --git a/lib/fog/terremark/vcloud.rb b/lib/fog/terremark/vcloud.rb index 2ecc09fe4..94c7c67e0 100644 --- a/lib/fog/terremark/vcloud.rb +++ b/lib/fog/terremark/vcloud.rb @@ -106,8 +106,18 @@ module Fog @base_url = Fog::Terremark::Vcloud::Defaults::SCHEME + "://" + Fog::Terremark::Vcloud::Defaults::HOST + Fog::Terremark::Vcloud::Defaults::PATH - @data = self.class.data[:terremark_vcloud_username] + + @terremark_username = options[:terremark_vcloud_username] end + + def data + self.class.data[@terremark_username] + end + + def reset_data + self.class.data.delete(@terremark_username) + end + end end diff --git a/spec/ecloud/spec_helper.rb b/spec/ecloud/spec_helper.rb index df9e30b8c..f5aab6c4e 100644 --- a/spec/ecloud/spec_helper.rb +++ b/spec/ecloud/spec_helper.rb @@ -253,7 +253,7 @@ end Spec::Runner.configure do |config| config.after(:all) do - Fog::Ecloud::Compute::Mock.data_reset + Fog::Ecloud::Compute::Mock.reset end config.before(:each, :type => :vcloud_request) do @@ -261,12 +261,12 @@ Spec::Runner.configure do |config| end config.before(:each, :type => :mock_tmrk_ecloud_request) do - Fog::Ecloud::Compute::Mock.data_reset + Fog::Ecloud::Compute::Mock.reset setup_ecloud_mock_data @vcloud = Fog::Ecloud::Compute.new(:ecloud_username => "foo", :ecloud_password => "bar", :ecloud_versions_uri => "http://fakey.com/api/versions") end config.before(:each, :type => :mock_tmrk_ecloud_model) do - Fog::Ecloud::Compute::Mock.data_reset + Fog::Ecloud::Compute::Mock.reset setup_ecloud_mock_data @vcloud = Fog::Ecloud::Compute.new(:ecloud_username => "foo", :ecloud_password => "bar", :ecloud_versions_uri => "http://fakey.com/api/versions") end