fog-aws 3.0.0 → 3.10.0

data/tests/parsers/elbv2/describe_listeners_tests.rb

@@ -0,0 +1,76 @@
+require 'fog/xml'
+require 'fog/aws/parsers/elbv2/describe_listeners'
+
+DESCRIBE_LISTENERS_RESULT = <<-EOF
+<DescribeListenersResponse xmlns="http://elasticloadbalancing.amazonaws.com/doc/2015-12-01/">
+  <DescribeListenersResult>
+    <Listeners>
+      <member>
+        <LoadBalancerArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188</LoadBalancerArn>
+        <Protocol>HTTPS</Protocol>
+        <Port>80</Port>
+        <ListenerArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:listener/app/my-load-balancer/50dc6c495c0c9188/f2f7dc8efc522ab2</ListenerArn>
+        <SslPolicy>polucy</SslPolicy>
+        <DefaultActions>
+          <member>
+            <Type>forward</Type>
+            <Order>1</Order>
+            <TargetGroupArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:targetgroup/my-targets/73e2d6bc24d8a067</TargetGroupArn>
+            <RedirectConfig>
+              <Protocol>HTTPS</Protocol>
+              <Port>443</Port>
+              <Path>\#{path}</Path>
+              <Query>\#{query}</Query>
+              <Host>\#{host}</Host>
+              <StatusCode>HTTP_301</StatusCode>
+              <Type>redirect</Type>
+            </RedirectConfig>
+          </member>
+        </DefaultActions>
+        <Certificates>
+          <member>
+            <CertificateArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:certificate/56d36256-1245-40d6-916e-6f5a95e2b4c6</CertificateArn>
+          </member>
+        </Certificates>
+      </member>
+      <member>
+        <LoadBalancerArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188</LoadBalancerArn>
+        <Protocol>HTTPS</Protocol>
+        <Port>80</Port>
+        <ListenerArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:listener/app/my-load-balancer/50dc6c495c0c9188/f2f7dc8efc522ab2</ListenerArn>
+        <SslPolicy>polucy</SslPolicy>
+        <DefaultActions>
+          <member>
+            <Type>forward</Type>
+            <Order>2</Order>
+            <TargetGroupArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:targetgroup/my-targets/73e2d6bc24d8a067</TargetGroupArn>
+            <ForwardConfig>
+              <TargetGroupStickinessConfig><Enable>true</Enable></TargetGroupStickinessConfig>
+              <TargetGroups>
+                <Weight>1</Weight>
+                <TargetGroupArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:targetgroup/my-targets/73e2d6bc24d8a067</TargetGroupArn>
+              </TargetGroups>
+            </ForwardConfig>
+          </member>
+        </DefaultActions>
+        <Certificates>
+          <member>
+            <CertificateArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:certificate/56d36256-1245-40d6-916e-6f5a95e2b4c6</CertificateArn>
+          </member>
+        </Certificates>
+      </member>
+    </Listeners>
+  </DescribeListenersResult>
+  <ResponseMetadata>
+    <RequestId>18e470d3-f39c-11e5-a53c-67205c0d10fd</RequestId>
+  </ResponseMetadata>
+</DescribeListenersResponse>
+EOF
+
+Shindo.tests('AWS::ELBV2 | parsers | describe_listeners', %w[aws elb parser]) do
+  tests('parses the xml').formats(AWS::ELBV2::Formats::DESCRIBE_LISTENERS) do
+    parser = Nokogiri::XML::SAX::Parser.new(Fog::Parsers::AWS::ELBV2::DescribeListeners.new)
+    parser.parse(DESCRIBE_LISTENERS_RESULT)
+    parser.document.response
+  end
+end

data/tests/parsers/elbv2/describe_load_balancers_tests.rb

