fog-aws 3.0.0 → 3.10.0

data/tests/requests/compute/region_tests.rb

@@ -21,7 +21,7 @@ Shindo.tests('Fog::Compute[:aws] | region requests', ['aws']) do
     tests("#incorrect_region") do
 
       raises(ArgumentError, "Unknown region: world-antarctica-1") do
-        Fog::Compute::AWS.new({:aws_access_key_id => 'dummykey',
+        Fog::AWS::Compute.new({:aws_access_key_id => 'dummykey',
                 :aws_secret_access_key => 'dummysecret',
                 :aws_session_token => 'dummytoken',
                 :region => 'world-antarctica-1'})
@@ -30,7 +30,7 @@ Shindo.tests('Fog::Compute[:aws] | region requests', ['aws']) do
     end
 
     tests("#unknown_endpoint").formats(@regions_format) do
-      Fog::Compute::AWS.new({:aws_access_key_id => 'dummykey',
+      Fog::AWS::Compute.new({:aws_access_key_id => 'dummykey',
                              :aws_secret_access_key => 'dummysecret',
                              :aws_session_token => 'dummytoken',
                              :region => 'world-antarctica-1',
@@ -38,8 +38,8 @@ Shindo.tests('Fog::Compute[:aws] | region requests', ['aws']) do
     end
 
     tests("#invalid_endpoint") do
-      raises(Fog::Compute::AWS::InvalidURIError) do
-        Fog::Compute::AWS.new({:aws_access_key_id => 'dummykey',
+      raises(Fog::AWS::Compute::InvalidURIError) do
+        Fog::AWS::Compute.new({:aws_access_key_id => 'dummykey',
                              :aws_secret_access_key => 'dummysecret',
                              :aws_session_token => 'dummytoken',
                              :region => 'world-antarctica-1',

data/tests/requests/compute/route_tests.rb

@@ -41,7 +41,7 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
     'requestId'    => String
   }
 
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+  Fog::AWS::Compute::Mock.reset if Fog.mocking?
   vpc = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
   if !Fog.mocking?
     vpc.wait_for { state.eql? "available" }
@@ -174,7 +174,7 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
     tests('#create_route_table').raises(ArgumentError) do
       Fog::Compute[:aws].create_route_table
     end
-    tests("#create_route_table('vpc-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route_table('vpc-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route_table('vpc-00000000')
     end
 
@@ -186,10 +186,10 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
     tests('#associate_route_table').raises(ArgumentError) do
       Fog::Compute[:aws].associate_route_table
     end
-    tests("#associate_route_table('rtb-00000000', '#{@subnet_id}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#associate_route_table('rtb-00000000', '#{@subnet_id}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].associate_route_table('rtb-00000000', @subnet_id)
     end
-    tests("#associate_route_table('#{@route_table_id}', 'subnet-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#associate_route_table('#{@route_table_id}', 'subnet-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].associate_route_table(@route_table_id, 'subnet-00000000')
     end
 
@@ -207,30 +207,30 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
     tests('#create_route').raises(ArgumentError) do
       Fog::Compute[:aws].create_route
     end
-    tests("#create_route('rtb-00000000', '#{@destination_cidr_block}', '#{@internet_gateway_id}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('rtb-00000000', '#{@destination_cidr_block}', '#{@internet_gateway_id}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route('rtb-00000000', @destination_cidr_block, @internet_gateway_id)
     end
-    tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', 'igw-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', 'igw-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, 'igw-00000000')
     end
-    tests("#create_route('rtb-00000000', '#{@destination_cidr_block}', 'nil', '#{instance.id}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('rtb-00000000', '#{@destination_cidr_block}', 'nil', '#{instance.id}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route('rtb-00000000', @destination_cidr_block, instance.id)
     end
-    tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', 'nil', 'i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', 'nil', 'i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, nil, 'i-00000000')
     end
-    tests("#create_route('#{@route_table_id}', '#{@destinationCidrBlock}', 'nil', 'nil', 'eni-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('#{@route_table_id}', '#{@destinationCidrBlock}', 'nil', 'nil', 'eni-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, nil, nil, 'eni-00000000')
     end
-    tests("#create_route('#rtb-00000000', '#{@destination_cidr_block}', 'nil, 'nil', '#{@network_interface_id}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_route('#rtb-00000000', '#{@destination_cidr_block}', 'nil, 'nil', '#{@network_interface_id}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_route('rtb-00000000', @destination_cidr_block, nil, nil, @network_interface_id)
     end
-    tests("#create_route same destination_cidr_block").raises(Fog::Compute::AWS::Error) do
+    tests("#create_route same destination_cidr_block").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, @internet_gateway_id)
       Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, nil, nil, @network_interface_id).body
     end
     if !Fog.mocking?
-      tests("#create_route less specific destination_cidr_block").raises(Fog::Compute::AWS::Error) do
+      tests("#create_route less specific destination_cidr_block").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].create_route(@route_table_id, '10.0.10.0/25', @internet_gateway_id)
        Fog::Compute[:aws].delete_route(@route_table_id, @destination_cidr_block).body
       end
@@ -249,29 +249,29 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
     tests('#replace_route').raises(ArgumentError) do
       Fog::Compute[:aws].replace_route
     end
-    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'internetGatewayId' => '#{@internet_gateway_id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'internetGatewayId' => '#{@internet_gateway_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block, {'internetGatewayId' => @internet_gateway_id})
     end
-    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block)
     end
-    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'gatewayId' => 'igw-00000000'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'gatewayId' => 'igw-00000000'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'gatewayId' => 'igw-00000000'})
     end
-    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'instanceId' => '#{instance.id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'instanceId' => '#{instance.id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block, {'instanceId' => instance.id})
     end
-    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'instanceId' => 'i-00000000'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'instanceId' => 'i-00000000'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'instanceId' => 'i-00000000'})
     end
-    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'networkInterfaceId' => 'eni-00000000'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'networkInterfaceId' => 'eni-00000000'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'networkInterfaceId' => 'eni-00000000'})
     end
-    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'networkInterfaceId' => '#{@network_interface_id}'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#replace_route('rtb-00000000', '#{@destination_cidr_block}', {'networkInterfaceId' => '#{@network_interface_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].replace_route('rtb-00000000', @destination_cidr_block, {'networkInterfaceId' => @network_interface_id})
     end
     if !Fog.mocking?
-      tests("#replace_route less specific destination_cidr_block").raises(Fog::Compute::AWS::Error) do
+      tests("#replace_route less specific destination_cidr_block").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/25', {'gatewayId' => @internet_gateway_id})
       end
     end
@@ -290,7 +290,7 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
     tests('#delete_route').raises(ArgumentError) do
       Fog::Compute[:aws].delete_route
     end
-    tests("#delete_route('rtb-00000000', '#{@destination_cidr_block}')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_route('rtb-00000000', '#{@destination_cidr_block}')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_route('rtb-00000000', @destination_cidr_block)
     end
 
@@ -301,7 +301,7 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
     tests('#disassociate_route_table').raises(ArgumentError) do
       Fog::Compute[:aws].disassociate_route_table
     end
-    tests("#disassociate_route_table('rtbassoc-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#disassociate_route_table('rtbassoc-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].disassociate_route_table('rtbassoc-00000000')
     end
 
@@ -312,14 +312,14 @@ Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
     tests('#delete_route_table').raises(ArgumentError) do
       Fog::Compute[:aws].delete_route_table
     end
-    tests("#delete_route_table('rtb-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_route_table('rtb-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_route_table('rtb-00000000')
     end
 
     # Dependency Tests
     #   - route is depending on route_table, so route_table cannot be deleted
     #
-    tests("#delete_route_table('#{@route_table_id}')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_route_table('#{@route_table_id}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].delete_route_table(@route_table_id)
     end
 

data/tests/requests/compute/security_group_tests.rb

@@ -318,11 +318,11 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     @security_group = Fog::Compute[:aws].security_groups.create(:description => 'tests group', :name => 'fog_security_group')
     @other_security_group = Fog::Compute[:aws].security_groups.create(:description => 'tests group', :name => 'fog_other_security_group')
 
-    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::Compute::AWS::Error) do
+    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::AWS::Compute::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::Compute::AWS::NotFound) do
+    tests("#authorize_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].authorize_security_group_ingress(
         'not_a_group_name',
         {
@@ -333,7 +333,7 @@ Shindo.tests('Fog::Compute[:aws] | 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::Compute::AWS::NotFound) do
+    tests("#authorize_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].authorize_security_group_ingress(
         'not_a_group_name',
         {
@@ -347,7 +347,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]}).body
     end
 
-    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").raises(Fog::Compute::AWS::Error) do
+    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})
     end
 
@@ -355,7 +355,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'Groups' => [{'GroupName' => @other_security_group.name}], 'FromPort' => 80, 'ToPort' => 80, 'IpProtocol' => 'tcp'}]}).body
     end
 
-    tests("#delete_security_group('#{@other_security_group.name}')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_security_group('#{@other_security_group.name}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].delete_security_group(@other_security_group.name)
     end
 
@@ -374,16 +374,16 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     ]
 
     broken_params.each do |broken_params_item|
-      tests("#authorize_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#authorize_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', broken_params_item)
       end
 
-      tests("#revoke_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#revoke_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].revoke_security_group_ingress('fog_security_group', broken_params_item)
       end
     end
 
-    tests("#revoke_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#revoke_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].revoke_security_group_ingress(
         'not_a_group_name',
         {
@@ -394,7 +394,7 @@ Shindo.tests('Fog::Compute[:aws] | 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::Compute::AWS::NotFound) do
+    tests("#revoke_security_group_ingress('not_a_group_name', {'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].revoke_security_group_ingress(
         'not_a_group_name',
         {
@@ -404,13 +404,13 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       )
     end
 
-    tests("#delete_security_group('not_a_group_name')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_security_group('not_a_group_name')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_security_group('not_a_group_name')
     end
 
     @rds_security_group = Fog::AWS[:rds].security_groups.create(:id => "rdsgroup", :description => 'fog rds test')
 
-    tests("#delete_security_group('when authorized to an rds firewall')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_security_group('when authorized to an rds firewall')").raises(Fog::AWS::Compute::Error) do
       @rds_security_group.authorize_ec2_security_group(@security_group.name)
       Fog::Compute[:aws].delete_security_group(@security_group.name)
     end
@@ -420,7 +420,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     @security_group.destroy
     @other_security_group.destroy
 
-    tests("#delete_security_group('default')").raises(Fog::Compute::AWS::Error) do
+    tests("#delete_security_group('default')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].delete_security_group('default')
     end
 
@@ -432,11 +432,11 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
                     ]
 
     broken_params.each do |list_elem|
-      tests("#authorize_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#authorize_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].authorize_security_group_ingress(list_elem[0], list_elem[1])
       end
 
-      tests("#revoke_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::Compute::AWS::Error) do
+      tests("#revoke_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::AWS::Compute::Error) do
         Fog::Compute[:aws].revoke_security_group_ingress(list_elem[0], list_elem[1])
       end
     end

data/tests/requests/compute/snapshot_tests.rb

@@ -66,7 +66,7 @@ Shindo.tests('Fog::Compute[:aws] | snapshot requests', ['aws']) do
   end
   tests('failure') do
 
-    tests("#delete_snapshot('snap-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_snapshot('snap-00000000')
     end
 

data/tests/requests/compute/spot_datafeed_subscription_tests.rb

@@ -38,7 +38,7 @@ Shindo.tests('Fog::Compute[:aws] | spot datafeed subscription requests', ['aws']
   tests('failure') do
     pending if Fog.mocking?
 
-    tests("#describe_spot_datafeed_subscription").raises(Fog::Compute::AWS::NotFound) do
+    tests("#describe_spot_datafeed_subscription").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].describe_spot_datafeed_subscription
     end
   end

data/tests/requests/compute/subnet_tests.rb

@@ -67,17 +67,17 @@ Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
   end
 
   tests('failure') do
-    tests("#create_subnet('vpc-00000000', '10.0.10.0/16')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#create_subnet('vpc-00000000', '10.0.10.0/16')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].create_subnet('vpc-00000000', '10.0.10.0/16')
     end
 
-    tests("#create_subnet('#{@vpc_id}', '10.0.9.16/28')").raises(Fog::Compute::AWS::Error) do
+    tests("#create_subnet('#{@vpc_id}', '10.0.9.16/28')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.9.16/28')
     end
 
     # Attempt to create two subnets with conflicting CIDRs in the same VPC
     tests("#create_subnet('#{@vpc_id}', '10.0.10.0/24'); " \
-      "#create_subnet('#{@vpc_id}', '10.0.10.64/26'); ").raises(::Fog::Compute::AWS::Error) do
+      "#create_subnet('#{@vpc_id}', '10.0.10.64/26'); ").raises(::Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.10.0/24')
       Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.10.64/26')
     end

data/tests/requests/compute/tag_tests.rb

@@ -1,5 +1,5 @@
 Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+  Fog::AWS::Compute::Mock.reset if Fog.mocking?
 
   @tags_format = {
     'tagSet'    => [{
@@ -18,7 +18,7 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
 
   tests('success') do
     if Fog.mocking?
-      @other_account = Fog::Compute::AWS.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
+      @other_account = Fog::AWS::Compute.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
       @image_id = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1').body['imageId']
     end
 
@@ -97,5 +97,5 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
       Fog::Compute[:aws].create_tags('vpc-123', 'type' => 'bad_resource_id')
     end
   end
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+  Fog::AWS::Compute::Mock.reset if Fog.mocking?
 end

data/tests/requests/compute/volume_tests.rb

@@ -207,52 +207,52 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
   tests('failure') do
     @volume = Fog::Compute[:aws].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
 
-    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_volume('i-00000000', @volume.identity, '/dev/sdh')
     end
 
-    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_volume(@server.identity, 'vol-00000000', '/dev/sdh')
     end
 
-    tests("#detach_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#detach_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].detach_volume('vol-00000000')
     end
 
-    tests("#modify_volume_attribute('vol-00000000', true)").raises(Fog::Compute::AWS::NotFound) do
+    tests("#modify_volume_attribute('vol-00000000', true)").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].modify_volume_attribute('vol-00000000', true)
     end
 
-    tests("#detach_volume('#{@volume.identity}')").raises(Fog::Compute::AWS::Error) do
+    tests("#detach_volume('#{@volume.identity}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].detach_volume(@volume.identity)
     end
 
-    tests("#delete_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_volume('vol-00000000')
     end
 
     # Iops required
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1')").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1')
     end
 
     # size too small for iops
-    tests("#create_volume('#{@server.availability_zone}', 9, 'VolumeType' => 'io1', 'Iops' => 100)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 9, 'VolumeType' => 'io1', 'Iops' => 100)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 9, 'VolumeType' => 'io1', 'Iops' => 100)
     end
 
     # iops:size ratio too big
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 301)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 301)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 301)
     end
 
     # iops invalid value (lower than 100)
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 99)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 99)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 99)
     end
 
     # iops invalid value (greater than 4000)
-    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 4001)").raises(Fog::Compute::AWS::Error) do
+    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 4001)").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 1024, 'VolumeType' => 'io1', 'Iops' => 4001)
     end
 

data/tests/requests/compute/vpc_tests.rb

@@ -68,6 +68,12 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
       data
     end
 
+    tests("#create_vpc('10.255.254.0/28', {'InstanceTenancy' => 'dedicated'})").returns('dedicated') do
+      data = Fog::Compute[:aws].create_vpc('10.255.254.0/28',
+        {'InstanceTenancy' => 'dedicated'}).body
+      data['vpcSet'].first['instanceTenancy']
+    end
+
     tests('#describe_vpcs').formats(@describe_vpcs_format) do
       Fog::Compute[:aws].describe_vpcs.body
     end
@@ -104,11 +110,11 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
       Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, 'enableDnsHostnames').body["enableDnsHostnames"]
     end
 
-    tests("#modify_vpc_attribute('#{@vpc_id}')").raises(Fog::Compute::AWS::Error) do
+    tests("#modify_vpc_attribute('#{@vpc_id}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].modify_vpc_attribute(@vpc_id).body
     end
 
-    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true})").raises(Fog::Compute::AWS::Error) do
+    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true})").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true}).body
     end
 
@@ -211,6 +217,6 @@ Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
     # Clean up
     Fog::Compute[:aws].delete_tags(@another_vpc.id, test_tags)
     @another_vpc.destroy
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
   end
 end

data/tests/requests/dns/change_resource_record_sets_tests.rb

@@ -1,8 +1,8 @@
 Shindo.tests('Fog::DNS[:aws] | change_resource_record_sets', ['aws', 'dns']) do
   tests('success') do
     test('#elb_hosted_zone_mapping from DNS name') do
-      zone_id = Fog::DNS::AWS.hosted_zone_for_alias_target('arbitrary-sub-domain.eu-west-1.elb.amazonaws.com')
-      zone_id == Fog::DNS::AWS.elb_hosted_zone_mapping['eu-west-1']
+      zone_id = Fog::AWS::DNS.hosted_zone_for_alias_target('arbitrary-sub-domain.eu-west-1.elb.amazonaws.com')
+      zone_id == Fog::AWS::DNS.elb_hosted_zone_mapping['eu-west-1']
     end
   end
 
@@ -18,7 +18,7 @@ Shindo.tests('Fog::DNS[:aws] | change_resource_record_sets', ['aws', 'dns']) do
         }]
 
     version = '2013-04-01'
-    result = Fog::DNS::AWS.change_resource_record_sets_data('zone_id123', change_batch, version)
+    result = Fog::AWS::DNS.change_resource_record_sets_data('zone_id123', change_batch, version)
     doc = Nokogiri::XML(result)
 
     returns("https://route53.amazonaws.com/doc/#{version}/") { doc.namespaces['xmlns'] }