fog 0.8.2 → 0.9.0

data/tests/compute/requests/aws/availability_zone_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::Compute | availability zone requests', ['aws']) do
+Shindo.tests('Fog::Compute[:aws] | availability zone requests', ['aws']) do
 
   @availability_zones_format = {
     'availabilityZoneInfo'  => [{
@@ -13,11 +13,11 @@ Shindo.tests('AWS::Compute | availability zone requests', ['aws']) do
   tests('success') do
 
     tests('#describe_availability_zones').formats(@availability_zones_format) do
-      AWS[:compute].describe_availability_zones.body
+      Fog::Compute[:aws].describe_availability_zones.body
     end
 
     tests("#describe_availability_zones('zone-name' => 'us-east-1a')").formats(@availability_zones_format) do
-      AWS[:compute].describe_availability_zones('zone-name' => 'us-east-1a').body
+      Fog::Compute[:aws].describe_availability_zones('zone-name' => 'us-east-1a').body
     end
 
   end

data/tests/compute/requests/aws/image_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::Compute | image requests', ['aws']) do
+Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
 
   @images_format = {
     'imagesSet'    => [{
@@ -24,12 +24,12 @@ Shindo.tests('AWS::Compute | image requests', ['aws']) do
 
     # the result for this is HUGE and relatively uninteresting...
     # tests("#describe_images").formats(@images_format) do
-    #   AWS[:compute].describe_images.body
+    #   Fog::Compute[:aws].describe_images.body
     # end
 
     tests("#describe_images('ImageId' => '#{GENTOO_AMI}')").formats(@images_format) do
       pending if Fog.mocking?
-      AWS[:compute].describe_images('ImageId' => GENTOO_AMI).body
+      Fog::Compute[:aws].describe_images('ImageId' => GENTOO_AMI).body
     end
 
   end

data/tests/compute/requests/aws/instance_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::Compute | instance requests', ['aws']) do
+Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
 
   @instance_format = {
     # 'architecture'    => String,
@@ -79,35 +79,35 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
 
     @instance_id = nil
     # Use a MS Windows AMI to test #get_password_data
-    @windows_ami = 'ami-ee926087' # Microsoft Windows Server 2008 R2 Base 64-bit
+    @windows_ami = 'ami-1cbd4475' # Microsoft Windows Server 2008 R2 Base 64-bit
 
     # Create a keypair for decrypting the password
     key_name = 'fog-test-key'
-    key = AWS.key_pairs.create(:name => key_name)
+    key = Fog::Compute[:aws].key_pairs.create(:name => key_name)
 
     tests("#run_instances").formats(@run_instances_format) do
-      data = AWS[:compute].run_instances(@windows_ami, 1, 1, 'InstanceType' => 't1.micro', 'KeyName' => key_name).body
+      data = Fog::Compute[:aws].run_instances(@windows_ami, 1, 1, 'InstanceType' => 't1.micro', 'KeyName' => key_name).body
       @instance_id = data['instancesSet'].first['instanceId']
       data
     end
 
-    server = AWS[:compute].servers.get(@instance_id)
+    server = Fog::Compute[:aws].servers.get(@instance_id)
     while server.nil? do
       # It may take a moment to get the server after launching it
       sleep 0.1
-      server = AWS[:compute].servers.get(@instance_id)
+      server = Fog::Compute[:aws].servers.get(@instance_id)
     end
     server.wait_for { ready? }
 
     tests("#describe_instances").formats(@describe_instances_format) do
-       AWS[:compute].describe_instances.body
+       Fog::Compute[:aws].describe_instances.body
     end
 
     # Launch another instance to test filters
-    another_server = AWS[:compute].servers.create
+    another_server = Fog::Compute[:aws].servers.create
 
     tests("#describe_instances('instance-id' => '#{@instance_id}')").formats(@describe_instances_format) do
-      body = AWS[:compute].describe_instances('instance-id' => @instance_id).body
+      body = Fog::Compute[:aws].describe_instances('instance-id' => @instance_id).body
       tests("returns 1 instance").returns(1) { body['reservationSet'].size }
       body
     end
@@ -115,11 +115,11 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
     another_server.destroy
 
     tests("#get_console_output('#{@instance_id}')").formats(@get_console_output_format) do
-      AWS[:compute].get_console_output(@instance_id).body
+      Fog::Compute[:aws].get_console_output(@instance_id).body
     end
 
     tests("#get_password_data('#{@instance_id}')").formats(@get_password_data_format) do
-      result = AWS[:compute].get_password_data(@instance_id).body
+      result = Fog::Compute[:aws].get_password_data(@instance_id).body
 
       tests("key can decrypt passwordData").returns(true) do
 
@@ -127,7 +127,7 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
 
         password_data = result['passwordData']
         Fog.wait_for do
-          password_data ||= AWS[:compute].get_password_data(@instance_id).body['passwordData']
+          password_data ||= Fog::Compute[:aws].get_password_data(@instance_id).body['passwordData']
         end
 
         decoded_password = Base64.decode64(password_data)
@@ -140,31 +140,31 @@ Shindo.tests('AWS::Compute | instance requests', ['aws']) do
     key.destroy
 
     tests("#reboot_instances('#{@instance_id}')").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].reboot_instances(@instance_id).body
+      Fog::Compute[:aws].reboot_instances(@instance_id).body
     end
 
     tests("#terminate_instances('#{@instance_id}')").formats(@terminate_instances_format) do
-      AWS[:compute].terminate_instances(@instance_id).body
+      Fog::Compute[:aws].terminate_instances(@instance_id).body
     end
 
   end
 
   tests('failure') do
 
-    tests("#get_console_output('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].get_console_output('i-00000000')
+    tests("#get_console_output('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].get_console_output('i-00000000')
     end
 
-    tests("#get_password_data('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].get_password_data('i-00000000')
+    tests("#get_password_data('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].get_password_data('i-00000000')
     end
 
-    tests("#reboot_instances('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].reboot_instances('i-00000000')
+    tests("#reboot_instances('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].reboot_instances('i-00000000')
     end
 
-    tests("#terminate_instances('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].terminate_instances('i-00000000')
+    tests("#terminate_instances('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].terminate_instances('i-00000000')
     end
 
   end

data/tests/compute/requests/aws/key_pair_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::Compute | key pair requests', ['aws']) do
+Shindo.tests('Fog::Compute[:aws] | key pair requests', ['aws']) do
 
   tests('success') do
 
@@ -20,7 +20,7 @@ Shindo.tests('AWS::Compute | key pair requests', ['aws']) do
     @public_key_material = 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1SL+kgze8tvSFW6Tyj3RyZc9iFVQDiCKzjgwn2tS7hyWxaiDhjfY2mBYSZwFdKN+ZdsXDJL4CPutUg4DKoQneVgIC1zuXrlpPbaT0Btu2aFd4qNfJ85PBrOtw2GrWZ1kcIgzZ1mMbQt6i1vhsySD2FEj+5kGHouNxQpI5dFR5K+nGgcTLFGnzb/MPRBk136GVnuuYfJ2I4va/chstThoP8UwnoapRHcBpwTIfbmmL91BsRVqjXZEUT73nxpxFeXXidYwhHio+5dXwE0aM/783B/3cPG6FVoxrBvjoNpQpAcEyjtRh9lpwHZtSEW47WNzpIW3PhbQ8j4MryznqF1Rhw=='
 
     tests("#create_key_pair('#{@key_pair_name}')").formats(@keypair_format.merge({'keyMaterial' => String})) do
-      body = AWS[:compute].create_key_pair(@key_pair_name).body
+      body = Fog::Compute[:aws].create_key_pair(@key_pair_name).body
       tests("key material").returns(OpenSSL::PKey::RSA, "is a valid private RSA key") do
         OpenSSL::PKey::RSA.new(body['keyMaterial']).class
       end
@@ -28,36 +28,36 @@ Shindo.tests('AWS::Compute | key pair requests', ['aws']) do
     end
 
     tests('#describe_key_pairs').formats(@keypairs_format) do
-      AWS[:compute].describe_key_pairs.body
+      Fog::Compute[:aws].describe_key_pairs.body
     end
 
     tests("#describe_key_pairs('key-name' => '#{@key_pair_name}')").formats(@keypairs_format) do
-      AWS[:compute].describe_key_pairs('key-name' => @key_pair_name).body
+      Fog::Compute[:aws].describe_key_pairs('key-name' => @key_pair_name).body
     end
 
     tests("#delete_key_pair('#{@key_pair_name}')").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].delete_key_pair(@key_pair_name).body
+      Fog::Compute[:aws].delete_key_pair(@key_pair_name).body
     end
 
     tests("#import_key_pair('fog_import_key_pair', '#{@public_key_material}')").formats(@keypair_format) do
-      AWS[:compute].import_key_pair('fog_import_key_pair', @public_key_material).body
+      Fog::Compute[:aws].import_key_pair('fog_import_key_pair', @public_key_material).body
     end
 
     tests("#delete_key_pair('fog_import_key_pair)").succeeds do
-      AWS[:compute].delete_key_pair('fog_import_key_pair')
+      Fog::Compute[:aws].delete_key_pair('fog_import_key_pair')
     end
 
     tests("#delete_key_pair('not_a_key_name')").succeeds do
-      AWS[:compute].delete_key_pair('not_a_key_name')
+      Fog::Compute[:aws].delete_key_pair('not_a_key_name')
     end
 
   end
   tests('failure') do
 
-    @key_pair = AWS[:compute].key_pairs.create(:name => 'fog_key_pair')
+    @key_pair = Fog::Compute[:aws].key_pairs.create(:name => 'fog_key_pair')
 
-    tests("duplicate #create_key_pair('#{@key_pair.name}')").raises(Fog::AWS::Compute::Error) do
-      AWS[:compute].create_key_pair(@key_pair.name)
+    tests("duplicate #create_key_pair('#{@key_pair.name}')").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_key_pair(@key_pair.name)
     end
 
     @key_pair.destroy

data/tests/compute/requests/aws/region_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::Compute | region requests', ['aws']) do
+Shindo.tests('Fog::Compute[:aws] | region requests', ['aws']) do
 
   @regions_format = {
     'regionInfo'  => [{
@@ -11,11 +11,11 @@ Shindo.tests('AWS::Compute | region requests', ['aws']) do
   tests('success') do
 
     tests("#describe_regions").formats(@regions_format) do
-      AWS[:compute].describe_regions.body
+      Fog::Compute[:aws].describe_regions.body
     end
 
     tests("#describe_regions('region-name' => 'us-east-1')").formats(@regions_format) do
-      AWS[:compute].describe_regions('region-name' => 'us-east-1').body
+      Fog::Compute[:aws].describe_regions('region-name' => 'us-east-1').body
     end
 
   end

data/tests/compute/requests/aws/security_group_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::Compute | security group requests', ['aws']) do
+Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
 
   @security_groups_format = {
     'requestId'           => String,
@@ -16,16 +16,16 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
     }]
   }
 
-  @owner_id = AWS[:compute].describe_security_groups('group-name' => 'default').body['securityGroupInfo'].first['ownerId']
+  @owner_id = Fog::Compute[:aws].describe_security_groups('group-name' => 'default').body['securityGroupInfo'].first['ownerId']
 
   tests('success') do
 
     tests("#create_security_group('fog_security_group', 'tests group')").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].create_security_group('fog_security_group', 'tests group').body
+      Fog::Compute[:aws].create_security_group('fog_security_group', 'tests group').body
     end
 
     tests("#authorize_security_group_ingress('fog_security_group', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].authorize_security_group_ingress(
+      Fog::Compute[:aws].authorize_security_group_ingress(
         'fog_security_group',
         {
           'FromPort' => 80,
@@ -36,7 +36,7 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
     end
 
     tests("#authorize_security_group_ingress('fog_security_group', {'SourceSecurityGroupName' => 'fog_security_group', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].authorize_security_group_ingress(
+      Fog::Compute[:aws].authorize_security_group_ingress(
         'fog_security_group',
         {
           'SourceSecurityGroupName'     => 'fog_security_group',
@@ -46,15 +46,15 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
     end
 
     tests("#describe_security_groups").formats(@security_groups_format) do
-      AWS[:compute].describe_security_groups.body
+      Fog::Compute[:aws].describe_security_groups.body
     end
 
     tests("#describe_security_groups('group-name' => 'fog_security_group')").formats(@security_groups_format) do
-      AWS[:compute].describe_security_groups('group-name' => 'fog_security_group').body
+      Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body
     end
 
     tests("#revoke_security_group_ingress('fog_security_group', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].revoke_security_group_ingress(
+      Fog::Compute[:aws].revoke_security_group_ingress(
         'fog_security_group',
         {
           'FromPort' => 80,
@@ -65,7 +65,7 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
     end
 
     tests("#revoke_security_group_ingress('fog_security_group', {'SourceSecurityGroupName' => 'fog_security_group', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].revoke_security_group_ingress(
+      Fog::Compute[:aws].revoke_security_group_ingress(
       'fog_security_group',
         {
           'GroupName'                   => 'fog_security_group',
@@ -76,20 +76,20 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
     end
 
     tests("#delete_security_group('fog_security_group')").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].delete_security_group('fog_security_group').body
+      Fog::Compute[:aws].delete_security_group('fog_security_group').body
     end
 
   end
   tests('failure') do
 
-    @security_group = AWS[:compute].security_groups.create(:description => 'tests group', :name => 'fog_security_group')
+    @security_group = Fog::Compute[:aws].security_groups.create(:description => 'tests group', :name => 'fog_security_group')
 
-    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::AWS::Compute::Error) do
-      AWS[:compute].create_security_group(@security_group.name, @security_group.description)
+    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_security_group(@security_group.name, @security_group.description)
     end
 
-    tests("#authorize_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].authorize_security_group_ingress(
+    tests("#authorize_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].authorize_security_group_ingress(
         'not_a_group_name',
         {
           'FromPort' => 80,
@@ -99,8 +99,8 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
       )
     end
 
-    tests("#authorize_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].authorize_security_group_ingress(
+    tests("#authorize_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].authorize_security_group_ingress(
         'not_a_group_name',
         {
           'SourceSecurityGroupName'     => 'not_a_group_name',
@@ -109,8 +109,8 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
       )
     end
 
-    tests("#revoke_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].revoke_security_group_ingress(
+    tests("#revoke_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].revoke_security_group_ingress(
         'not_a_group_name',
         {
           'FromPort' => 80,
@@ -120,8 +120,8 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
       )
     end
 
-    tests("#revoke_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].revoke_security_group_ingress(
+    tests("#revoke_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].revoke_security_group_ingress(
         'not_a_group_name',
         {
           'SourceSecurityGroupName'     => 'not_a_group_name',
@@ -130,8 +130,8 @@ Shindo.tests('AWS::Compute | security group requests', ['aws']) do
       )
     end
 
-    tests("#delete_security_group('not_a_group_name')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].delete_security_group('not_a_group_name')
+    tests("#delete_security_group('not_a_group_name')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].delete_security_group('not_a_group_name')
     end
 
     @security_group.destroy

data/tests/compute/requests/aws/snapshot_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::Compute | snapshot requests', ['aws']) do
+Shindo.tests('Fog::Compute[:aws] | snapshot requests', ['aws']) do
 
   @snapshot_format = {
     'description' => Fog::Nullable::String,
@@ -16,38 +16,38 @@ Shindo.tests('AWS::Compute | snapshot requests', ['aws']) do
     'snapshotSet' => [@snapshot_format.merge('tagSet' => {})]
   }
 
-  @volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
+  @volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
 
   tests('success') do
 
     @snapshot_id = nil
 
     tests("#create_snapshot(#{@volume.identity})").formats(@snapshot_format.merge('progress' => NilClass, 'requestId' => String)) do
-      data = AWS[:compute].create_snapshot(@volume.identity).body
+      data = Fog::Compute[:aws].create_snapshot(@volume.identity).body
       @snapshot_id = data['snapshotId']
       data
     end
 
-    Fog.wait_for { AWS[:compute].snapshots.get(@snapshot_id) }
-    AWS[:compute].snapshots.get(@snapshot_id).wait_for { ready? }
+    Fog.wait_for { Fog::Compute[:aws].snapshots.get(@snapshot_id) }
+    Fog::Compute[:aws].snapshots.get(@snapshot_id).wait_for { ready? }
 
     tests("#describe_snapshots").formats(@snapshots_format) do
-      AWS[:compute].describe_snapshots.body
+      Fog::Compute[:aws].describe_snapshots.body
     end
 
     tests("#describe_snapshots('snapshot-id' => '#{@snapshot_id}')").formats(@snapshots_format) do
-      AWS[:compute].describe_snapshots('snapshot-id' => @snapshot_id).body
+      Fog::Compute[:aws].describe_snapshots('snapshot-id' => @snapshot_id).body
     end
 
     tests("#delete_snapshots(#{@snapshot_id})").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].delete_snapshot(@snapshot_id).body
+      Fog::Compute[:aws].delete_snapshot(@snapshot_id).body
     end
 
   end
-  tests ('failure') do
+  tests('failure') do
 
-    tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].delete_snapshot('snap-00000000')
+    tests("#delete_snapshot('snap-00000000')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].delete_snapshot('snap-00000000')
     end
 
   end

data/tests/compute/requests/aws/tag_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::Compute | tag requests', ['aws']) do
+Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
 
   @tags_format = {
     'tagSet'    => [{
@@ -10,28 +10,28 @@ Shindo.tests('AWS::Compute | tag requests', ['aws']) do
     'requestId' => String
   }
 
-  @volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
+  @volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
   @volume.wait_for { ready? }
 
   tests('success') do
 
     tests("#create_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].create_tags(@volume.identity, 'foo' => 'bar').body
+      Fog::Compute[:aws].create_tags(@volume.identity, 'foo' => 'bar').body
     end
 
     tests('#describe_tags').formats(@tags_format) do
       pending if Fog.mocking?
-      AWS[:compute].describe_tags.body
+      Fog::Compute[:aws].describe_tags.body
     end
 
     tests("#delete_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do
       pending if Fog.mocking?
-      AWS[:compute].delete_tags(@volume.identity, 'foo' => 'bar').body
+      Fog::Compute[:aws].delete_tags(@volume.identity, 'foo' => 'bar').body
     end
 
     tests("#delete_tags('vol-00000000', 'baz' => 'qux')").succeeds do
       pending if Fog.mocking?
-      AWS[:compute].delete_tags('vol-00000000', 'baz' => 'qux')
+      Fog::Compute[:aws].delete_tags('vol-00000000', 'baz' => 'qux')
     end
 
   end
@@ -39,7 +39,7 @@ Shindo.tests('AWS::Compute | tag requests', ['aws']) do
   tests('failure') do
 
     tests("#create_tags('vol-00000000', 'baz' => 'qux')").raises(Fog::Service::NotFound) do
-      AWS[:compute].create_tags('vol-00000000', 'baz' => 'qux')
+      Fog::Compute[:aws].create_tags('vol-00000000', 'baz' => 'qux')
     end
 
   end