fog-aws 0.11.0 → 3.18.0

data/tests/requests/compute/subnet_tests.rb

@@ -1,85 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
-
-  @subnet_format = {
-    'subnetId'                 => String,
-    'state'                    => String,
-    'vpcId'                    => String,
-    'cidrBlock'                => String,
-    'availableIpAddressCount'  => String,
-    'availabilityZone'         => String,
-    'tagSet'                   => Hash,
-  }
-
-  @single_subnet_format = {
-    'subnet'    => @subnet_format,
-    'requestId' => String,
-  }
-
-  @subnets_format = {
-    'subnetSet' => [@subnet_format],
-    'requestId' => String
-  }
-
-  @modify_subnet_format = {
-    'requestId' => String,
-    'return' => Fog::Boolean
-  }
-  
-  @vpc_network = '10.0.10.0/24'
-  @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => @vpc_network)
-  @vpc_id = @vpc.id
-
-  tests('success') do
-    @subnet_id = nil
-    @subnet_network = '10.0.10.16/28'
-
-    tests("#create_subnet('#{@vpc_id}', '#{@subnet_network}')").formats(@single_subnet_format) do
-      data = Fog::Compute[:aws].create_subnet(@vpc_id, @subnet_network).body
-      @subnet_id = data['subnet']['subnetId']
-      data
-    end
-
-    tests("modify_subnet('#{@subnet_id}'").formats(@modify_subnet_format) do
-      Fog::Compute[:aws].modify_subnet_attribute(@subnet_id, 'MapPublicIpOnLaunch' => true).body
-    end
-
-    @vpc2=Fog::Compute[:aws].vpcs.create('cidr_block' => @vpc_network)
-    @vpc2_id = @vpc2.id
-
-    # Create a second subnet in a second VPC with the same netblock
-    tests("#create_subnet('#{@vpc2_id}', '#{@subnet_network}')").formats(@single_subnet_format) do
-      data = Fog::Compute[:aws].create_subnet(@vpc2_id, @subnet_network).body
-      @subnet2_id = data['subnet']['subnetId']
-      data
-    end
-
-    Fog::Compute[:aws].delete_subnet(@subnet2_id)
-
-    tests('#describe_subnets').formats(@subnets_format) do
-      Fog::Compute[:aws].describe_subnets.body
-    end
-
-    tests("#delete_subnet('#{@subnet_id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_subnet(@subnet_id).body
-    end
-  end
-
-  tests('failure') do
-    tests("#create_subnet('vpc-00000000', '10.0.10.0/16')").raises(Fog::Compute::AWS::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
-      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
-      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
-  end
-
-  @vpc.destroy
-end

data/tests/requests/compute/tag_tests.rb

@@ -1,101 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
-
-  @tags_format = {
-    'tagSet'    => [{
-      'key'          => String,
-      'resourceId'   => String,
-      'resourceType' => String,
-      'value'        => Fog::Nullable::String
-    }],
-    'requestId' => String
-  }
-
-  @volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
-  @volume.wait_for { ready? }
-  @vpc    = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
-  @network_acl = Fog::Compute[:aws].network_acls.all('vpc-id' => @vpc.id, 'default' => true).first
-
-  tests('success') do
-    if Fog.mocking?
-      @other_account = Fog::Compute::AWS.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
-
-    tests("#create_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].create_tags(@volume.identity, 'foo' => 'bar').body
-    end
-
-    if Fog.mocking?
-      tests("#create_tags('#{@image_id}', 'foo' => 'baz')").formats(AWS::Compute::Formats::BASIC) do
-        Fog::Compute[:aws].create_tags(@image_id, 'foo' => 'baz').body
-      end
-
-      tests("#create_tags('#{@vpc.id}', 'type' => 'vpc')").formats(AWS::Compute::Formats::BASIC) do
-        Fog::Compute[:aws].create_tags(@vpc.id, 'type' => 'vpc').body
-      end
-
-      tests("#create_tags('#{@network_acl.network_acl_id}', 'type' => 'network_acl')").formats(AWS::Compute::Formats::BASIC) do
-        Fog::Compute[:aws].create_tags(@network_acl.network_acl_id, 'type' => 'network_acl').body
-      end
-    end
-
-    tests('#describe_tags').formats(@tags_format) do
-      Fog::Compute[:aws].describe_tags.body
-    end
-
-    expected_identities = Fog.mocking? ? [@volume.identity, @image_id] : [@volume.identity]
-    tests('#describe_tags').succeeds do
-      (expected_identities - Fog::Compute[:aws].describe_tags.body['tagSet'].map {|t| t['resourceId'] }).empty?
-    end
-
-    tests("#describe_tags('key' => 'foo', 'value' => 'bar')").returns([@volume.identity]) do
-      Fog::Compute[:aws].describe_tags('key' => 'foo', 'value' => 'bar').body['tagSet'].map {|t| t['resourceId'] }
-    end
-
-    if Fog.mocking?
-      tests("#describe_tags('key' => 'foo', 'value' => 'baz')").returns([@image_id]) do
-        Fog::Compute[:aws].describe_tags('key' => 'foo', 'value' => 'baz').body['tagSet'].map {|t| t['resourceId'] }
-      end
-
-      Fog::Compute[:aws].modify_image_attribute(@image_id, 'Add.UserId' => [@other_account.data[:owner_id]])
-
-      tests("other_account#describe_tags('key' => 'foo', 'value' => 'baz')").returns([]) do
-        @other_account.describe_tags('key' => 'foo', 'value' => 'baz').body['tagSet'].map {|t| t['resourceId'] }
-      end
-
-      tests("other_account#create_tags('#{@image_id}', 'foo' => 'quux')").formats(AWS::Compute::Formats::BASIC) do
-        @other_account.create_tags(@image_id, 'foo' => 'quux').body
-      end
-
-      tests("other_account#describe_tags('key' => 'foo', 'value' => 'quux')").returns([@image_id]) do
-        @other_account.describe_tags('key' => 'foo', 'value' => 'quux').body['tagSet'].map {|t| t['resourceId'] }
-      end
-    end
-
-    @volume.destroy
-
-    tests("#delete_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_tags(@volume.identity, 'foo' => 'bar').body
-    end
-  end
-
-  tests('failure') do
-    tests("#create_tags('vol-00000000', 'baz' => 'qux')").raises(Fog::Service::NotFound) do
-      Fog::Compute[:aws].create_tags('vol-00000000', 'baz' => 'qux')
-    end
-
-    tests("#create_tags('abc-12345678', 'type' => 'fake_type')").raises(Fog::Service::NotFound) do
-      Fog::Compute[:aws].create_tags('abc-12345678', 'type' => 'fake_type')
-    end
-
-    tests("#create_tags('vpc-12345678', 'type' => 'non-existent_vpc)").raises(Fog::Service::NotFound) do
-      Fog::Compute[:aws].create_tags('vpc-12345678', 'type' => 'non-existent_vpc')
-    end
-
-    tests("#create_tags('vpc-123', 'type' => 'bad_resource_id)").raises(Fog::Service::NotFound) do
-      Fog::Compute[:aws].create_tags('vpc-123', 'type' => 'bad_resource_id')
-    end
-  end
-  Fog::Compute::AWS::Mock.reset if Fog.mocking?
-end

data/tests/requests/compute/volume_tests.rb

@@ -1,223 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
-
-  @volume_format = {
-    'availabilityZone' => String,
-    'createTime'       => Time,
-    'encrypted'        => Fog::Boolean,
-    'iops'             => Fog::Nullable::Integer,
-    'requestId'        => String,
-    'size'             => Integer,
-    'snapshotId'       => Fog::Nullable::String,
-    'status'           => String,
-    'volumeId'         => String,
-    'volumeType'       => String
-  }
-
-  @volume_attachment_format = {
-    'attachTime' => Time,
-    'device'     => String,
-    'instanceId' => String,
-    'requestId'  => String,
-    'status'     => String,
-    'volumeId'   => String
-  }
-
-  @volume_status_format = {
-    'volumeStatusSet' => [{
-      'availabilityZone'  => String,
-      'volumeId'          => String,
-      'volumeStatus'      => {
-        'status'            => String,
-        'details'           => [{
-          'name'              => String,
-          'status'            => String
-        }]
-      },
-      'actionsSet'        => [{
-        'code'              => String,
-        'description'       => String,
-        'eventId'           => String,
-        'eventType'         => String
-      }],
-      'eventsSet'        => [{
-        'description'       => String,
-        'eventId'           => String,
-        'eventType'         => String,
-        'notBefore'         => Time,
-        'notAfter'          => Time
-      }]
-    }],
-    'requestId' => String
-  }
-
-  @volumes_format = {
-    'volumeSet' => [{
-      'availabilityZone' => String,
-      'attachmentSet'    => Array,
-      'createTime'       => Time,
-      'encrypted'        => Fog::Boolean,
-      'iops'             => Fog::Nullable::Integer,
-      'size'             => Integer,
-      'snapshotId'       => Fog::Nullable::String,
-      'kmsKeyId'         => Fog::Nullable::String,
-      'status'           => String,
-      'tagSet'           => Hash,
-      'volumeId'         => String,
-      'volumeType'       => String
-    }],
-    'requestId' => String
-  }
-
-  @server = Fog::Compute[:aws].servers.create
-  @server.wait_for { ready? }
-
-  tests('success') do
-    @volume_id = nil
-
-    tests('#create_volume').formats(@volume_format) do
-      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 1).body
-      @volume_id = data['volumeId']
-      data
-    end
-
-    Fog::Compute[:aws].delete_volume(@volume_id)
-
-    tests('#create_volume from snapshot').formats(@volume_format) do
-      volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1)
-      volume.wait_for { ready? }
-
-      snapshot = Fog::Compute[:aws].create_snapshot(volume.identity).body
-      Fog::Compute[:aws].snapshots.new(snapshot).wait_for { ready? }
-
-      data = Fog::Compute[:aws].create_volume(@server.availability_zone, nil, 'SnapshotId' => snapshot['snapshotId']).body
-      @volume_id = data['volumeId']
-      data
-    end
-
-    Fog::Compute[:aws].delete_volume(@volume_id)
-
-    tests('#create_volume with type and iops').formats(@volume_format) do
-      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 100).body
-      @volume_id = data['volumeId']
-      data
-    end
-
-    Fog::Compute[:aws].delete_volume(@volume_id)
-
-    tests('#create_volume with encryption').returns(true) do
-      volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1, :encrypted => true)
-      @volume_id = volume.id
-      volume.reload.encrypted
-    end
-
-    Fog::Compute[:aws].delete_volume(@volume_id)
-
-    tests('#create_volume from snapshot with size').formats(@volume_format) do
-      volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1)
-      volume.wait_for { ready? }
-
-      snapshot = Fog::Compute[:aws].create_snapshot(volume.identity).body
-      Fog::Compute[:aws].snapshots.new(snapshot).wait_for { ready? }
-
-      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 1, 'SnapshotId' => snapshot['snapshotId']).body
-      @volume_id = data['volumeId']
-      data
-    end
-
-    Fog::Compute[:aws].volumes.get(@volume_id).wait_for { ready? }
-
-    tests('#describe_volumes').formats(@volumes_format) do
-      Fog::Compute[:aws].describe_volumes.body
-    end
-
-    tests("#describe_volumes('volume-id' => #{@volume_id})").formats(@volumes_format) do
-      Fog::Compute[:aws].describe_volumes('volume-id' => @volume_id).body
-    end
-
-    tests("#attach_volume(#{@server.identity}, #{@volume_id}, '/dev/sdh')").formats(@volume_attachment_format) do
-      Fog::Compute[:aws].attach_volume(@server.identity, @volume_id, '/dev/sdh').body
-    end
-
-    Fog::Compute[:aws].volumes.get(@volume_id).wait_for { state == 'in-use' }
-
-    tests("#describe_volume('attachment.device' => '/dev/sdh')").formats(@volumes_format) do
-      Fog::Compute[:aws].describe_volumes('attachment.device' => '/dev/sdh').body
-    end
-
-    tests("#describe_volume_status('volume-id' => #{@volume_id})").formats(@volume_status_format) do
-      pending if Fog.mocking?
-      Fog::Compute[:aws].describe_volume_status('volume-id' => @volume_id).body
-    end
-
-    tests("#detach_volume('#{@volume_id}')").formats(@volume_attachment_format) do
-      Fog::Compute[:aws].detach_volume(@volume_id).body
-    end
-
-    Fog::Compute[:aws].volumes.get(@volume_id).wait_for { ready? }
-
-    tests("#modify_volume_attribute('#{@volume_id}', true)").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].modify_volume_attribute(@volume_id, true).body
-    end
-
-    tests("#delete_volume('#{@volume_id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_volume(@volume_id).body
-    end
-  end
-
-  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
-      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
-      Fog::Compute[:aws].attach_volume(@server.identity, 'vol-00000000', '/dev/sdh')
-    end
-
-    tests("#detach_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
-      Fog::Compute[:aws].detach_volume('vol-00000000')
-    end
-
-    tests("#modify_volume_attribute('vol-00000000', true)").raises(Fog::Compute::AWS::NotFound) do
-      Fog::Compute[:aws].modify_volume_attribute('vol-00000000', true)
-    end
-
-    tests("#detach_volume('#{@volume.identity}')").raises(Fog::Compute::AWS::Error) do
-      Fog::Compute[:aws].detach_volume(@volume.identity)
-    end
-
-    tests("#delete_volume('vol-00000000')").raises(Fog::Compute::AWS::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
-      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
-      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
-      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
-      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
-      Fog::Compute[:aws].create_volume(@server.availability_zone, 1024, 'VolumeType' => 'io1', 'Iops' => 4001)
-    end
-
-    @volume.destroy
-  end
-
-  @server.destroy
-end

data/tests/requests/compute/vpc_tests.rb

@@ -1,178 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
-
-  @create_vpcs_format = {
-    'vpcSet' => [{
-      'vpcId'           => String,
-      'state'           => String,
-      'cidrBlock'       => String,
-      'dhcpOptionsId'   => String,
-      'tagSet'          => Hash
-    }],
-    'requestId' => String
-  }
-
-  @describe_vpcs_classic_link_format = {
-    'vpcSet' => [{
-      'vpcId'              => String,
-      'tagSet'             => Hash,
-      'classicLinkEnabled' => Fog::Boolean
-    }],
-    'requestId' => String
-  }
-  @describe_classic_link_instances = {
-    'instancesSet' => [{
-      'vpcId'              => String,
-      'tagSet'             => Hash,
-      'instanceId'         => String,
-      'groups'             => [{'groupId' => String, 'groupName' => String}]
-    }],
-    'requestId' => String,
-    'NextToken' => Fog::Nullable::String
-  }
-
-  @describe_vpcs_format = {
-    'vpcSet' => [{
-      'vpcId'           => String,
-      'state'           => String,
-      'cidrBlock'       => String,
-      'dhcpOptionsId'   => String,
-      'tagSet'          => Hash,
-      'instanceTenancy' => Fog::Nullable::String,
-    }],
-    'requestId' => String
-  }
-
-  tests('success') do
-
-    @vpc_id = nil
-
-    tests('#create_vpc').formats(@create_vpcs_format) do
-      data = Fog::Compute[:aws].create_vpc('10.255.254.0/28').body
-      @vpc_id = data['vpcSet'].first['vpcId']
-      data
-    end
-
-    tests('#create_vpc').formats(@create_vpcs_format) do
-      data = Fog::Compute[:aws].create_vpc('10.255.254.0/28',
-        {'InstanceTenancy' => 'default'}).body
-      @vpc_id = data['vpcSet'].first['vpcId']
-      data
-    end
-
-    tests('#describe_vpcs').formats(@describe_vpcs_format) do
-      Fog::Compute[:aws].describe_vpcs.body
-    end
-
-    [ 'enableDnsSupport', 'enableDnsHostnames'].each do |attrib|
-      tests("#describe_vpc_attribute('#{@vpc_id}', #{attrib})").returns(@vpc_id) do
-        Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, attrib).body['vpcId']
-      end
-    end
-
-    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => false})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => false}).body
-    end
-    tests("#describe_vpc_attribute(#{@vpc_id}, 'enableDnsSupport')").returns(false) do
-      Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, 'enableDnsSupport').body["enableDnsSupport"]
-    end
-    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsSupport.Value' => true})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => true}).body
-    end
-    tests("#describe_vpc_attribute(#{@vpc_id}, 'enableDnsSupport')").returns(true) do
-      Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, 'enableDnsSupport').body["enableDnsSupport"]
-    end
-
-    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsHostnames.Value' => true})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsHostnames.Value' => true}).body
-    end
-    tests("#describe_vpc_attribute(#{@vpc_id}, 'enableDnsHostnames')").returns(true) do
-      Fog::Compute[:aws].describe_vpc_attribute(@vpc_id, 'enableDnsHostnames').body["enableDnsHostnames"]
-    end
-    tests("#modify_vpc_attribute('#{@vpc_id}', {'EnableDnsHostnames.Value' => false})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsHostnames.Value' => false}).body
-    end
-    tests("#describe_vpc_attribute(#{@vpc_id}, 'enableDnsHostnames')").returns(false) 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
-      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
-      Fog::Compute[:aws].modify_vpc_attribute(@vpc_id, {'EnableDnsSupport.Value' => true, 'EnableDnsHostnames.Value' => true}).body
-    end
-
-    # Create another vpc to test tag filters
-    test_tags = {'foo' => 'bar'}
-    @another_vpc = Fog::Compute[:aws].vpcs.create :cidr_block => '1.2.3.4/24', :tags => test_tags
-
-    tests("#describe_vpcs('tag-key' => 'foo')").formats(@describe_vpcs_format)do
-      body = Fog::Compute[:aws].describe_vpcs('tag-key' => 'foo').body
-      tests("returns 1 vpc").returns(1) { body['vpcSet'].size }
-      body
-    end
-
-    tests("#describe_vpcs('tag-value' => 'bar')").formats(@describe_vpcs_format)do
-      body = Fog::Compute[:aws].describe_vpcs('tag-value' => 'bar').body
-      tests("returns 1 vpc").returns(1) { body['vpcSet'].size }
-      body
-    end
-
-    tests("#describe_vpcs('tag:foo' => 'bar')").formats(@describe_vpcs_format)do
-      body = Fog::Compute[:aws].describe_vpcs('tag:foo' => 'bar').body
-      tests("returns 1 vpc").returns(1) { body['vpcSet'].size }
-      body
-    end
-
-    tests("describe_vpc_classic_link(:filters => {'tag-key' => 'foo'}").formats(@describe_vpcs_classic_link_format) do
-      body = Fog::Compute[:aws].describe_vpc_classic_link(:filters => {'tag-key' => 'foo'})
-      tests("returns 1 vpc").returns(1) { body['vpcSet'].size }
-      body
-    end
-
-    tests("enable_vpc_classic_link").returns(true) do
-      Fog::Compute[:aws].enable_vpc_classic_link @vpc_id
-      body = Fog::Compute[:aws].describe_vpc_classic_link(:vpc_ids => [@vpc_id])
-      body['vpcSet'].first['classicLinkEnabled']
-    end
-
-    @server = Fog::Compute[:aws].servers.create
-    @server.wait_for {ready?}
-
-    @group = Fog::Compute[:aws].security_groups.create :name => 'test-group', :description => 'vpc security group'
-
-    tests("attach_classic_link_vpc") do
-      Fog::Compute[:aws].attach_classic_link_vpc(@server.id, @vpc_id, [@group])
-    end
-
-    tests('describe_classic_link_instances').formats(@describe_classic_link_instances) do
-      Fog::Compute[:aws].describe_classic_link_instances().body
-    end
-
-    tests("detach_classic_link_vpc").returns([]) do
-      Fog::Compute[:aws].detach_classic_link_vpc(@server.id, @vpc_id)
-      Fog::Compute[:aws].describe_classic_link_instances().body['instancesSet']
-    end
-    
-    if !Fog.mocking?
-      @server.destroy
-      @server.wait_for {state == 'terminated'}
-    end
-
-    tests("disable_vpc_classic_link").returns(false) do
-      Fog::Compute[:aws].disable_vpc_classic_link @vpc_id
-      body = Fog::Compute[:aws].describe_vpc_classic_link(:vpc_ids => [@vpc_id])
-      body['vpcSet'].first['classicLinkEnabled']
-    end
-
-    tests("#delete_vpc('#{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_vpc(@vpc_id).body
-    end
-
-    # Clean up
-    Fog::Compute[:aws].delete_tags(@another_vpc.id, test_tags)
-    @another_vpc.destroy
-    Fog::Compute::AWS::Mock.reset if Fog.mocking?
-  end
-end

data/tests/requests/data_pipeline/helper.rb

@@ -1,72 +0,0 @@
-class AWS
-  module DataPipeline
-    module Formats
-      BASIC = {
-        'pipelineId' => String,
-      }
-
-      FIELDS = [
-        {
-          "key" => String,
-          "refValue" => Fog::Nullable::String,
-          "stringValue" => Fog::Nullable::String,
-        }
-      ]
-
-      LIST_PIPELINES = {
-        "hasMoreResults" => Fog::Nullable::Boolean,
-        "marker" => Fog::Nullable::String,
-        "pipelineIdList" => [
-          {
-            "id" => String,
-            "name" => String,
-          }
-        ]
-      }
-
-      QUERY_OBJECTS = {
-        "hasMoreResults" => Fog::Nullable::Boolean,
-        "marker" => Fog::Nullable::String,
-        "ids" => Fog::Nullable::Array,
-      }
-
-      DESCRIBE_OBJECTS = {
-        "hasMoreResults" => Fog::Nullable::Boolean,
-        "marker" => Fog::Nullable::String,
-        "pipelineObjects" => [
-          {
-            'id' => String,
-            'name' => String,
-            'fields' => FIELDS,
-          }
-        ]
-      }
-
-      DESCRIBE_PIPELINES = {
-        "pipelineDescriptionList" => [
-          {
-            "description" => Fog::Nullable::String,
-            "name" => String,
-            "pipelineId" => String,
-            "fields" => FIELDS,
-          }
-        ]
-      }
-
-      PUT_PIPELINE_DEFINITION = {
-        "errored" => Fog::Boolean,
-        "validationErrors" => Fog::Nullable::Array,
-      }
-
-      GET_PIPELINE_DEFINITION = {
-        "pipelineObjects" => [
-          {
-            "id" => String,
-            "name" => String,
-            "fields" => FIELDS,
-          }
-        ]
-      }
-    end
-  end
-end