fog 1.6.0 → 1.7.0

data/tests/aws/requests/auto_scaling/tag_tests.rb

@@ -0,0 +1,62 @@
+Shindo.tests('AWS::AutoScaling | tag requests', ['aws', 'auto_scaling']) do
+
+  image_id = {  # Ubuntu 12.04 LTS 64-bit EBS
+    'ap-northeast-1' => 'ami-60c77761',
+    'ap-southeast-1' => 'ami-a4ca8df6',
+    'eu-west-1'      => 'ami-e1e8d395',
+    'sa-east-1'      => 'ami-8cd80691',
+    'us-east-1'      => 'ami-a29943cb',
+    'us-west-1'      => 'ami-87712ac2',
+    'us-west-2'      => 'ami-20800c10'
+  }
+
+  now = Time.now.utc.to_i
+  lc_name = "fog-test-#{now}"
+  asg_name = "fog-test-#{now}"
+
+  asg_tag = {
+    'Key'               => 'Name',
+    'PropagateAtLaunch' => true,
+    'ResourceId'        => asg_name,
+    'ResourceType'      => 'auto-scaling-group',
+    'Value'             => asg_name
+  }
+
+  lc = Fog::AWS[:auto_scaling].create_launch_configuration(image_id[Fog::AWS[:auto_scaling].region], 't1.micro', lc_name)
+  asg = Fog::AWS[:auto_scaling].create_auto_scaling_group(asg_name, "#{Fog::AWS[:auto_scaling].region}a", lc_name, 0, 0, 'Tags' => [asg_tag])
+
+  tests('raises') do
+    tests("#create_or_update_tags(empty)").raises(Fog::AWS::AutoScaling::ValidationError) do
+      Fog::AWS[:auto_scaling].create_or_update_tags([])
+    end
+
+    tests("#delete_tags(empty)").raises(Fog::AWS::AutoScaling::ValidationError) do
+      Fog::AWS[:auto_scaling].delete_tags([])
+    end
+  end
+
+  tests('success') do
+    tests("#describe_auto_scaling_groups(#{asg_name}").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do
+      body = Fog::AWS[:auto_scaling].describe_auto_scaling_groups('AutoScalingGroupNames' => asg_name).body
+      auto_scaling_group = body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].first
+      returns(true) { auto_scaling_group.has_key?('Tags') }
+      returns(true) { auto_scaling_group['Tags'].size == 1 }
+      returns(true) { auto_scaling_group['Tags'].first == asg_tag }
+      body
+    end
+
+    tests("#describe_tags").formats(AWS::AutoScaling::Formats::DESCRIBE_TAGS) do
+      pending if Fog.mocking?
+      body = Fog::AWS[:auto_scaling].describe_tags.body
+      tags = body['DescribeTagsResult']['Tags']
+      returns(true) { tags.any? {|tag| tag == asg_tag} }
+      body
+    end
+
+    # TODO: more tests!
+  end
+
+  Fog::AWS[:auto_scaling].delete_auto_scaling_group(asg_name)
+  Fog::AWS[:auto_scaling].delete_launch_configuration(lc_name)
+
+end

data/tests/aws/requests/cdn/cdn_tests.rb

