fog-aws 3.12.0 → 3.13.0

data/tests/requests/compute/security_group_tests.rb

@@ -1,457 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
-  # See https://github.com/fog/fog/issues/2932hj0
-  pending
-
-  @create_security_group_format = {
-    'requestId' => String,
-    'groupId'   => String,
-    'return'    => Fog::Boolean
-  }
-
-  @security_groups_format = {
-    'requestId'           => String,
-    'securityGroupInfo' => [{
-      'groupDescription'  => String,
-      'groupId'           => Fog::Nullable::String,
-      'groupName'         => String,
-      'ipPermissions'     => [{
-        'fromPort'    => Fog::Nullable::Integer,
-        'groups'      => [{ 'groupName' => Fog::Nullable::String, 'userId' => String, 'groupId' => String }],
-        'ipProtocol'  => String,
-        'ipRanges'    => [Fog::Nullable::Hash],
-        'ipv6Ranges'  => [Fog::Nullable::Hash],
-        'toPort'      => Fog::Nullable::Integer,
-      }],
-      'ipPermissionsEgress' => [],
-      'ownerId'           => String,
-      'vpcId'             => Fog::Nullable::String
-    }]
-  }
-
-  @owner_id = Fog::Compute[:aws].describe_security_groups('group-name' => 'default').body['securityGroupInfo'].first['ownerId']
-  @group_id_default = Fog::Compute[:aws].describe_security_groups('group-name' => 'default').body['securityGroupInfo'].first['groupId']
-
-  tests('success') do
-
-    tests("#create_security_group('fog_security_group', 'tests group')").formats(@create_security_group_format) do
-      Fog::Compute[:aws].create_security_group('fog_security_group', 'tests group').body
-    end
-    tests("#create_security_group('fog_security_group_two', 'tests group')").formats(@create_security_group_format) do
-      Fog::Compute[:aws].create_security_group('fog_security_group_two', 'tests group').body
-    end
-    @group_id_two = Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group_two').body['securityGroupInfo'].first['groupId']
-    group_id = Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['groupId']
-    to_be_revoked = []
-    expected_permissions = []
-
-    permission = { 'SourceSecurityGroupName' => 'default' }
-    tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permission).body
-    end
-
-    to_be_revoked.push([permission, expected_permissions.dup])
-
-    expected_permissions = [
-      {"groups"=>[{"groupName"=>"default", "userId"=>@owner_id, "groupId"=>@group_id_default}],
-        "fromPort"=>1,
-        "ipRanges"=>[],
-        "ipv6Ranges"=>[],
-        "ipProtocol"=>"tcp",
-        "toPort"=>65535},
-      {"groups"=>[{"groupName"=>"default", "userId"=>@owner_id, "groupId"=>@group_id_default}],
-        "fromPort"=>1,
-        "ipRanges"=>[],
-        "ipv6Ranges"=>[],
-        "ipProtocol"=>"udp",
-        "toPort"=>65535},
-      {"groups"=>[{"groupName"=>"default", "userId"=>@owner_id, "groupId"=>@group_id_default}],
-        "fromPort"=>-1,
-        "ipRanges"=>[],
-        "ipv6Ranges"=>[],
-        "ipProtocol"=>"icmp",
-        "toPort"=>-1}
-    ]
-
-    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    tests("#describe_security_groups('group-id' => '#{group_id}')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-id' => group_id).body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    permission = { 'SourceSecurityGroupName' => 'fog_security_group_two', 'SourceSecurityGroupOwnerId' => @owner_id }
-    tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permission).body
-    end
-
-    to_be_revoked.push([permission, expected_permissions.dup])
-
-    expected_permissions = [
-      {"groups"=>
-        [{"userId"=>@owner_id, "groupName"=>"default", "groupId"=>@group_id_default},
-          {"userId"=>@owner_id, "groupName"=>"fog_security_group_two", "groupId"=>@group_id_two}],
-        "ipRanges"=>[],
-        "ipv6Ranges"=>[],
-        "ipProtocol"=>"tcp",
-        "fromPort"=>1,
-        "toPort"=>65535},
-      {"groups"=>
-        [{"userId"=>@owner_id, "groupName"=>"default", "groupId"=>@group_id_default},
-          {"userId"=>@owner_id, "groupName"=>"fog_security_group_two", "groupId"=>@group_id_two}],
-        "ipRanges"=>[],
-        "ipv6Ranges"=>[],
-        "ipProtocol"=>"udp",
-        "fromPort"=>1,
-        "toPort"=>65535},
-      {"groups"=>
-        [{"userId"=>@owner_id, "groupName"=>"default", "groupId"=>@group_id_default},
-          {"userId"=>@owner_id, "groupName"=>"fog_security_group_two", "groupId"=>@group_id_two}],
-        "ipRanges"=>[],
-        "ipv6Ranges"=>[],
-        "ipProtocol"=>"icmp",
-        "fromPort"=>-1,
-        "toPort"=>-1}
-    ]
-
-    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    permission = { 'IpProtocol' => 'tcp', 'FromPort' => '22', 'ToPort' => '22' }
-    tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permission).body
-    end
-
-    to_be_revoked.push([permission, expected_permissions.dup])
-
-    # previous did nothing
-    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    permission = { 'IpProtocol' => 'tcp', 'FromPort' => '22', 'ToPort' => '22', 'CidrIp' => '10.0.0.0/8' }
-    tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permission).body
-    end
-
-    to_be_revoked.push([permission, expected_permissions.dup])
-
-    expected_permissions += [
-      {"groups"=>[],
-        "ipRanges"=>[{"cidrIp"=>"10.0.0.0/8"}],
-        "ipv6Ranges"=>[],
-        "ipProtocol"=>"tcp",
-        "fromPort"=>22,
-        "toPort"=>22}
-    ]
-
-    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    # authorize with nested IpProtocol without IpRanges or Groups does nothing
-    permissions = {
-      'IpPermissions' => [
-        { 'IpProtocol' => 'tcp', 'FromPort' => '22', 'ToPort' => '22' }
-      ]
-    }
-    tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body
-    end
-
-    to_be_revoked.push([permissions, expected_permissions.dup])
-
-    # previous did nothing
-    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    # authorize with nested IpProtocol with IpRanges
-    permissions = {
-      'IpPermissions' => [
-        {
-          'IpProtocol' => 'tcp', 'FromPort' => '80', 'ToPort' => '80',
-          'IpRanges' => [{ 'CidrIp' => '192.168.0.0/24' }],
-          'Ipv6Ranges' => []
-        }
-      ]
-    }
-    tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body
-    end
-
-    to_be_revoked.push([permissions, expected_permissions.dup])
-
-    expected_permissions += [
-      {"groups"=>[],
-        "ipRanges"=>[{"cidrIp"=>"192.168.0.0/24"}],
-        "ipv6Ranges"=>[],
-        "ipProtocol"=>"tcp",
-        "fromPort"=>80,
-        "toPort"=>80}
-    ]
-
-    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    # authorize with nested IpProtocol with Groups
-    permissions = {
-      'IpPermissions' => [
-        {
-          'IpProtocol' => 'tcp', 'FromPort' => '8000', 'ToPort' => '8000',
-          'Groups' => [{ 'GroupName' => 'fog_security_group_two' }]
-        }
-      ]
-    }
-    tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body
-    end
-
-    to_be_revoked.push([permissions, expected_permissions.dup])
-
-    expected_permissions += [
-      {"groups"=>[{"userId"=>@owner_id, "groupName"=>"fog_security_group_two", "groupId"=>@group_id_two}],
-        "ipRanges"=>[],
-        "ipv6Ranges"=>[],
-        "ipProtocol"=>"tcp",
-        "fromPort"=>8000,
-        "toPort"=>8000}
-    ]
-    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    # authorize with nested IpProtocol with IpRanges and Groups
-    # try integers on this one instead of strings
-    permissions = {
-      'IpPermissions' => [
-        {
-          'IpProtocol' => 'tcp', 'FromPort' => 9000, 'ToPort' => 9000,
-          'IpRanges' => [{ 'CidrIp' => '172.16.0.0/24' }],
-          'Groups' => [{ 'GroupName' => 'fog_security_group_two' }]
-        }
-      ]
-    }
-    tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body
-    end
-
-    to_be_revoked.push([permissions, expected_permissions.dup])
-
-    expected_permissions += [
-      {"groups"=>
-        [{"userId"=>@owner_id, "groupName"=>"fog_security_group_two", "groupId"=>@group_id_two}],
-        "ipRanges"=>[{"cidrIp"=>"172.16.0.0/24"}],
-        "ipProtocol"=>"tcp",
-        "fromPort"=>9000,
-        "toPort"=>9000}
-    ]
-
-    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    tests("#describe_security_groups").formats(@security_groups_format) do
-      Fog::Compute[:aws].describe_security_groups.body
-    end
-
-    tests("#describe_security_groups('group-name' => 'fog_security_group')").formats(@security_groups_format) do
-      Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body
-    end
-
-    to_be_revoked.reverse.each do |permission, expected_permissions_after|
-      tests("#revoke_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do
-        Fog::Compute[:aws].revoke_security_group_ingress('fog_security_group', permission).body
-      end
-
-      tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
-        array_differences(expected_permissions_after, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
-      end
-    end
-
-    tests("#delete_security_group('fog_security_group')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_security_group('fog_security_group').body
-    end
-
-    tests("#delete_security_group('fog_security_group_two')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_security_group('fog_security_group_two').body
-    end
-
-    vpc_id = Fog::Compute[:aws].create_vpc('10.255.254.64/28').body['vpcSet'].first['vpcId']
-
-    # Create security group in VPC
-    tests("#create_security_group('vpc_security_group', 'tests group')").formats(@create_security_group_format) do
-      Fog::Compute[:aws].create_security_group('vpc_security_group', 'tests group', vpc_id).body
-    end
-
-    group_id = Fog::Compute[:aws].describe_security_groups('group-name' => 'vpc_security_group').body['securityGroupInfo'].first['groupId']
-
-    permissions = {
-      'IpPermissions' => [
-        {
-          'IpProtocol' => '42',
-          'IpRanges' => [{ 'CidrIp' => '10.0.0.0/8' }],
-        }
-      ]
-    }
-
-    expected_permissions = [
-      {"groups"=>[],
-        "ipRanges"=>[{"cidrIp"=>"10.0.0.0/8"}],
-        "ipProtocol"=>"42"}
-    ]
-
-    options = permissions.clone
-    options['GroupId'] = group_id
-    tests("#authorize_security_group_ingress(#{options.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress(options).body
-    end
-
-    tests("#describe_security_groups('group-name' => 'vpc_security_group')").returns([]) do
-      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'vpc_security_group').body['securityGroupInfo'].first['ipPermissions'])
-    end
-
-    tests("#revoke_security_group_ingress(#{options.inspect})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].revoke_security_group_ingress(options).body
-    end
-
-    vpc_group=Fog::Compute[:aws].security_groups.get_by_id(group_id)
-    vpc_group.destroy
-
-    Fog::Compute[:aws].delete_vpc(vpc_id)
-
-  end
-  ## Rate limiting seems to want us to take a break otherwise it will throw errors
-  tests('failure') 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::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::AWS::Compute::NotFound) do
-      Fog::Compute[:aws].authorize_security_group_ingress(
-        'not_a_group_name',
-        {
-          'FromPort' => 80,
-          'IpProtocol' => 'tcp',
-          'ToPort' => 80,
-        }
-      )
-    end
-
-    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',
-        {
-          'SourceSecurityGroupName'     => 'not_a_group_name',
-          'SourceSecurityGroupOwnerId'  => @owner_id
-        }
-      )
-    end
-
-    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").formats(AWS::Compute::Formats::BASIC) 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::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
-
-    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'Groups' => [{'GroupName' => '#{@other_security_group.name}'}], 'FromPort' => 80, 'ToPort' => 80, 'IpProtocol' => 'tcp'}]})").formats(AWS::Compute::Formats::BASIC) 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::AWS::Compute::Error) do
-      Fog::Compute[:aws].delete_security_group(@other_security_group.name)
-    end
-
-    broken_params = [
-      {},
-      { "IpProtocol" => "what" },
-      { "IpProtocol" => "tcp" },
-      { "IpProtocol" => "what", "FromPort" => 1, "ToPort" => 1 },
-    ]
-    broken_params += broken_params.map do |broken_params_item|
-      { "IpPermissions" => [broken_params_item] }
-    end
-    broken_params += [
-      { "IpPermissions" => [] },
-      { "IpPermissions" => nil }
-    ]
-
-    broken_params.each do |broken_params_item|
-      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::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::AWS::Compute::NotFound) do
-      Fog::Compute[:aws].revoke_security_group_ingress(
-        'not_a_group_name',
-        {
-          'FromPort' => 80,
-          'IpProtocol' => 'tcp',
-          'ToPort' => 80,
-        }
-      )
-    end
-
-    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',
-        {
-          'SourceSecurityGroupName'     => 'not_a_group_name',
-          'SourceSecurityGroupOwnerId'  => @owner_id
-        }
-      )
-    end
-
-    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::AWS::Compute::Error) do
-      @rds_security_group.authorize_ec2_security_group(@security_group.name)
-      Fog::Compute[:aws].delete_security_group(@security_group.name)
-    end
-
-    @rds_security_group.destroy
-
-    @security_group.destroy
-    @other_security_group.destroy
-
-    tests("#delete_security_group('default')").raises(Fog::AWS::Compute::Error) do
-      Fog::Compute[:aws].delete_security_group('default')
-    end
-
-    broken_params = [
-                     ['fog_security_group', { 'GroupName' => 'fog_security_group' }],
-                     [nil, nil],
-                     [nil, { 'GroupId' => nil }],
-                     [nil, { 'GroupName' => nil, 'GroupId' => nil }]
-                    ]
-
-    broken_params.each do |list_elem|
-      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::AWS::Compute::Error) do
-        Fog::Compute[:aws].revoke_security_group_ingress(list_elem[0], list_elem[1])
-      end
-    end
-
-  end
-
-end