@@ -0,0 +1,54 @@
+require 'fog/xml'
+require 'fog/aws/parsers/elbv2/describe_load_balancers'
+
+DESCRIBE_LOAD_BALANCERS_RESULT = <<-EOF
+<DescribeLoadBalancersResponse xmlns="http://elasticloadbalancing.amazonaws.com/doc/2015-12-01/">
+  <DescribeLoadBalancersResult>
+    <LoadBalancers>
+      <member>
+        <LoadBalancerArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188</LoadBalancerArn>
+        <Scheme>internet-facing</Scheme>
+        <LoadBalancerName>my-load-balancer</LoadBalancerName>
+        <VpcId>vpc-3ac0fb5f</VpcId>
+        <CanonicalHostedZoneId>Z2P70J7EXAMPLE</CanonicalHostedZoneId>
+        <CreatedTime>2016-03-25T21:26:12.920Z</CreatedTime>
+        <AvailabilityZones>
+          <member>
+            <SubnetId>subnet-8360a9e7</SubnetId>
+            <ZoneName>us-west-2a</ZoneName>
+          </member>
+          <member>
+            <SubnetId>subnet-b7d581c0</SubnetId>
+            <ZoneName>us-west-2b</ZoneName>
+            <LoadBalancerAddresses>
+              <member>
+                <IpAddress>127.0.0.1</IpAddress>
+                <AllocationId>eipalloc-1c2ab192c131q2377</AllocationId>
+              </member>
+            </LoadBalancerAddresses>
+          </member>
+        </AvailabilityZones>
+        <SecurityGroups>
+          <member>sg-5943793c</member>
+        </SecurityGroups>
+        <DNSName>my-load-balancer-424835706.us-west-2.elb.amazonaws.com</DNSName>
+        <State>
+          <Code>active</Code>
+        </State>
+        <Type>application</Type>
+      </member>
+    </LoadBalancers>
+  </DescribeLoadBalancersResult>
+  <ResponseMetadata>
+    <RequestId>6581c0ac-f39f-11e5-bb98-57195a6eb84a</RequestId>
+  </ResponseMetadata>
+</DescribeLoadBalancersResponse>
+EOF
+
+Shindo.tests('AWS::ELBV2 | parsers | describe_load_balancers', %w[aws elb parser]) do
+  tests('parses the xml').formats(AWS::ELBV2::Formats::DESCRIBE_LOAD_BALANCERS) do
+    parser = Nokogiri::XML::SAX::Parser.new(Fog::Parsers::AWS::ELBV2::DescribeLoadBalancers.new)
+    parser.parse(DESCRIBE_LOAD_BALANCERS_RESULT)
+    parser.document.response
+  end
+end

data/tests/parsers/elbv2/describe_tags_tests.rb

@@ -0,0 +1,35 @@
+require 'fog/xml'
+require 'fog/aws/parsers/elbv2/describe_tags'
+
+DESCRIBE_TAGS_RESULT = <<-EOF
+<DescribeTagsResponse xmlns="http://elasticloadbalancing.amazonaws.com/doc/2015-12-01/">
+  <DescribeTagsResult>
+    <TagDescriptions>
+      <member>
+        <ResourceArn>arn:aws:elasticloadbalancing:us-west-2:123456789012:loadbalancer/app/my-load-balancer/50dc6c495c0c9188</ResourceArn>
+        <Tags>
+          <member>
+            <Value>lima</Value>
+            <Key>project</Key>
+          </member>
+          <member>
+            <Value>digital-media</Value>
+            <Key>department</Key>
+          </member>
+        </Tags>
+      </member>
+    </TagDescriptions>
+  </DescribeTagsResult>
+  <ResponseMetadata>
+    <RequestId>34f144db-f2d9-11e5-a53c-67205c0d10fd</RequestId> 
+  </ResponseMetadata>
+</DescribeTagsResponse>
+EOF
+
+Shindo.tests('AWS::ELBV2 | parsers | describe_tags', %w[aws elb parser]) do
+  tests('parses the xml').formats(AWS::ELBV2::Formats::DESCRIBE_TAGS) do
+    parser = Nokogiri::XML::SAX::Parser.new(Fog::Parsers::AWS::ELBV2::DescribeTags.new)
+    parser.parse(DESCRIBE_TAGS_RESULT)
+    parser.document.response
+  end
+end

data/tests/requests/auto_scaling/auto_scaling_tests.rb

@@ -51,6 +51,14 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
       tests("#attach_instances").formats(AWS::AutoScaling::Formats::BASIC) do
         Fog::AWS[:auto_scaling].attach_instances(@asg_name, 'InstanceIds' => 'i-deadbeef').body
       end