@@ -0,0 +1,252 @@
+Shindo.tests('Fog::CDN[:aws] | CDN requests', ['aws', 'cdn']) do
+
+  @cf_connection = Fog::CDN[:aws]
+
+  tests('distributions success') do
+
+    test('get current ditribution list count') do
+
+      @count= 0
+      response = @cf_connection.get_distribution_list
+      if response.status == 200
+        @distributions = response.body['DistributionSummary']
+        @count = @distributions.count
+      end
+
+      response.status == 200
+    end
+
+    test('create distribution') {
+
+      result = false
+
+      response = @cf_connection.post_distribution('S3Origin' => { 'DNSName' => 'test_cdn.s3.amazonaws.com'}, 'Enabled' => true)
+      if response.status == 201
+        @dist_id = response.body['Id']
+        @etag = response.headers['ETag']
+        @caller_reference = response.body['DistributionConfig']['CallerReference']
+        if (@dist_id.length > 0)
+          result = true
+        end
+      end
+
+      result
+    }
+
+    test("get info on distribution #{@dist_id}") {
+
+      result = false
+
+      response = @cf_connection.get_distribution(@dist_id)
+      if response.status == 200
+        @etag = response.headers['ETag']
+        status = response.body['Status']
+        if ((status == 'Deployed') or (status == 'InProgress')) and not @etag.nil?
+          result = true
+        end
+      end
+
+      result
+    }
+
+    test('list distributions') do
+
+      result = false
+
+      response = @cf_connection.get_distribution_list
+      if response.status == 200
+        distributions = response.body['DistributionSummary']
+        if (distributions.count > 0)
+          dist = distributions[0]
+          dist_id = dist['Id']
+        end
+        max_items = response.body['MaxItems']
+
+        if (dist_id.length > 0) and (max_items > 0)
+          result = true
+        end
+
+      end
+
+      result
+    end
+
+    test("invalidate paths") {
+
+      response = @cf_connection.post_invalidation(@dist_id, ["/test.html", "/path/to/file.html"])
+      if response.status == 201
+        @invalidation_id = response.body['Id']
+      end
+
+      response.status == 201
+    }
+
+    test("list invalidations") {
+
+      result = false
+
+      response = @cf_connection.get_invalidation_list(@dist_id)
+      if response.status == 200
+        if response.body['InvalidationSummary'].find { |f| f['Id'] == @invalidation_id }
+          result = true
+        end
+      end
+
+      result
+    }
+
+    test("get invalidation information") {
+
+      result = false
+
+      response = @cf_connection.get_invalidation(@dist_id, @invalidation_id)
+      if response.status == 200
+        paths = response.body['InvalidationBatch']['Path'].sort
+        status = response.body['Status']
+        if status.length > 0 and paths == [ '/test.html', '/path/to/file.html' ].sort
+          result = true
+        end
+      end
+
+      result
+    }
+
+    test("disable distribution #{@dist_id} - can take 15 minutes to complete...") {
+
+      result = false
+
+      response = @cf_connection.put_distribution_config(@dist_id, @etag, 'S3Origin' => { 'DNSName' => 'test_cdn.s3.amazonaws.com'}, 'Enabled' => false, 'CallerReference' => @caller_reference)
+      if response.status == 200
+        @etag = response.headers['ETag']
+        unless @etag.nil?
+          result = true
+        end
+      end
+
+      result
+    }
+
+    test("remove distribution #{@dist_id}") {
+
+      result = true
+
+      # unfortunately you can delete only after a distribution becomes Deployed
+      Fog.wait_for {
+        response = @cf_connection.get_distribution(@dist_id)
+        @etag = response.headers['ETag']
+        response.status == 200 and response.body['Status'] == 'Deployed'
+      }
+
+      response = @cf_connection.delete_distribution(@dist_id, @etag)
+      if response.status != 204
+        result = false
+      end
+
+      result
+    }
+  end
+
+  tests('streaming distributions success') do
+
+    test('get current streaming ditribution list count') do
+
+      @count= 0
+      response = @cf_connection.get_streaming_distribution_list
+      if response.status == 200
+        @distributions = response.body['StreamingDistributionSummary']
+        @count = @distributions.count
+      end
+
+      response.status == 200
+    end
+
+    test('create distribution') {
+
+      result = false
+
+      response = @cf_connection.post_streaming_distribution('S3Origin' => { 'DNSName' => 'test_cdn.s3.amazonaws.com'}, 'Enabled' => true)
+      if response.status == 201
+        @dist_id = response.body['Id']
+        @etag = response.headers['ETag']
+        @caller_reference = response.body['StreamingDistributionConfig']['CallerReference']
+        if (@dist_id.length > 0)
+          result = true
+        end
+      end
+
+      result
+    }
+
+    test("get info on distribution #{@dist_id}") {
+
+      result = false
+
+      response = @cf_connection.get_streaming_distribution(@dist_id)
+      if response.status == 200
+        @etag = response.headers['ETag']
+        status = response.body['Status']
+        if ((status == 'Deployed') or (status == 'InProgress')) and not @etag.nil?
+          result = true
+        end
+      end
+
+      result
+    }
+
+    test('list streaming distributions') do
+
+      result = false
+
+      response = @cf_connection.get_streaming_distribution_list
+      if response.status == 200
+        distributions = response.body['StreamingDistributionSummary']
+        if (distributions.count > 0)
+          dist = distributions[0]
+          dist_id = dist['Id']
+        end
+        max_items = response.body['MaxItems']
+
+        if (dist_id.length > 0) and (max_items > 0)
+          result = true
+        end
+
+      end
+
+      result
+    end
+
+    test("disable distribution #{@dist_id} - can take 15 minutes to complete...") {
+
+      result = false
+
+      response = @cf_connection.put_streaming_distribution_config(@dist_id, @etag, 'S3Origin' => { 'DNSName' => 'test_cdn.s3.amazonaws.com'}, 'Enabled' => false, 'CallerReference' => @caller_reference)
+      if response.status == 200
+        @etag = response.headers['ETag']
+        unless @etag.nil?
+          result = true
+        end
+      end
+
+      result
+    }
+
+    test("remove distribution #{@dist_id}") {
+
+      result = true
+
+      # unfortunately you can delete only after a distribution becomes Deployed
+      Fog.wait_for {
+        response = @cf_connection.get_streaming_distribution(@dist_id)
+        @etag = response.headers['ETag']
+        response.status == 200 and response.body['Status'] == 'Deployed'
+      }
+
+      response = @cf_connection.delete_streaming_distribution(@dist_id, @etag)
+      if response.status != 204
+        result = false
+      end
+
+      result
+    }
+  end
+end

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

