fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

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

@@ -16,6 +16,25 @@ class AWS
       SINGLE_SECURITY_GROUP = BASIC.merge('CacheSecurityGroup' => SECURITY_GROUP)
       DESCRIBE_SECURITY_GROUPS = {'CacheSecurityGroups' => [SECURITY_GROUP]}
 
+      CACHE_SUBNET_GROUP = {
+        'CacheSubnetGroupName' => String,
+        'CacheSubnetGroupDescription' => String,
+        'VpcId' => String,
+        'Subnets' => [String]
+      }
+
+      CREATE_CACHE_SUBNET_GROUP = BASIC.merge({
+         'CreateCacheSubnetGroupResult' => {
+           'CacheSubnetGroup' => CACHE_SUBNET_GROUP
+         }
+       })
+
+      DESCRIBE_CACHE_SUBNET_GROUPS = BASIC.merge({
+        'DescribeCacheSubnetGroupsResult' => {
+          'CacheSubnetGroups' => [CACHE_SUBNET_GROUP]
+        }
+      })
+
       # Cache Parameter Groups
       PARAMETER_GROUP = {
         'CacheParameterGroupFamily' => String,

data/tests/aws/requests/elasticache/subnet_group_tests.rb

@@ -0,0 +1,52 @@
+Shindo.tests('AWS::Elasticache | subnet group requests', ['aws', 'elasticache']) 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['subnet']
+    subnet_az = subnet_az.succ
+    subnet_range *= 2
+    subnet
+  end
+
+  tests('success') do
+
+    subnet_ids = @subnets.map { |sn| sn['subnetId'] }.to_a
+
+    tests("#create_cache_subnet_group").formats(AWS::Elasticache::Formats::CREATE_CACHE_SUBNET_GROUP) do
+      result = Fog::AWS[:elasticache].create_cache_subnet_group(@subnet_group_name, subnet_ids, 'A subnet group').body
+
+      returns(@subnet_group_name) { result['CreateCacheSubnetGroupResult']['CacheSubnetGroup']['CacheSubnetGroupName'] }
+      returns('A subnet group') { result['CreateCacheSubnetGroupResult']['CacheSubnetGroup']['CacheSubnetGroupDescription'] }
+      returns(@vpc.id) { result['CreateCacheSubnetGroupResult']['CacheSubnetGroup']['VpcId'] }
+      returns(subnet_ids.sort) { result['CreateCacheSubnetGroupResult']['CacheSubnetGroup']['Subnets'].sort }
+
+      result
+    end
+
+    tests("#describe_cache_subnet_groups").formats(AWS::Elasticache::Formats::DESCRIBE_CACHE_SUBNET_GROUPS) do
+      Fog::AWS[:elasticache].describe_cache_subnet_groups.body
+    end
+
+    tests("#delete_cache_subnet_group").formats(AWS::Elasticache::Formats::BASIC) do
+      Fog::AWS[:elasticache].delete_cache_subnet_group(@subnet_group_name).body
+    end
+
+  end
+
+  @subnets.each do |sn|
+    Fog::Compute[:aws].delete_subnet(sn['subnetId'])
+  end
+  @vpc.destroy
+
+end

data/tests/aws/requests/iam/server_certificate_tests.rb

@@ -120,6 +120,9 @@ Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
   end
 
   tests('#delete_server_certificate').formats(AWS::IAM::Formats::BASIC) do
+    tests('raises NotFound').raises(Fog::AWS::IAM::NotFound) do
+      Fog::AWS::IAM.new.delete_server_certificate("#{@key_name}fake")
+    end
     Fog::AWS::IAM.new.delete_server_certificate(@key_name).body
   end
 

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

@@ -13,7 +13,7 @@ Shindo.tests('AWS::RDS | subnet group requests', ['aws', 'rds']) do
   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
+      'AvailabilityZone' => subnet_az).body['subnet']
     subnet_az = subnet_az.succ
     subnet_range *= 2
     subnet

data/tests/aws/requests/storage/multipart_upload_tests.rb

@@ -11,7 +11,6 @@ Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
     }
 
     tests("#initiate_multipart_upload('#{@directory.identity}')", 'fog_multipart_upload').formats(@initiate_multipart_upload_format) do
-      pending if Fog.mocking?
       data = Fog::Storage[:aws].initiate_multipart_upload(@directory.identity, 'fog_multipart_upload').body
       @upload_id = data['UploadId']
       data
@@ -49,7 +48,6 @@ Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
     @parts = []
 
     tests("#upload_part('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', 1, ('x' * 6 * 1024 * 1024))").succeeds do
-      pending if Fog.mocking?
       data = Fog::Storage[:aws].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 1, ('x' * 6 * 1024 * 1024))
       @parts << data.headers['ETag']
     end
@@ -80,9 +78,7 @@ Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
       Fog::Storage[:aws].list_parts(@directory.identity, 'fog_multipart_upload', @upload_id).body
     end
 