+
+      tests("#set_instance_protection").formats(AWS::AutoScaling::Formats::BASIC) do
+        Fog::AWS[:auto_scaling].set_instance_protection(
+          @asg_name,
+          'InstanceIds' => 'i-deadbeef',
+          'ProtectedFromScaleIn' => true
+        ).body
+      end
     end
 
     tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do

data/tests/requests/compute/address_tests.rb

@@ -72,7 +72,7 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
       compute.associate_address({:instance_id=>@server.id, :allocation_id=>@vpc_allocation_id}).body
     end
 
-    tests("#disassociate_address('#{@vpc_public_ip}')").raises(Fog::Compute::AWS::Error) do
+    tests("#disassociate_address('#{@vpc_public_ip}')").raises(Fog::AWS::Compute::Error) do
       compute.disassociate_address(@vpc_public_ip)
     end
 
@@ -95,38 +95,38 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
     @address     = compute.addresses.create
     @vpc_address = compute.addresses.create(:domain => 'vpc')
 
-    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '#{@address.identity}')}").raises(Fog::Compute::AWS::NotFound) do
+    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '#{@address.identity}')}").raises(Fog::AWS::Compute::NotFound) do
       compute.associate_address({:instance_id => 'i-00000000', :public_ip => @address.identity})
     end
 
-    tests("#associate_addresses({:instance_id =>'#{@server.identity}', :public_ip => '127.0.0.1'})").raises(Fog::Compute::AWS::Error) do
+    tests("#associate_addresses({:instance_id =>'#{@server.identity}', :public_ip => '127.0.0.1'})").raises(Fog::AWS::Compute::Error) do
       compute.associate_address({:instance_id => @server.identity, :public_ip => '127.0.0.1'})
     end
 
-    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '127.0.0.1'})").raises(Fog::Compute::AWS::NotFound) do
+    tests("#associate_addresses({:instance_id =>'i-00000000', :public_ip => '127.0.0.1'})").raises(Fog::AWS::Compute::NotFound) do
       compute.associate_address({:instance_id =>'i-00000000', :public_ip =>'127.0.0.1'})
     end
 
-    tests("#restore_address_to_classic('#{@vpc_address.identity}')").raises(Fog::Compute::AWS::Error) do
+    tests("#restore_address_to_classic('#{@vpc_address.identity}')").raises(Fog::AWS::Compute::Error) do
       compute.restore_address_to_classic(@vpc_address.identity)
     end
 
-    tests("#disassociate_addresses('127.0.0.1') raises BadRequest error").raises(Fog::Compute::AWS::Error) do
+    tests("#disassociate_addresses('127.0.0.1') raises BadRequest error").raises(Fog::AWS::Compute::Error) do
       compute.disassociate_address('127.0.0.1')
     end
 
-    tests("#release_address('127.0.0.1')").raises(Fog::Compute::AWS::Error) do
+    tests("#release_address('127.0.0.1')").raises(Fog::AWS::Compute::Error) do
       compute.release_address('127.0.0.1')
     end
 
-    tests("#release_address('#{@vpc_address.identity}')").raises(Fog::Compute::AWS::Error) do
+    tests("#release_address('#{@vpc_address.identity}')").raises(Fog::AWS::Compute::Error) do
       compute.release_address(@vpc_address.identity)
     end
 
     if Fog.mocking?
       old_limit = compute.data[:limits][:addresses]
 
-      tests("#allocate_address", "limit exceeded").raises(Fog::Compute::AWS::Error) do
+      tests("#allocate_address", "limit exceeded").raises(Fog::AWS::Compute::Error) do
         compute.data[:limits][:addresses] = 0
         compute.allocate_address
       end

data/tests/requests/compute/assign_private_ip_tests.rb

@@ -1,7 +1,7 @@
 Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
 
   tests('success') do
-    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')
     @vpc_id = @vpc.id
@@ -30,7 +30,7 @@ Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
   end
 
   tests('failure') do
-    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')
     @vpc_id = @vpc.id
@@ -44,7 +44,7 @@ Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
 
     @ip_address = Fog::AWS::Mock.ip_address
 