@@ -35,6 +35,10 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
     'return'                => Fog::Boolean,
     'requestId'             => String
   }
+  @create_image_format = {
+    'requestId'             => String,
+    'imageId'               => String
+  }
 
   tests('success') do
     # the result for this is HUGE and relatively uninteresting...
@@ -46,10 +50,37 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
     if Fog.mocking?
       @other_account = Fog::Compute::AWS.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
 
+      @server = Fog::Compute[:aws].servers.create
+      @server.wait_for{state == 'running'}
+      @created_image
+      tests("#create_image").formats(@create_image_format) do
+        result = Fog::Compute[:aws].create_image(@server.id, 'Fog-Test-Image', 'Fog Test Image', false).body
+        @created_image = Fog::Compute[:aws].images.get(result['imageId'])
+        result
+      end
+      tests("#create_image - no reboot").formats(@create_image_format) do
+        result = Fog::Compute[:aws].create_image(@server.id, 'Fog-Test-Image', 'Fog Test Image', true).body
+        @created_image = Fog::Compute[:aws].images.get(result['imageId'])
+        result
+      end
+      tests("#create_image - automatic ebs image registration").returns(true) do
+      create_image_response = Fog::Compute[:aws].create_image(@server.id, 'Fog-Test-Image', 'Fog Test Image')
+      Fog::Compute[:aws].images.get(create_image_response.body['imageId']) != nil
+      end
+      @server.destroy
+
       tests("#register_image").formats(@register_image_format) do
         @image = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1').body
       end
 
+      tests("#register_image - with ebs block device mapping").formats(@register_image_format) do
+        @ebs_image = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1', [ { 'DeviceName' => '/dev/sdh', "SnapshotId" => "snap-123456789", "VolumeSize" => "10G", "DeleteOnTermination" => true}]).body
+      end
+
+      tests("#register_image - with ephemeral block device mapping").formats(@register_image_format) do
+        @ephemeral_image = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1', [ { 'VirtualName' => 'ephemeral0', "DeviceName" => "/dev/sdb"} ]).body
+      end
+
       @image_id = @image['imageId']
       sleep 1
 
@@ -104,4 +135,4 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
       Fog::Compute[:aws].modify_image_attribute('ami-00000000', { 'Add.UserId' => ['123456789012'] }).body
     end
   end
-end
+end

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

@@ -184,9 +184,9 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       Fog::Compute[:aws].create_volume(@server.availability_zone, 10, 'VolumeType' => 'io1', 'Iops' => 99)
     end
 
-    # iops invalid value (greater than 1000)
-    tests("#create_volume('#{@server.availability_zone}', 10, 'VolumeType' => 'io1', 'Iops' => 1001)").raises(Fog::Compute::AWS::Error) do
-      Fog::Compute[:aws].create_volume(@server.availability_zone, 1000, 'VolumeType' => 'io1', 'Iops' => 1001)
+    # iops invalid value (greater than 2000)
+    tests("#create_volume('#{@server.availability_zone}', 1024, 'VolumeType' => 'io1', 'Iops' => 2001)").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].create_volume(@server.availability_zone, 1024, 'VolumeType' => 'io1', 'Iops' => 2001)
     end
 
     @volume.destroy