data/tests/requests/compute/snapshot_tests.rb

@@ -1,77 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | snapshot requests', ['aws']) do
-
-  @snapshot_format = {
-    'description' => Fog::Nullable::String,
-    'encrypted'   => Fog::Boolean,
-    'ownerId'     => String,
-    'progress'    => String,
-    'snapshotId'  => String,
-    'startTime'   => Time,
-    'status'      => String,
-    'volumeId'    => String,
-    'volumeSize'  => Integer
-  }
-
-  @snapshots_format = {
-    'requestId'   => String,
-    'snapshotSet' => [@snapshot_format.merge('tagSet' => {})]
-  }
-
-  @snapshot_copy_result = {
-    'requestId'   => String,
-    'snapshotId'  => String
-  }
-
-  @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 = Fog::Compute[:aws].create_snapshot(@volume.identity).body
-      @snapshot_id = data['snapshotId']
-      data
-    end
-
-    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
-      Fog::Compute[:aws].describe_snapshots.body
-    end
-
-    tests("#describe_snapshots('snapshot-id' => '#{@snapshot_id}')").formats(@snapshots_format) do
-      Fog::Compute[:aws].describe_snapshots('snapshot-id' => @snapshot_id).body
-    end
-
-    tests("#copy_snapshot (#{@snapshot_id}, 'us-east-1')").formats(@snapshot_copy_result) do
-      data = Fog::Compute.new(:provider => :aws, :region => "us-west-1").copy_snapshot(@snapshot_id, "us-east-1").body
-      @west_snapshot_id = data['snapshotId']
-      data
-    end
-
-    tests("#delete_snapshots(#{@snapshot_id})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_snapshot(@snapshot_id).body
-    end
-
-    #NOTE: waiting for the copy to complete can sometimes take up to 5 minutes (but sometimes it's nearly instant)
-    #for faster tests: comment out the rest of this block
-    Fog.wait_for { Fog::Compute.new(:provider => :aws, :region => "us-west-1").snapshots.get(@west_snapshot_id) }
-
-    tests("#delete_snapshots(#{@west_snapshot_id})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute.new(:provider => :aws, :region => "us-west-1").delete_snapshot(@west_snapshot_id).body
-    end
-
-  end
-  tests('failure') do
-
-    tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      Fog::Compute[:aws].delete_snapshot('snap-00000000')
-    end
-
-  end
-
-  @volume.destroy
-
-end

data/tests/requests/compute/spot_datafeed_subscription_tests.rb

@@ -1,47 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | spot datafeed subscription requests', ['aws']) do
-  @spot_datafeed_subscription_format = {
-    'spotDatafeedSubscription' => {
-      'bucket'  => String,
-      'ownerId' => String,
-      'prefix'  => String,
-      'state'   => String
-    },
-    'requestId' => String
-  }
-
-  @directory = Fog::Storage[:aws].directories.create(:key => 'fogspotdatafeedsubscriptiontests')
-
-  tests('success') do
-    pending if Fog.mocking?
-
-    tests("#create_spot_datafeed_subscription('fogspotdatafeedsubscriptiontests', 'fogspotdatafeedsubscription/')").formats(@spot_datafeed_subscription_format) do
-      Fog::Compute[:aws].create_spot_datafeed_subscription('fogspotdatafeedsubscriptiontests', 'fogspotdatafeedsubscription/').body
-    end
-
-    tests("duplicate #create_spot_datafeed_subscription('fogspotdatafeedsubscriptiontests', 'fogspotdatafeedsubscription/')").succeeds do
-      Fog::Compute[:aws].create_spot_datafeed_subscription('fogspotdatafeedsubscriptiontests', 'fogspotdatafeedsubscription/')
-    end
-
-    tests("#describe_spot_datafeed_subscription").formats(@spot_datafeed_subscription_format) do
-      Fog::Compute[:aws].describe_spot_datafeed_subscription.body
-    end
-
-    tests("#delete_spot_datafeed_subscription").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_spot_datafeed_subscription.body
-    end
-
-    tests("duplicate #delete_spot_datafeed_subscription").succeeds do
-      Fog::Compute[:aws].delete_spot_datafeed_subscription
-    end
-  end
-
-  tests('failure') do
-    pending if Fog.mocking?
-
-    tests("#describe_spot_datafeed_subscription").raises(Fog::AWS::Compute::NotFound) do
-      Fog::Compute[:aws].describe_spot_datafeed_subscription
-    end
-  end
-
-  @directory.destroy
-end

data/tests/requests/compute/spot_instance_tests.rb

@@ -1,55 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | spot instance requests', ['aws']) do
-
-  @spot_instance_requests_format = {
-    'spotInstanceRequestSet' => [{
-      'createTime'                => Time,
-      'instanceId'                => Fog::Nullable::String,
-      'launchedAvailabilityZone'  => Fog::Nullable::String,
-      'launchSpecification'       => {
-        'blockDeviceMapping'  => [],
-        'groupSet'            => [String],
-        'keyName'             => Fog::Nullable::String,
-        'imageId'             => String,
-        'instanceType'        => String,
-        'monitoring'          => Fog::Boolean,
-        'ebsOptimized'        => Fog::Boolean,
-        'subnetId'            => Fog::Nullable::String,
-        'iamInstanceProfile'  => Fog::Nullable::Hash,
-      },
-      'productDescription'        => String,
-      'spotInstanceRequestId'     => String,
-      'spotPrice'                 => Float,
-      'state'                     => String,
-      'type'                      => String,
-      'fault'                     => Fog::Nullable::Hash,
-    }],
-    'requestId' => String
-  }
-
-  @cancel_spot_instance_request_format = {
-    'spotInstanceRequestSet' => [{
-      'spotInstanceRequestId' => String,
-      'state'                 => String
-    }],
-    'requestId' => String
-  }
-
-  tests('success') do
-
-    tests("#request_spot_instances('ami-3202f25b', 't1.micro', '0.001')").formats(@spot_instance_requests_format) do
-      data = Fog::Compute[:aws].request_spot_instances('ami-3202f25b', 't1.micro', '0.001',{'LaunchSpecification.EbsOptimized' => false}).body
-      @spot_instance_request_id = data['spotInstanceRequestSet'].first['spotInstanceRequestId']
-      data
-    end
-
-    tests("#describe_spot_instance_requests").formats(@spot_instance_requests_format) do
-      data = Fog::Compute[:aws].describe_spot_instance_requests('spot-instance-request-id' => [@spot_instance_request_id]).body
-    end
-
-    tests("#cancel_spot_instance_requests('#{@spot_instance_request_id}')").formats(@cancel_spot_instance_request_format) do
-      Fog::Compute[:aws].cancel_spot_instance_requests(@spot_instance_request_id).body
-    end
-
-  end
-
-end

data/tests/requests/compute/spot_price_history_tests.rb

@@ -1,23 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | spot price history requests', ['aws']) do
-
-  @spot_price_history_format = {
-    'spotPriceHistorySet'   => [{
-      'availabilityZone'    => String,
-      'instanceType'        => String,
-      'spotPrice'           => Float,
-      'productDescription'  => String,
-      'timestamp'           => Time
-    }],
-    'requestId' => String,
-    'nextToken' => Fog::Nullable::String
-  }
-
-  tests('success') do
-
-    tests("#describe_spot_price_history").formats(@spot_price_history_format) do
-      Fog::Compute[:aws].describe_spot_price_history.body
-    end
-
-  end
-
-end