-    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}'], 'SecondaryPrivateIpAddressCount'=>4 })").raises(Fog::Compute::AWS::Error) do
+    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}'], 'SecondaryPrivateIpAddressCount'=>4 })").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, { 'PrivateIpAddresses' =>[@ip_address, @second_ip_address], 'SecondaryPrivateIpAddressCount'=>4 }).body
     end
 

data/tests/requests/compute/image_tests.rb

@@ -37,6 +37,11 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
     'return'                => Fog::Boolean,
     'requestId'             => String
   }
+  @describe_image_attribute_format = {
+    'requestId'             => String,
+    'imageId'               => String,
+    'launchPermission'      => [Fog::Nullable::String]
+  }
   @create_image_format = {
     'requestId'             => String,
     'imageId'               => String
@@ -55,7 +60,7 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
     @image_id = 'ami-1aad5273'
 
     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')
 
       @server = Fog::Compute[:aws].servers.create
       @server.wait_for{state == 'running'}
@@ -113,6 +118,10 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
         Fog::Compute[:aws].modify_image_attribute(@image_id, { 'Add.UserId' => [@other_account.data[:owner_id]] }).body
       end
 
+      tests("#describe_image_attribute('#{@image_id}', 'launchPermission'])").formats(@describe_image_attribute_format) do
+        Fog::Compute[:aws].describe_image_attribute(@image_id, 'launchPermission' ).body
+      end
+
       tests("other_account#describe_images('image-id' => '#{@image_id}')").returns([@image_id]) do
         @other_account.describe_images('image-id' => @image_id).body['imagesSet'].map {|i| i['imageId'] }
       end
@@ -151,7 +160,7 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
       Fog::Compute[:aws].modify_image_attribute(nil, { 'Add.Group' => ['all'] }).body
     end
 
-    tests("#modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] })").raises(Fog::Compute::AWS::NotFound) do
+    tests("#modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] })").raises(Fog::AWS::Compute::NotFound) do
       pending unless Fog.mocking?
 
       Fog::Compute[:aws].modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] }).body

data/tests/requests/compute/instance_attrib_tests.rb