-    if !Fog.mocking?
-      @parts << Fog::Storage[:aws].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 2, ('x' * 4 * 1024 * 1024)).headers['ETag']
-    end
+    @parts << Fog::Storage[:aws].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 2, ('x' * 4 * 1024 * 1024)).headers['ETag']
 
     @complete_multipart_upload_format = {
       'Bucket'    => String,
@@ -92,25 +88,18 @@ Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
     }
 
     tests("#complete_multipart_upload('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', #{@parts.inspect})").formats(@complete_multipart_upload_format) do
-      pending if Fog.mocking?
       Fog::Storage[:aws].complete_multipart_upload(@directory.identity, 'fog_multipart_upload', @upload_id, @parts).body
     end
 
     tests("#get_object('#{@directory.identity}', 'fog_multipart_upload').body").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:aws].get_object(@directory.identity, 'fog_multipart_upload').body == ('x' * 10 * 1024 * 1024)
     end
 
-    if !Fog.mocking?
-      @directory.files.new(:key => 'fog_multipart_upload').destroy
-    end
+    @directory.files.new(:key => 'fog_multipart_upload').destroy
 
-    if !Fog.mocking?
-      @upload_id = Fog::Storage[:aws].initiate_multipart_upload(@directory.identity, 'fog_multipart_abort').body['UploadId']
-    end
+    @upload_id = Fog::Storage[:aws].initiate_multipart_upload(@directory.identity, 'fog_multipart_abort').body['UploadId']
 
     tests("#abort_multipart_upload('#{@directory.identity}', 'fog_multipart_abort', '#{@upload_id}')").succeeds do
-      pending if Fog.mocking?
       Fog::Storage[:aws].abort_multipart_upload(@directory.identity, 'fog_multipart_abort', @upload_id)
     end
 

data/tests/brightbox/compute/schema.rb

@@ -99,6 +99,43 @@ class Brightbox
           "reverse_dns"     => String
         }
 
+        DATABASE_SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "allow_access"    => Array,
+          "database_version" => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        DATABASE_SNAPSHOT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "database_version" => String,
+          "size"            => Integer,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        DATABASE_SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
         FIREWALL_POLICY = {
           "id"              => String,
           "resource_type"   => String,
@@ -290,6 +327,43 @@ class Brightbox
           "server_group"     => Fog::Brightbox::Nullable::ServerGroup
         }
 
+        DATABASE_SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "allow_access"    => Array,
+          "database_version" => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        DATABASE_SNAPSHOT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "database_version" => String,
+          "size"            => Integer,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        DATABASE_SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
         FIREWALL_POLICY = {
           "id"              => String,
           "resource_type"   => String,
@@ -498,6 +572,45 @@ class Brightbox
           "server_group"    => Fog::Brightbox::Nullable::ServerGroup
         }
 
+        DATABASE_SERVER = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "admin_username"  => Fog::Nullable::String,
+          "admin_password"  => Fog::Nullable::String,
+          "allow_access"    => Array,
+          "database_version" => String,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String
+        }
+
+        DATABASE_SNAPSHOT = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "database_version" => String,
+          "size"            => Integer,
+          "status"          => String,
+          "created_at"      => String,
+          "deleted_at"      => Fog::Nullable::String,
+          "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
+        }
+
+        DATABASE_SERVER_TYPE = {
+          "id"              => String,
+          "resource_type"   => String,
+          "url"             => String,
+          "name"            => String,
+          "description"     => String,
+          "ram"             => Integer,
+          "disk_size"       => Integer
+        }
+
         FIREWALL_POLICY = {
           "id"              => String,
           "resource_type"   => String,
@@ -669,15 +782,18 @@ class Brightbox
         API_CLIENTS = [Brightbox::Compute::Formats::Collected::API_CLIENT]
         APPLICATION = [Brightbox::Compute::Formats::Collected::APPLICATION]
         CLOUD_IPS = [Brightbox::Compute::Formats::Collected::CLOUD_IP]
-        IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE]
+        COLLABORATIONS = [Brightbox::Compute::Formats::Collected::COLLABORATION]
+        DATABASE_SERVERS = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER]
+        DATABASE_SERVER_TYPES = [Brightbox::Compute::Formats::Collected::DATABASE_SERVER_TYPE]
+        DATABASE_SNAPSHOTS = [Brightbox::Compute::Formats::Collected::DATABASE_SNAPSHOT]
         FIREWALL_POLICIES = [Brightbox::Compute::Formats::Collected::FIREWALL_POLICY]
+        IMAGES = [Brightbox::Compute::Formats::Collected::IMAGE]
         LOAD_BALANCERS = [Brightbox::Compute::Formats::Collected::LOAD_BALANCER]
         SERVERS = [Brightbox::Compute::Formats::Collected::SERVER]
         SERVER_GROUPS = [Brightbox::Compute::Formats::Collected::SERVER_GROUP]
         SERVER_TYPES = [Brightbox::Compute::Formats::Collected::SERVER_TYPE]
         USERS = [Brightbox::Compute::Formats::Collected::USER]
         ZONES = [Brightbox::Compute::Formats::Collected::ZONE]
