fog 1.26.0 → 1.27.0

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

@@ -1,48 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | placement group requests', ['aws']) do
-  @placement_group_format = {
-    'requestId'         => String,
-    'placementGroupSet' => [{
-      'groupName' => String,
-      'state'     => String,
-      'strategy'  => String
-    }]
-  }
-
-  tests('success') do
-    tests("#create_placement_group('fog_placement_group', 'cluster')").formats(AWS::Compute::Formats::BASIC) do
-      pending if Fog.mocking?
-      Fog::Compute[:aws].create_placement_group('fog_placement_group', 'cluster').body
-    end
-
-    tests("#describe_placement_groups").formats(@placement_group_format) do
-      pending if Fog.mocking?
-      Fog::Compute[:aws].describe_placement_groups.body
-    end
-
-    tests("#describe_placement_groups('group-name' => 'fog_placement_group)").formats(@placement_group_format) do
-      pending if Fog.mocking?
-      Fog::Compute[:aws].describe_placement_groups('group-name' => 'fog_security_group').body
-    end
-
-    tests("#delete_placement_group('fog_placement_group')").formats(AWS::Compute::Formats::BASIC) do
-      pending if Fog.mocking?
-      Fog::Compute[:aws].delete_placement_group('fog_placement_group').body
-    end
-  end
-
-  tests('failure') do
-    pending if Fog.mocking?
-
-    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
-      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
-      Fog::Compute[:aws].delete_placement_group('not_a_group_name')
-    end
-
-    Fog::Compute[:aws].delete_placement_group('fog_placement_group')
-  end
-end

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

@@ -1,52 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | region requests', ['aws']) do
-
-  @regions_format = {
-    'regionInfo'  => [{
-      'regionEndpoint'  => String,
-      'regionName'      => String
-    }],
-    'requestId'   => String
-  }
-
-  tests('success') do
-
-    tests("#describe_regions").formats(@regions_format) do
-      Fog::Compute[:aws].describe_regions.body
-    end
-
-    tests("#describe_regions('region-name' => 'us-east-1')").formats(@regions_format) do
-      Fog::Compute[:aws].describe_regions('region-name' => 'us-east-1').body
-    end
-
-    tests("#incorrect_region") do
-
-      raises(ArgumentError, "Unknown region: world-antarctica-1") do
-        Fog::Compute::AWS.new({:aws_access_key_id => 'dummykey',
-                :aws_secret_access_key => 'dummysecret',
-                :aws_session_token => 'dummytoken',
-                :region => 'world-antarctica-1'})
-      end
-
-    end
-
-    tests("#unknown_endpoint").formats(@regions_format) do
-      Fog::Compute::AWS.new({:aws_access_key_id => 'dummykey',
-                             :aws_secret_access_key => 'dummysecret',
-                             :aws_session_token => 'dummytoken',
-                             :region => 'world-antarctica-1',
-                             :endpoint => 'http://aws-clone.example'}).describe_regions.body
-    end
-
-    tests("#invalid_endpoint") do
-      raises(Fog::Compute::AWS::InvalidURIError) do
-        Fog::Compute::AWS.new({:aws_access_key_id => 'dummykey',
-                             :aws_secret_access_key => 'dummysecret',
-                             :aws_session_token => 'dummytoken',
-                             :region => 'world-antarctica-1',
-                             :endpoint => 'aws-clone.example'})
-      end
-    end
-
-  end
-
-end

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