@@ -159,7 +159,7 @@ Shindo.tests('Fog::Compute[:aws] | describe_instance_attribute request', ['aws']
 
   tests('failure') do
     @instance_attributes.each do |attrib|
-      tests("#describe_instance_attribute('i-00000000', #{attrib})").raises(Fog::Compute::AWS::NotFound) do
+      tests("#describe_instance_attribute('i-00000000', #{attrib})").raises(Fog::AWS::Compute::NotFound) do
         Fog::Compute[:aws].describe_instance_attribute('i-00000000', attrib)
       end
     end

data/tests/requests/compute/instance_tests.rb

@@ -314,22 +314,22 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
 
   tests('failure') do
 
-    tests("#run_instances(nil, 1, 1, {'SubnetId'=>'subnet-00000000'}").raises(::Fog::Compute::AWS::Error) do
+    tests("#run_instances(nil, 1, 1, {'SubnetId'=>'subnet-00000000'}").raises(::Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].run_instances(nil, 1, 1, {'SubnetId' => 'subnet-000000'})
     end
-    tests("#get_console_output('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#get_console_output('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].get_console_output('i-00000000')
     end
 
-    tests("#get_password_data('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#get_password_data('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].get_password_data('i-00000000')
     end
 
-    tests("#reboot_instances('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#reboot_instances('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].reboot_instances('i-00000000')
     end
 
-    tests("#terminate_instances('i-00000000')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#terminate_instances('i-00000000')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].terminate_instances('i-00000000')
     end
 

data/tests/requests/compute/internet_gateway_tests.rb

@@ -10,7 +10,7 @@ Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
   }
 
   tests('success') do
-    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')
     @vpc_id = @vpc.id
     @subnet=Fog::Compute[:aws].subnets.create('vpc_id' => @vpc_id, 'cidr_block' => '10.0.10.0/24')

data/tests/requests/compute/key_pair_tests.rb

@@ -56,7 +56,7 @@ Shindo.tests('Fog::Compute[:aws] | key pair requests', ['aws']) do
 
     @key_pair = Fog::Compute[:aws].key_pairs.create(:name => 'fog_key_pair')
 
-    tests("duplicate #create_key_pair('#{@key_pair.name}')").raises(Fog::Compute::AWS::Error) do
+    tests("duplicate #create_key_pair('#{@key_pair.name}')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_key_pair(@key_pair.name)
     end
 

data/tests/requests/compute/network_acl_tests.rb

@@ -34,7 +34,7 @@ Shindo.tests('Fog::Compute[:aws] | network acl requests', ['aws']) do
   }
 
   tests('success') do
-    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')
     @subnet      = Fog::Compute[:aws].subnets.create('vpc_id' => @vpc.id, 'cidr_block' => '10.0.10.16/28')
@@ -107,6 +107,6 @@ Shindo.tests('Fog::Compute[:aws] | network acl requests', ['aws']) do
     @another_acl.destroy
     @subnet.destroy
     @vpc.destroy
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
   end
 end

data/tests/requests/compute/network_interface_tests.rb

@@ -36,7 +36,7 @@ Shindo.tests('Fog::Compute[:aws] | network interface requests', ['aws']) do
   }
 
   tests('success') do
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
 
     # Create environment
     @vpc            = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
@@ -197,7 +197,7 @@ Shindo.tests('Fog::Compute[:aws] | network interface requests', ['aws']) do
   tests('failure') do
 
     # Attempt to attach a nonexistent interface
-    tests("#attach_network_interface('eni-00000000', 'i-00000000', '1')").raises(::Fog::Compute::AWS::NotFound) do
+    tests("#attach_network_interface('eni-00000000', 'i-00000000', '1')").raises(::Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_network_interface('eni-00000000', 'i-00000000', '1')
     end
 
@@ -213,12 +213,12 @@ Shindo.tests('Fog::Compute[:aws] | network interface requests', ['aws']) do
     # Attempt to re-use an existing IP for another ENI
     tests("#create_network_interface('#{@subnet_id}', " \
       "{'PrivateIpAddress' => " \
-      "'#{data['networkInterface']['privateIpAddress']}'}").raises(::Fog::Compute::AWS::Error) do
+      "'#{data['networkInterface']['privateIpAddress']}'}").raises(::Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_network_interface(@subnet_id, {'PrivateIpAddress' => data['networkInterface']['privateIpAddress']})
     end
 
     # Attempt to attach a valid ENI to a nonexistent instance.
-    tests("#attach_network_interface('#{@nic_id}', 'i-00000000', '0')").raises(::Fog::Compute::AWS::NotFound) do
+    tests("#attach_network_interface('#{@nic_id}', 'i-00000000', '0')").raises(::Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].attach_network_interface(@nic_id, 'i-00000000', '0')
     end
 
@@ -230,10 +230,10 @@ Shindo.tests('Fog::Compute[:aws] | network interface requests', ['aws']) do
 
     # Attempt to attach two ENIs to the same instance with the same device
     # index.
-    tests("#attach_network_interface('#{@nic_id}', '#{@instance_id}', '#{@device_index}')").raises(::Fog::Compute::AWS::Error) do
+    tests("#attach_network_interface('#{@nic_id}', '#{@instance_id}', '#{@device_index}')").raises(::Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].attach_network_interface(@nic_id, @instance_id, @device_index)
     end
 
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
+    Fog::AWS::Compute::Mock.reset if Fog.mocking?
   end
 end

data/tests/requests/compute/placement_group_tests.rb

@@ -35,11 +35,11 @@ Shindo.tests('Fog::Compute[:aws] | placement group requests', ['aws']) do
 
     Fog::Compute[:aws].create_placement_group('fog_placement_group', 'cluster')
 
-    tests("duplicate #create_placement_group('fog_placement_group', 'cluster')").raises(Fog::Compute::AWS::Error) do
+    tests("duplicate #create_placement_group('fog_placement_group', 'cluster')").raises(Fog::AWS::Compute::Error) do
       Fog::Compute[:aws].create_placement_group('fog_placement_group', 'cluster')
     end
 
-    tests("#delete_placement_group('not_a_group_name')").raises(Fog::Compute::AWS::NotFound) do
+    tests("#delete_placement_group('not_a_group_name')").raises(Fog::AWS::Compute::NotFound) do
       Fog::Compute[:aws].delete_placement_group('not_a_group_name')
     end