-        COLLABORATIONS = [Brightbox::Compute::Formats::Collected::COLLABORATION]
       end
     end
   end

data/tests/brightbox/helper.rb

@@ -0,0 +1 @@
+Excon.defaults[:ssl_verify_peer] = false

data/tests/brightbox/models/compute/cloud_ip_tests.rb

@@ -0,0 +1,32 @@
+Shindo.tests("Fog::Compute[:brightbox] | CloudIp model", ["brightbox"]) do
+  pending if Fog.mocking?
+
+  @test_service = Fog::Compute[:brightbox]
+
+  tests("success") do
+    @server = Brightbox::Compute::TestSupport.get_test_server
+    server_id = @server.id
+
+    @cip = @test_service.cloud_ips.allocate
+
+    tests("#destination_id") do
+      returns(true) do
+        @cip.respond_to?(:destination_id)
+      end
+
+      @cip.map(@server)
+      @cip.wait_for { mapped? }
+
+      returns(server_id) do
+        @cip.destination_id
+      end
+
+      @cip.unmap
+      @cip.wait_for { !mapped? }
+    end
+
+    @cip.destroy
+
+    @server.destroy
+  end
+end

data/tests/brightbox/models/compute/database_server_tests.rb

@@ -0,0 +1,66 @@
+Shindo.tests("Fog::Compute[:brightbox] | DatabaseServer model", ["brightbox"]) do
+  pending if Fog.mocking?
+
+  @service = Fog::Compute[:brightbox]
+
+  tests("success") do
+    tests("#create") do
+      test("a new database server is returned") do
+        @database_server = @service.database_servers.create
+        !@database_server.nil?
+      end
+
+      test("state is not nil") do
+        !@database_server.state.nil?
+      end
+
+      test("database_version is not nil") do
+        !@database_server.database_version.nil?
+      end
+
+      test("admin_username is not nil") do
+        !@database_server.admin_username.nil?
+      end
+
+      test("admin_password is not nil") do
+        !@database_server.admin_password.nil?
+      end
+    end
+
+    @sample_identifier = @database_server.id
+    pending if @sample_identifier.nil?
+
+    tests("#all") do
+      test("returns results") do
+        @database_servers = @service.database_servers.all
+        @database_servers.any? do |dbs|
+          dbs.identity == @database_server.identity
+        end
+      end
+    end
+
+    tests("#get('#{@sample_identifier}')") do
+      @database_server = @service.database_servers.get(@sample_identifier)
+
+      @database_server.wait_for { ready? }
+
+      test("admin_username is not nil") do
+        !@database_server.admin_username.nil?
+      end
+
+      test("admin_password is nil") do
+        @database_server.admin_password.nil?
+      end
+    end
+
+    @database_server.wait_for { ready? }
+
+    test("#snapshot") do
+      @database_server.snapshot
+    end
+
+    tests("#destroy") do
+      @database_server.destroy
+    end
+  end
+end

data/tests/brightbox/models/compute/database_snapshot_tests.rb

@@ -0,0 +1,26 @@
+Shindo.tests("Fog::Compute[:brightbox] | DatabaseSnapshot model", ["brightbox"]) do
+  pending if Fog.mocking?
+
+  @service = Fog::Compute[:brightbox]
+
+  tests("success") do
+    tests("#all") do
+      test("returns results") do
+        @database_snapshots = @service.database_snapshots.all
+        !@database_snapshots.empty?
+      end
+    end
+
+    pending if @database_snapshots.empty?
+    @sample_identifier = @database_snapshots.first.identity
+    tests("#get('#{@sample_identifier}')") do
+      @database_snapshot = @service.database_snapshots.get(@sample_identifier)
+    end
+
+    # @database_snapshot.wait_for { ready? }
+
+    # tests("#destroy") do
+    #   @database_snapshot.destroy
+    # end
+  end
+end

data/tests/brightbox/models/compute/database_type_tests.rb

@@ -0,0 +1,27 @@
+Shindo.tests("Fog::Compute[:brightbox] | DatabaseType model", ["brightbox"]) do
+  pending if Fog.mocking?
+
+  @service = Fog::Compute[:brightbox]
+
+  tests("success") do
+    tests("#all") do
+      @database_types = @service.database_types.all
+      test("returns results") { !@database_types.empty? }
+    end
+
+    @sample_identifier = @database_types.first.id
+    pending if @sample_identifier.nil?
+
+    tests("#get(#{@sample_identifier})") do
+      @database_type = @service.database_types.get(@sample_identifier)
+
+      test("disk is not nil") do
+        !@database_type.disk.nil?
+      end
+
+      test("ram is not nil") do
+        !@database_type.ram.nil?
+      end
+    end
+  end
+end