@@ -1,339 +0,0 @@
-Shindo.tests('Fog::Compute[:aws] | route table requests', ['aws']) do
-
-  @route_table_format = {
-    'routeTable' => [{
-      'routeSet'        => [{
-        'destinationCidrBlock'  => String,
-        'gatewayId'             => String,
-        'state'                 => String,
-      }],
-      'tagSet'          => Hash,
-      'associationSet'  => Array,
-      'routeTableId'    => String,
-      'vpcId'           => String,
-    }],
-    'requestId'   => String
-  }
-
-  @route_tables_format = {
-    'routeTableSet' => [{
-      'associationSet' => [{
-        'routeTableAssociationId' => Fog::Nullable::String,
-        'routeTableId'            => String,
-        'subnetId'                => Fog::Nullable::String,
-        'main'                    => Fog::Boolean
-      }],
-      'tagSet'         => Hash,
-      'routeSet'       => [{
-        'destinationCidrBlock' => String,
-        'gatewayId'            => Fog::Nullable::String,
-        'instanceId'           => Fog::Nullable::String,
-        'instanceOwnerId'      => Fog::Nullable::String,
-        'networkInterfaceId'   => Fog::Nullable::String,
-        'state'                => String,
-        'origin'               => String
-      }],
-      'routeTableId'   => String,
-      'vpcId'          => String,
-    }],
-    'requestId'    => String
-  }
-
-  Fog::Compute::AWS::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" }
-  end
-  @subnet_id = Fog::Compute[:aws].create_subnet(vpc.id, '10.0.10.0/24').body['subnet']['subnetId']
-  @network_interface = Fog::Compute[:aws].create_network_interface(@subnet_id, {"PrivateIpAddress" => "10.0.10.23"}).body
-  @internet_gateway_id = Fog::Compute[:aws].create_internet_gateway.body['internetGatewaySet'].first['internetGatewayId']
-  @alt_internet_gateway_id = Fog::Compute[:aws].create_internet_gateway.body['internetGatewaySet'].first['internetGatewayId']
-  @network_interface_id = @network_interface['networkInterface']['networkInterfaceId']
-  key_name = 'fog-test-key'
-  key = Fog::Compute[:aws].key_pairs.create(:name => key_name)
-  @cidr_block = '10.0.10.0/24'
-  @destination_cidr_block = '10.0.10.0/23'
-  @ami = 'ami-79c0ae10' # ubuntu 12.04 daily build 20120728
-
-  tests('success') do
-
-    # Test create_route_table
-    #
-    tests("#create_route_table('#{vpc.id}')").formats(@route_table_format) do
-      data = Fog::Compute[:aws].create_route_table(vpc.id).body
-      @route_table_id = data['routeTable'].first['routeTableId']
-      data
-    end
-
-    # Test associate_route_table
-    #
-    tests("#associate_route_table('#{@route_table_id}', '#{@subnet_id}')").formats({'requestId'=>String, 'associationId'=>String}) do
-      data = Fog::Compute[:aws].associate_route_table(@route_table_id, @subnet_id).body
-      @association_id = data['associationId']
-      data
-    end
-
-    # Tests create_route
-    #   - using internet gateway
-    #   - using instance id
-    #   - using network interface
-    #
-    Fog::Compute[:aws].attach_internet_gateway(@internet_gateway_id, vpc.id).body
-    tests("#create_route('#{@route_table_id}', '#{@destination_cidr_block}', '#{@internet_gateway_id}', 'nil')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, @internet_gateway_id, nil).body
-    end
-
-    instance = Fog::Compute[:aws].servers.create(:image_id => @ami, :flavor_id => 't1.micro', :key_name => 'fog-test-key', :subnet_id => @subnet_id)
-    instance.wait_for { state.eql? "running" }
-    tests("#create_route('#{@route_table_id}', '10.0.10.0/22', 'nil', '#{instance.id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].create_route(@route_table_id, '10.0.10.0/22', nil, instance.id).body
-    end
-
-    tests("#create_route('#{@route_table_id}', '10.0.10.0/21', 'nil', 'nil', '#{@network_interface_id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].create_route(@route_table_id, '10.0.10.0/21', nil, nil, @network_interface_id).body
-    end
-
-    # Tests replace_route
-    #   - using internet gateway
-    #   - using instance id
-    #   - using network interface
-    #
-    Fog::Compute[:aws].attach_internet_gateway(@alt_internet_gateway_id, vpc.id).body
-    tests("#replace_route('#{@route_table_id}', '#{@destination_cidr_block}', {'gatewayId' => '#{@alt_internet_gateway_id}'})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].replace_route(@route_table_id, @destination_cidr_block, {'gatewayId' => @alt_internet_gateway_id}).body
-    end
-
-    instance = Fog::Compute[:aws].servers.create(:image_id => @ami, :flavor_id => 't1.micro', :key_name => 'fog-test-key', :subnet_id => @subnet_id)
-    instance.wait_for { state.eql? "running" }
-    tests("#replace_route('#{@route_table_id}', '10.0.10.0/22', {'instanceId' => '#{instance.id}'})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/22', {'instanceId' => instance.id}).body
-    end
-
-    tests("#replace_route('#{@route_table_id}', '10.0.10.0/21', {'networkInterfaceId' => '#{@network_interface_id}'})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/21', {'networkInterfaceId' => @network_interface_id}).body
-    end
-
-    # Tests describe_route_tables
-    #   - no parameters
-    #   - filter: vpc-id => vpc_id
-    #   - filter: vpc-id => ['all']
-    #
-    tests('#describe_route_tables').formats(@route_tables_format) do
-      Fog::Compute[:aws].describe_route_tables.body
-    end
-    tests("#describe_route_tables('vpc-id' => #{vpc.id})").formats(@route_tables_format) do
-      Fog::Compute[:aws].describe_route_tables('vpc-id' => vpc.id).body
-    end
-    tests("#describe_route_tables('vpc-id' => ['all'])").formats(@route_tables_format) do
-      Fog::Compute[:aws].describe_route_tables('vpc-id' => ['all']).body
-    end
-
-    # Test delete_route(route_table_id, cidr_block)
-    #
-    tests("#delete_route('#{@route_table_id}', '10.0.10.0/21')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_route(@route_table_id, '10.0.10.0/21').body
-    end
-    tests("#delete_route('#{@route_table_id}', '10.0.10.0/22')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_route(@route_table_id, '10.0.10.0/22').body
-    end
-
-    Fog::Compute[:aws].servers.all('instance-id'=>instance.id).first.destroy
-    if !Fog.mocking?
-      instance.wait_for { state.eql? "terminated" }
-    end
-    tests("#delete_route('#{@route_table_id}', '#{@destination_cidr_block}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_route(@route_table_id, @destination_cidr_block).body
-    end
-
-    # Test disassociate_route_table(association_id)
-    #
-    tests("#disassociate_route_table('#{@association_id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].disassociate_route_table(@association_id).body
-    end
-
-    # Test delete_route_table(route_table_id)
-    #
-    tests("#delete_route_table('#{@route_table_id}')").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].delete_route_table(@route_table_id).body
-    end
-  end
-  tests('failure') do
-
-    @route_table_id = Fog::Compute[:aws].create_route_table(vpc.id).body['routeTable'].first['routeTableId']
-    @association_id = Fog::Compute[:aws].associate_route_table(@route_table_id, @subnet_id).body['associationId']
-    Fog::Compute[:aws].create_route(@route_table_id, @destination_cidr_block, @internet_gateway_id, nil)
-    instance = Fog::Compute[:aws].servers.create(:image_id => @ami, :flavor_id => 't1.micro', :key_name => 'fog-test-key', :subnet_id => @subnet_id)
-    instance.wait_for { state.eql? "running" }
-
-    # Tests create_route_table
-    #   - no parameters
-    #   - passing a nonexisting vpc
-    #
-    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
-      Fog::Compute[:aws].create_route_table('vpc-00000000')
-    end
-
-    # Tests associate_route_table
-    #   - no parameters
-    #   - passing a nonexisiting route table
-    #   - passing a nonexisiting subnet
-    #
-    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
-      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
-      Fog::Compute[:aws].associate_route_table(@route_table_id, 'subnet-00000000')
-    end
-
-    # Tests create_route
-    #    - no parameters
-    #    - passing a nonexisiting route table and an exisiting internet gateway
-    #    - passing a nonexisiting internet gateway
-    #    - passing a nonexisting route table and an exisiting instance
-    #    - passing a nonexisiting instance
-    #    - passing a nonexsiting route table and an exisiting network interface
-    #    - passing a nonexisiting network interface
-    #    - attempting to add a route at the same destination cidr block as another
-    #    - attempting to add a route at a less specific destination cidr block
-    #
-    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
-      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
-      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
-      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
-      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
-      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
-      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
-      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
-        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
-    end
-
-    # Tests replace_route
-    #   - no parameters
-    #   - passing a nonexisiting route table and an exisiting internet gateway
-    #   - passing a nonexisiting route table
-    #   - passing a nonexisting route table and an exisiting instance
-    #   - passing a nonexisiting instance
-    #   - passing a nonexsiting route table and an exisiting network interface
-    #   - passing a nonexisiting network interface
-    #   - attempting to add a route at a less specific destination cidr block
-    #
-    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
-      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
-      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
-      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
-      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
-      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
-      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
-      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
-        Fog::Compute[:aws].replace_route(@route_table_id, '10.0.10.0/25', {'gatewayId' => @internet_gateway_id})
-      end
-    end
-
-    # Test describe_route_tables
-    #   - passing a nonexisiting vpc
-    #
-    tests("#describe_route_tables('vpc-id' => 'vpc-00000000").formats({'routeTableSet'=>Array, 'requestId'=>String}) do
-      Fog::Compute[:aws].describe_route_tables('vpc-id' => 'vpc-00000000').body
-    end
-
-    # Tests delete_route
-    #   - no parameters
-    #   - passing a nonexisiting route table
-    #
-    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
-      Fog::Compute[:aws].delete_route('rtb-00000000', @destination_cidr_block)
-    end
-
-    # Tests disassociate_route_table
-    #   - no parameters
-    #   - passing a nonexisiting route table association id
-    #
-    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
-      Fog::Compute[:aws].disassociate_route_table('rtbassoc-00000000')
-    end
-
-    # Tests delete_route_table
-    #   - no parameters
-    #   - passing a nonexisiting route table
-    #
-    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
-      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
-      Fog::Compute[:aws].delete_route_table(@route_table_id)
-    end
-
-    Fog::Compute[:aws].servers.all('instance-id'=>instance.id).first.destroy
-    if !Fog.mocking?
-      instance.wait_for { state.eql? "terminated" }
-    end
-    Fog::Compute[:aws].delete_route(@route_table_id, @destination_cidr_block)
-    Fog::Compute[:aws].disassociate_route_table(@association_id)
-    Fog::Compute[:aws].delete_route_table(@route_table_id)
-  end
-
-  Fog::Compute[:aws].delete_network_interface(@network_interface_id)
-  Fog::Compute[:aws].detach_internet_gateway(@internet_gateway_id, vpc.id)
-  Fog::Compute[:aws].delete_internet_gateway(@internet_gateway_id)
-  Fog::Compute[:aws].delete_subnet(@subnet_id)
-  vpc.destroy
-  key.destroy
-end

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

@@ -1,437 +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],
-        '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"=>[],
-        "ipProtocol"=>"tcp",
-        "toPort"=>65535},
-      {"groups"=>[{"groupName"=>"default", "userId"=>@owner_id, "groupId"=>@group_id_default}],
-        "fromPort"=>1,
-        "ipRanges"=>[],
-        "ipProtocol"=>"udp",
-        "toPort"=>65535},
-      {"groups"=>[{"groupName"=>"default", "userId"=>@owner_id, "groupId"=>@group_id_default}],
-        "fromPort"=>-1,
-        "ipRanges"=>[],
-        "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"=>[],
-        "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"=>[],
-        "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"=>[],
-        "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"}],
-        "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' }]
-        }
-      ]
-    }
-    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"}],
-        "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"=>[],
-        "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::Compute::AWS::Error) do
-      Fog::Compute[:aws].create_security_group(@security_group.name, @security_group.description)
-    end
-
-    tests("#authorize_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::Compute::AWS::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::Compute::AWS::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::Compute::AWS::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::Compute::AWS::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::Compute::AWS::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
-        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
-      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::Compute::AWS::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::Compute::AWS::NotFound) do
-      Fog::Compute[:aws].delete_security_group('not_a_group_name')
-    end
-
-    @security_group.destroy
-    @other_security_group.destroy
-
-    tests("#delete_security_group('default')").raises(Fog::Compute::AWS::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::Compute::AWS::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
-        Fog::Compute[:aws].revoke_security_group_ingress(list_elem[0], list_elem[1])
-      end
-    end
-
-  end
-
-end