data/tests/aws/requests/rds/describe_events.rb

@@ -0,0 +1,16 @@
+Shindo.tests('AWS::RDS | describe DB events requests',['aws', 'rds']) do
+
+  tests('success') do
+    pending if Fog.mocking?
+
+    tests(
+    '#describe_events'
+    ).formats(AWS::RDS::Formats::EVENT_LIST) do
+      AWS[:rds].describe_events().body['Events']
+    end
+  end
+
+  tests('failure') do
+    #TODO: What constitutes a failure here? 
+  end
+end

data/tests/aws/requests/rds/helper.rb

@@ -52,6 +52,26 @@ class AWS
         }
       })
 
+      DB_SUBNET_GROUP = {
+        'DBSubnetGroupName' => String,
+        'DBSubnetGroupDescription' => String,
+        'SubnetGroupStatus' => String,
+        'VpcId' => String,
+        'Subnets' => [String]
+      }
+
+      CREATE_DB_SUBNET_GROUP = BASIC.merge({
+        'CreateDBSubnetGroupResult' => {
+          'DBSubnetGroup' => DB_SUBNET_GROUP
+        }
+      })
+
+      DESCRIBE_DB_SUBNET_GROUPS = BASIC.merge({
+        'DescribeDBSubnetGroupsResult' => {
+          'DBSubnetGroups' => [DB_SUBNET_GROUP]
+        }
+      })
+
       DESCRIBE_DB_PARAMETER_GROUP = {
         'ResponseMetadata' => {'RequestId' => String},
         'DescribeDBParameterGroupsResult' =>{
@@ -203,6 +223,12 @@ class AWS
         }
       })
 
+      LIST_TAGS_FOR_RESOURCE = {
+        'ListTagsForResourceResult' => {
+          'TagList' => Fog::Nullable::Hash
+        }
+      }
+
     end
 
   end

data/tests/aws/requests/rds/subnet_groups_test.rb

@@ -0,0 +1,48 @@
+Shindo.tests('AWS::RDS | subnet group requests', ['aws', 'rds']) do
+  # random_differentiator
+  # Useful when rapidly re-running tests, so we don't have to wait
+  # serveral minutes for deleted VPCs/subnets to disappear
+  suffix = rand(65536).to_s(16)
+  @subnet_group_name = "fog-test-#{suffix}"
+
+  vpc_range = rand(245) + 10
+  @vpc = Fog::Compute[:aws].vpcs.create('cidr_block' => "10.#{vpc_range}.0.0/16")
+
+  # Create 4 subnets in this VPC, each one in a different AZ
+  subnet_az = 'us-east-1a'
+  subnet_range = 8
+  @subnets = (1..4).map do
+    subnet = Fog::Compute[:aws].create_subnet(@vpc.id, "10.#{vpc_range}.#{subnet_range}.0/24",
+      'AvailabilityZone' => subnet_az).body['subnetSet'].first
+    subnet_az = subnet_az.succ
+    subnet_range *= 2
+    subnet
+  end
+
+  tests('success') do
+
+    subnet_ids = @subnets.map { |sn| sn['subnetId'] }.to_a
+
+    tests("#create_db_subnet_group").formats(AWS::RDS::Formats::CREATE_DB_SUBNET_GROUP) do
+      result = Fog::AWS[:rds].create_db_subnet_group(@subnet_group_name, subnet_ids, 'A subnet group').body
+
+      returns(@subnet_group_name) { result['CreateDBSubnetGroupResult']['DBSubnetGroup']['DBSubnetGroupName'] }
+      returns('A subnet group') { result['CreateDBSubnetGroupResult']['DBSubnetGroup']['DBSubnetGroupDescription'] }
+      returns(@vpc.id) { result['CreateDBSubnetGroupResult']['DBSubnetGroup']['VpcId'] }
+      returns(subnet_ids.sort) { result['CreateDBSubnetGroupResult']['DBSubnetGroup']['Subnets'].sort }
+
+      result
+    end
+
+    tests("#describe_db_subnet_groups").formats(AWS::RDS::Formats::DESCRIBE_DB_SUBNET_GROUPS) do
+      Fog::AWS[:rds].describe_db_subnet_groups.body
+    end
+
+  end
+
+  @subnets.each do |sn|
+    Fog::Compute[:aws].delete_subnet(sn['subnetId'])
+  end
+  @vpc.destroy
+
+end